[Pkg-lustre-svn-commit] updated: [b418099] Imported Upstream version 1.41.10
Patrick Winnertz
winnie at debian.org
Fri Aug 13 09:28:51 UTC 2010
The following commit has been merged in the upstream branch:
commit b418099b94251b23095dfb32ba4a055b8edf1a12
Author: Patrick Winnertz <winnie at debian.org>
Date: Wed May 12 09:55:34 2010 +0200
Imported Upstream version 1.41.10
diff --git a/.gitignore b/.gitignore
index 0e21aea..99ab2b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,12 +15,25 @@ config.status
debugfs/debug_cmds.c
debugfs/debugfs
debugfs/debugfs.8
+doc/libext2fs.aux
+doc/libext2fs.cp
+doc/libext2fs.dvi
+doc/libext2fs.fn
+doc/libext2fs.fns
doc/libext2fs.info
+doc/libext2fs.ky
+doc/libext2fs.log
+doc/libext2fs.pg
+doc/libext2fs.toc
+doc/libext2fs.tp
+doc/libext2fs.vr
+e2fsck/crc32table.h
e2fsck/e2fsck
e2fsck/e2fsck.8
e2fsck/e2fsck.conf.5
e2fsck/e2fsck.shared
e2fsck/e2fsck.static
+e2fsck/gen_crc32table
e2fsck/prof_err.c
e2fsck/prof_err.h
e2fsprogs.spec
@@ -77,12 +90,19 @@ misc/blkid
misc/blkid.8
misc/chattr
misc/chattr.1
+misc/default_profile.c
misc/dumpe2fs
misc/dumpe2fs.8
+misc/e2freefrag
+misc/e2freefrag.8
misc/e2image
misc/e2image.8
misc/e2initrd_helper
misc/e2label.8
+misc/e2undo
+misc/e2undo.8
+misc/e4defrag
+misc/e4defrag.8
misc/filefrag
misc/filefrag.8
misc/findfs.8
@@ -101,10 +121,13 @@ misc/prof_err.c
misc/prof_err.h
misc/tune2fs
misc/tune2fs.8
+misc/uuidd
+misc/uuidd.8
misc/uuidgen
misc/uuidgen.1
po/Makefile.in
po/POTFILES
+public_config.h
resize/resize2fs
resize/resize2fs.8
resize/test_extent
diff --git a/MCONFIG.in b/MCONFIG.in
index 7f3e0c5..fba2208 100644
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -32,6 +32,20 @@ datadir = @datadir@
@SET_MAKE@
+ at ifGNUmake@ V =
+ at ifGNUmake@ ifeq ($(strip $(V)),)
+ at ifGNUmake@ # E = @echo
+ at ifGNUmake@ # Q = @
+ at ifGNUmake@ E = @E@
+ at ifGNUmake@ Q = @Q@
+ at ifGNUmake@ else
+ at ifGNUmake@ E = @\#
+ at ifGNUmake@ Q =
+ at ifGNUmake@ endif
+
+ at ifNotGNUmake@ E = @E@
+ at ifNotGNUmake@ Q = @Q@
+
CC = @CC@
BUILD_CC = @BUILD_CC@
DEFS = -DLOCALEDIR=\"$(localedir)\" -DROOT_SYSCONFDIR=\"$(root_sysconfdir)\" @DEFS@
@@ -74,30 +88,34 @@ LIBSS = $(LIB)/libss at LIB_EXT@ @PRIVATE_LIBS_CMT@ @DLOPEN_LIB@
LIBCOM_ERR = $(LIB)/libcom_err at LIB_EXT@ @PRIVATE_LIBS_CMT@ @SEM_INIT_LIB@
LIBE2P = $(LIB)/libe2p at LIB_EXT@
LIBEXT2FS = $(LIB)/libext2fs at LIB_EXT@
-LIBUUID = $(LIB)/libuuid at LIB_EXT@ @SOCKET_LIB@
+LIBUUID = @LIBUUID@ @SOCKET_LIB@
LIBBLKID = @LIBBLKID@ @PRIVATE_LIBS_CMT@ $(LIBUUID)
LIBINTL = @LIBINTL@
DEPLIBSS = $(LIB)/libss at LIB_EXT@
-DEPLIBUUID = $(LIB)/libuuid at LIB_EXT@
-DEPLIBBLKID = @DEPLIBBLKID@ @PRIVATE_LIBS_CMT@ $(LIBUUID)
+DEPLIBCOM_ERR = $(LIB)/libcom_err at LIB_EXT@
+DEPLIBUUID = @DEPLIBUUID@
+DEPLIBBLKID = @DEPLIBBLKID@ @PRIVATE_LIBS_CMT@ $(DEPLIBUUID)
STATIC_LIBSS = $(LIB)/libss at STATIC_LIB_EXT@ @DLOPEN_LIB@
STATIC_LIBCOM_ERR = $(LIB)/libcom_err at STATIC_LIB_EXT@ @SEM_INIT_LIB@
STATIC_LIBE2P = $(LIB)/libe2p at STATIC_LIB_EXT@
STATIC_LIBEXT2FS = $(LIB)/libext2fs at STATIC_LIB_EXT@
-STATIC_LIBUUID = $(LIB)/libuuid at STATIC_LIB_EXT@ @SOCKET_LIB@
+STATIC_LIBUUID = @STATIC_LIBUUID@ @SOCKET_LIB@
STATIC_LIBBLKID = @STATIC_LIBBLKID@ $(STATIC_LIBUUID)
DEPSTATIC_LIBSS = $(LIB)/libss at STATIC_LIB_EXT@
-DEPSTATIC_LIBUUID = $(LIB)/libuuid at STATIC_LIB_EXT@
+DEPSTATIC_LIBCOM_ERR = $(LIB)/libcom_err at STATIC_LIB_EXT@
+DEPSTATIC_LIBUUID = @DEPSTATIC_LIBUUID@
DEPSTATIC_LIBBLKID = @DEPSTATIC_LIBBLKID@ $(STATIC_LIBUUID)
PROFILED_LIBSS = $(LIB)/libss at PROFILED_LIB_EXT@ @DLOPEN_LIB@
PROFILED_LIBCOM_ERR = $(LIB)/libcom_err at PROFILED_LIB_EXT@ @SEM_INIT_LIB@
PROFILED_LIBE2P = $(LIB)/libe2p at PROFILED_LIB_EXT@
PROFILED_LIBEXT2FS = $(LIB)/libext2fs at PROFILED_LIB_EXT@
-PROFILED_LIBUUID = $(LIB)/libuuid at PROFILED_LIB_EXT@ @SOCKET_LIB@
+PROFILED_LIBUUID = @PROFILED_LIBUUID@ @SOCKET_LIB@
PROFILED_LIBBLKID = @PROFILED_LIBBLKID@ $(PROFILED_LIBUUID)
-DEPPROFILED_LIBUUID = $(LIB)/libuuid at PROFILED_LIB_EXT@
+DEPPROFILED_LIBSS = $(LIB)/libss at PROFILED_LIB_EXT@
+DEPPROFILED_LIBCOM_ERR = $(LIB)/libcom_err at PROFILED_LIB_EXT@
+DEPPROFILED_LIBUUID = @PROFILED_LIBUUID@
DEPPROFILED_LIBBLKID = @PROFILED_LIBBLKID@ $(PROFILED_LIBUUID)
# An include directive pointing to a directory holding enough linux-like
diff --git a/Makefile.in b/Makefile.in
index 1f1b8ea..45f2972 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,9 +11,10 @@ INSTALL = @INSTALL@
@RESIZER_CMT at RESIZE_DIR= resize
@DEBUGFS_CMT at DEBUGFS_DIR= debugfs
+ at UUID_CMT@UUID_LIB_SUBDIR= lib/uuid
@BLKID_CMT at BLKID_LIB_SUBDIR= lib/blkid
-LIB_SUBDIRS=lib/et lib/ss lib/e2p lib/uuid lib/ext2fs $(BLKID_LIB_SUBDIR) intl
+LIB_SUBDIRS=lib/et lib/ss lib/e2p $(UUID_LIB_SUBDIR) lib/ext2fs $(BLKID_LIB_SUBDIR) intl
PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po
SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
diff --git a/README b/README
index b3ec182..9cd68d9 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
- This is the new version (1.41.6) of the second extended file
+ This is the new version (1.41.10) of the second extended file
system management programs.
From time to time, I release new versions of e2fsprogs, to fix
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 61cdbd3..7d2993c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,334 @@
+E2fsprogs 1.41.10 (February 7, 2010)
+====================================
+
+Fix resize2fs bug which causes it to access invalid memory.
+
+Add libss support for libreadline.so.6.
+
+Fix e2fsck's check for extent-mapped directory with an incorrect file
+type.
+
+Add new e2fsck.conf configuration option, default/broken_system_clock
+to support systems with broken CMOS hardware clocks. Also, since too
+many distributions seem to have broken virtualization scripts now,
+e2fsck will by default accept dates which are off by up to 24 hours by
+default. (Addresses Debian Bugs: #559776, #557636)
+
+Fix a bug where mke2fs may not use the best placement of the inode
+table when there is only room for a single block group in the last
+flex_bg.
+
+E2fsck is now smarter when it needs to allocate blocks in the course
+of fixing file system problems. This reduces the number of spurious
+differences found in pass #5.
+
+E2fsck will no longer rehash directories which fit in a single
+directory block.
+
+E2fsck now correctly handles holes in extent-mapped directories (i.e.,
+sparse directories which use extents).
+
+Fix big-endian problems with ext2fs_bmap() and ext2fs_bmap2().
+
+Fix a bug in filefrag where on platforms which can allow file systems
+with 8k blocks, that it doesn't core dump when it sees a file system
+with 8k block sizes. (Thanks to Mikulas Patocka for pointing this
+out.)
+
+E2fsck will correctly fix directories that are have an inaccurate
+i_size as well as other problems in a single pass, instead of
+requiring two e2fsck runs before the file system is fully fixed.
+
+Fix e2fsck so it will correctly find and detect duplicate directory
+entries for non-indexed directories. ( Addresses Sourceforge Bug:
+#2862551)
+
+Mke2fs will use BLKDISCARD to pre-discard all blocks on an SSD or
+thinly-provisioned storage device. This can be disabled using the -K
+option.
+
+Enhance libext2fs so it works around bug in Linux version 2.6.19
+and earlier where the /proc/swaps file was missing the header on
+the first line.
+
+Fix bug in Linux version 2.6.19 and earlier where the /proc/swaps file
+was missing the header on the first line.
+
+Fix some big-endian bugs in e2fsck and libext2fs.
+
+Fix resize2fs so it works correctly on file systems with external
+journals instead of failing early with the error "Illegal inode
+number".
+
+Fix libss so that it does not seg fault when using a readline library
+which does not supply a readline_shutdown() function.
+
+Updated dumpe2fs's usage message so it correctly gives the right
+arguments summary for "-o superblock=<num>" and "-o blocksize=<num>".
+(Addresses Launchpad Bug: #448099)
+
+Teach libext2fs to ignore the high 32 bits of the i_blocks field
+when huge_file file system feature is set, but the inode does not
+have the HUGE_FILE_FL flag set.
+
+Fix e2fsck's handling of 64-bit i_blocks fields.
+
+E2fsck will now print "Illegal indirect block", "Illegal
+double-indirect block", etc., instead of "Illegal block #-1" or
+"Illegal block #-2", etc. This makes it easier for users to
+understand what has gone wrong. (Addresses SourceForge Bug: #2871782)
+
+Mke2fs now will obtain get device topology information from blkid and
+use it to populate the superblock stride and stripe sizes. It will
+also warn if the block device is misaligned
+
+Fix file descriptor leaks in fsck and debugfs. (Addresses Novell Bug:
+##524526)
+
+Fix the libext2fs library code to round up the bitmap size to a 4-byte
+boundary, to prevent spurious seg faults caused by the x86
+architecture. This doesn't affect Linux systems, but was a major
+problem on a number of *BSD systems. (Addresses Sourceforge Bug:
+#2328708)
+
+Fix resize2fs's minimum size required for a file system so it doesn't
+fail when "resize2fs -M" is run. (Addresses RedHat Bugzilla: #519131)
+
+Dumpe2fs now prints summary information about the contents of the
+journal.
+
+Avoid printing scary error messages when e2fsck starts running
+problems on low-memory systems, as it tends to panic and mislead the
+user. (Addresses Debian Bug: #509529)
+
+Fix blkid's modules.dep parser so it handles compressed (.ko.gz)
+modules files. (Address Red Hat Bug: #518572)
+
+Fix tune2fs so it can add a journal when an extent-enabled file system
+is mounted. (Addresses Launchpad bug: #416648)
+
+Update Czech, Indonesian, Polish and Vietnamese translations (from the
+Translation Project).
+
+Update/clarify man pages. (Addresses Sourceforge Bug: #2822186)
+
+Fixed various Debian packaging issues --- see debian/changelog for
+details. (Addresses Debian Bugs: #540111)
+
+Programmer's Notes
+------------------
+
+The configure script supports the --with-cc, --with-ccopts, and
+--with-ldopts options. Instead, the more standard use of CC=,
+CCFLAGS=, and LDFLAGS= in the configure command line is used instead.
+Also, --with-ld, which never worked, was also removed.
+(Addresses Sourceforge Bug: #2843248)
+
+The in-tree header files are only used if the in-tree uuid or blkid
+libraries are used. Otherwise, use the system-provided uuid or blkid
+header files if using the system-provided libraries.
+
+Fix some build failures caused by --disable-* configure options.
+
+Work around a bug in autoconf 2.64.
+
+
+E2fsprogs 1.41.9 (August 22, 2009)
+==================================
+
+Fix a bug in e2fsck routines for reallocating an inode table which
+could cause it to loop forever on an ext4 filesystem with the FLEX_BG
+filesystem feature with a relatively rare (and specific) filesystem
+corruption. This fix causes e2fsck to try to find space for a new
+portion of the inode table in the containing flex_bg, and if that
+fails, the new portion of the inode table will be allocated in any
+free space available in the filesystem.
+
+Make e2fsck less annoying by only asking for permission to relocate a
+block group's inode table once, instead of for every overlapping
+block. Similarly, only ask once to recompute the block group
+checksums, instead of once for each corrupted block group's checksum.
+
+Fix filefrag to avoid print the extent header if the FIEMAP ioctl is
+not present, and it needs to fall back to using the FIBMAP ioctl.
+
+Fix filefrag to correctly print the number of extents for zero-length
+files. (Addresses Debian Bug: #540376)
+
+Filefrag now has a -B option which forces the use of the FIBMAP ioctl
+to more easily debug the FIBMAP code.
+
+Fixed filefrag for non-extent based files.
+
+Add a new program, e2freefrag, which displays information about the
+free space fragmentation in an ext2/3/4 filesystem.
+
+Fix inode resizing via tune2fs -I so that it works correctly in the
+face of non-empty bad blocks inodes, and if the filesystem was
+formatted using the "mke2fs -E stride=N" option for RAID arrays.
+
+Fix regression in ext2fs_extent_set_bmap() caused e2fsck -fD to fail
+and corrupt large directories if the directory needs to shrink by more
+than one block. (Addresses Debian Bug: #537510)
+
+Fix e2fsck's buggy_init_scritps=1 so that the if the last write and/or
+last mount times are in the future, they are corrected even if
+buggy_init_scripts is set. This is needed because otherwise resize2fs
+will refuse to resize the filesystem, even after running "e2fsck -f".
+(Addresses Launchpad bug: #373409)
+
+E2fsck will now print much fuller information when the last mount time
+or last written time is in the future, since most people can't seem to
+believe their distribution has buggy init scripts, or they have a
+failed CMOS/RTS clock battery.
+
+Enhance dumpe2fs to dump the extent information via the 'stat'
+command, and more detailed extent information via the new command
+'dump_extents'.
+
+Update French, Polish, Czech, and Sweedish translation from the
+Translation Project.
+
+Fixed various Debian packaging issues --- see debian/changelog for
+details.
+
+Programmer's Notes
+------------------
+
+Fixed miscellaneous gcc -Wall warnings.
+
+Fixed memory leak in error path in ext2fs_block_iterate2()
+
+Fixed non-Linux build of the intl directory by adding support for the
+E/Q/V macros.
+
+The bitmap read/write functions now treat uninitialized bitmaps as
+unallocated; this fixes a number of problems in all e2fsprogs for ext4
+filesystems when there is a need to allocate new blocks or inodes, and
+there aren't any free blocks or inodes in the already-used block
+groups.
+
+Improve ext2fs_extent_set_bmap() to avoid creating new extents which
+get inserted into the extent tree when they are not needed.
+
+
+E2fsprogs 1.41.8 (July 11, 2009)
+================================
+
+Fix resize2fs's online resizing, fixing a regression which in
+e2fpsrogs 1.41.7. (Addresses Debian Bug: #535452)
+
+Fix potential filesystem corruptions caused by using resize2fs to
+shrinking ext4 filesystems with extents enabled. (Addresses Red Hat
+Bug: #510379)
+
+Optimize uuid_generate() to avoid running uuidd if it is not setuid or
+setgid and the currently running program doesn't have write access to
+the uuidd work directory.
+
+Add safety checks (for non-Linux systems) so that uuidd isn't run with
+file descriptors 0, 1, and 2 closed; and if they are closed, uuidd
+will be careful not to close the file descriptor for its unix domain
+socket when it detaches itself from the controlling tty. Also add
+safety checks so that if the unix domain socket between the uuid
+library and uuidd program is closed for any reason, both the library
+and the uuidd will return an appropriate error code instead of looping
+in an infinite loop.
+
+The e2croncheck script, which creates an LVM snapshot and then checks
+the ext3/4 filesystem via the LVM snapshot, has been added to the
+contrib directory.
+
+Fix filefrag program for files that have more than 144 extents.
+
+Update French, Polish, Czech, Indonsian, and Sweedish translation from
+the Translation Project.
+
+Fixed various Debian packaging issues --- see debian/changelog for
+details. (Addresses Debian Bug #535530)
+
+Update/clarify man pages.
+
+Programmer's Notes
+------------------
+
+Fix compilation problem when configured with --disable-uuid.
+
+Don't build uuidgen if configured with --disable-uuid.
+
+Add the new library function ext2fs_test_inode_bitmap_range(), and
+optimized ext2fs_test_block_bitmap_range(), which will be needed for
+future optimizations for e2fsck.
+
+Fix makefile dependencies for libcom_err so that the Makefiles work
+well on non-GNU make program. (Addresses Sourceforge Patches: #2813809)
+
+Enhance the build system so that the full set of commands executed by
+the Makefiles are displayed, instead of the Linux kernel summary
+output, if the build was configured with --enable-verbose-makecmds, or
+if GNU make is in use and the V variable is non-null, i.e., via "make
+V=1".
+
+
+E2fsprogs 1.41.7 (June 29, 2009)
+================================
+
+Fix a bug in libext2fs which can cause e2fsck and resize2fs to write
+uninitalized data into the portion of the inode beyond the first 128
+bytes when operating on inodes mapped via extents; potentially
+corrupting filesystems.
+
+Fix memory leaks in e2fsprogs, including a very large memory leak
+which can cause e2fsck to run out of memory when checking very large
+filesystems using extents.
+
+The logsave program will now filter out the ^A and ^B characters when
+writing to the console.
+
+Harden ext2fs_validate_entry() so that lsdel will not read beyond the
+end of the block even if the directory block is corrupted.
+
+Fix debugfs from core dumping if the logdump command fails to open the
+output file.
+
+Enhance badblocks to print the currently tested block number when
+interrupted with ^C.
+
+Fix lsattr to exit with a non-zero status when it encounters errors.
+(Addresses RedHat Bugzilla #489841)
+
+Fix e2fsprogs to use the same encoding for rec_len in 64k (and larger)
+filesystems as the kernel when encoding rec_len >= 64k. For 64k
+filesystems (currently all that is supported by e2fsprogs, this is
+only a minor corner case).
+
+Resize2fs will now update the journal backup fileds in the sup0erblock
+if the journal is moved; this avoids an unnecessary full fsck after
+resizing the filesystem. (Addresses RedHat Bugzilla: #505339)
+
+Fix libext2fs to properly initialize i_extra_size when creating the
+journal and resize inodes.
+
+Change badblocks to allow block sizes larger than 4k.
+
+Fix filefrag progam so it correctly checks for errors from the fiemap ioctl.
+
+Update Chinese and Czech translation from the Translation Project.
+
+Clean up various man pages. (Addresses Debian Bug #531385 and #523063)
+
+
+Programmer's Notes
+------------------
+
+Add --disable-libuuid option to configure which uses an in-system
+installed version of libuuid; the private version is enabled by
+default.
+
+Add --valgrind-leakcheck option to the test_script program which runs
+valgrind with the appropriate options to find memory leaks.
+
+
E2fsprogs 1.41.6 (May 30, 2009)
===============================
diff --git a/aclocal.m4 b/aclocal.m4
index 3c32c83..6fd4652 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2694,3 +2694,84 @@ if test -n "$PKG_CONFIG"; then
fi[]dnl
])# PKG_PROG_PKG_CONFIG
+# ===========================================================================
+# http://www.nongnu.org/autoconf-archive/check_gnu_make.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# CHECK_GNU_MAKE()
+#
+# DESCRIPTION
+#
+# This macro searches for a GNU version of make. If a match is found, the
+# makefile variable `ifGNUmake' is set to the empty string, otherwise it
+# is set to "#". This is useful for including a special features in a
+# Makefile, which cannot be handled by other versions of make. The
+# variable _cv_gnu_make_command is set to the command to invoke GNU make
+# if it exists, the empty string otherwise.
+#
+# Here is an example of its use:
+#
+# Makefile.in might contain:
+#
+# # A failsafe way of putting a dependency rule into a makefile
+# $(DEPEND):
+# $(CC) -MM $(srcdir)/*.c > $(DEPEND)
+#
+# @ifGNUmake@ ifeq ($(DEPEND),$(wildcard $(DEPEND)))
+# @ifGNUmake@ include $(DEPEND)
+# @ifGNUmake@ endif
+#
+# Then configure.in would normally contain:
+#
+# CHECK_GNU_MAKE()
+# AC_OUTPUT(Makefile)
+#
+# Then perhaps to cause gnu make to override any other make, we could do
+# something like this (note that GNU make always looks for GNUmakefile
+# first):
+#
+# if ! test x$_cv_gnu_make_command = x ; then
+# mv Makefile GNUmakefile
+# echo .DEFAULT: > Makefile ;
+# echo \ $_cv_gnu_make_command \$@ >> Makefile;
+# fi
+#
+# Then, if any (well almost any) other make is called, and GNU make also
+# exists, then the other make wraps the GNU make.
+#
+# LICENSE
+#
+# Copyright (c) 2008 John Darrington <j.darrington at elvis.murdoch.edu.au>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved.
+#
+# Note: Modified by Ted Ts'o to add @ifNotGNUMake@
+
+AC_DEFUN(
+ [CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command,
+ _cv_gnu_make_command='' ;
+dnl Search all the common names for GNU make
+ for a in "$MAKE" make gmake gnumake ; do
+ if test -z "$a" ; then continue ; fi ;
+ if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
+ _cv_gnu_make_command=$a ;
+ break;
+ fi
+ done ;
+ ) ;
+dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' otherwise
+ if test "x$_cv_gnu_make_command" != "x" ; then
+ ifGNUmake='' ;
+ ifNotGNUmake='#' ;
+ else
+ ifGNUmake='#' ;
+ ifNotGNUmake='' ;
+ AC_MSG_RESULT("Not found");
+ fi
+ AC_SUBST(ifGNUmake)
+ AC_SUBST(ifNotGNUmake)
+] )
diff --git a/configure b/configure
index 4dee536..12d6a9f 100755
--- a/configure
+++ b/configure
@@ -1,60 +1,81 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.64.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# Foundation, Inc.
+#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
else
- PATH_SEPARATOR=:
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in #(
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
fi
- rm -f conf$$.sh
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
@@ -63,20 +84,18 @@ fi
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
-as_nl='
-'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -87,354 +106,321 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
# CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
if test "x$CONFIG_SHELL" = x; then
- if (eval ":") 2>/dev/null; then
- as_have_required=yes
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
else
- as_have_required=no
+ case \`(set -o) 2>/dev/null\` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
fi
-
- if test $as_have_required = yes && (eval ":
-(as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
+"
+ as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+ exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
else
- exitcode=1
- echo positional parameters were not saved.
+ as_have_required=no
fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=\$LINENO
- as_lineno_2=\$LINENO
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- case $as_dir in
+ as_found=:
+ case $as_dir in #(
/*)
for as_base in sh bash ksh sh5; do
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+ # Try only shells that exist, to save several forks.
+ as_shell=$as_dir/$as_base
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ CONFIG_SHELL=$as_shell as_have_required=yes
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ break 2
+fi
+fi
done;;
esac
+ as_found=false
done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
IFS=$as_save_IFS
- for as_shell in $as_candidate_shells $SHELL; do
- # Try only shells that exist, to save several forks.
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
- CONFIG_SHELL=$as_shell
- as_have_required=yes
- if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
- (exit $1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
+ if test "x$CONFIG_SHELL" != x; then :
+ # We cannot yet assume a decent shell, so we have to provide a
+ # neutralization value for shells without unset; and this also
+ # works around shells that cannot unset nonexistent variables.
+ BASH_ENV=/dev/null
+ ENV=/dev/null
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
- break
+ if test x$as_have_required = xno; then :
+ $as_echo "$0: This script requires a shell more modern than all"
+ $as_echo "$0: the shells that I found on your system."
+ if test x${ZSH_VERSION+set} = xset ; then
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ else
+ $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+ fi
+ exit 1
fi
-
fi
-
- done
-
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
- if test $as_have_required = no; then
- echo This script requires a shell more modern than all the
- echo shells that I found on your system. Please install a
- echo modern shell, or manually run the script under such a
- echo shell if you do have one.
- { (exit 1); exit 1; }
-fi
-
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
-fi
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
-fi
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
-(eval "as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ fi
+ $as_echo "$as_me: error: $1" >&2
+ as_fn_exit $as_status
+} # as_fn_error
-exitcode=0
-if as_func_success; then
- :
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
+ as_expr=false
fi
-if as_func_ret_success; then
- :
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
+ as_basename=false
fi
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
else
- exitcode=1
- echo positional parameters were not saved.
+ as_dirname=false
fi
-test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
- echo Please tell autoconf at gnu.org about your system,
- echo including any error possibly output before this
- echo message
-}
-
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
sed -n '
p
/[$]LINENO/=
@@ -451,8 +437,7 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
@@ -462,49 +447,40 @@ test \$exitcode = 0") || {
exit
}
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
+ fi
else
as_ln_s='cp -p'
fi
@@ -512,7 +488,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
@@ -529,12 +505,12 @@ else
as_test_x='
eval sh -c '\''
if test -d "$1"; then
- test -d "$1/.";
+ test -d "$1/.";
else
- case $1 in
- -*)set "./$1";;
+ case $1 in #(
+ -*)set "./$1";;
esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
@@ -548,7 +524,6 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
exec 7<&0 </dev/null 6>&1
# Name of the host.
@@ -567,7 +542,6 @@ cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME=
@@ -575,6 +549,7 @@ PACKAGE_TARNAME=
PACKAGE_VERSION=
PACKAGE_STRING=
PACKAGE_BUGREPORT=
+PACKAGE_URL=
ac_unique_file="version.h"
# Factoring default headers for most tests.
@@ -613,171 +588,182 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-E2FSPROGS_YEAR
-E2FSPROGS_MONTH
-E2FSPROGS_DAY
-E2FSPROGS_VERSION
-E2FSPROGS_PKGVER
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-CPP
-LD
-GREP
-EGREP
-LINUX_INCLUDE
-MAINTAINER_CMT
-HTREE_CMT
-ELF_CMT
-BSDLIB_CMT
-PROFILE_CMT
-CHECKER_CMT
-LIB_EXT
-STATIC_LIB_EXT
-PROFILED_LIB_EXT
-LDFLAG_DYNAMIC
-PRIVATE_LIBS_CMT
-TEST_IO_CMT
-PKG_CONFIG
-LIBBLKID
-DEPLIBBLKID
-STATIC_LIBBLKID
-DEPSTATIC_LIBBLKID
-PROFILED_LIBBLKID
-DEPPROFILED_LIBBLKID
-BLKID_CMT
-DEBUGFS_CMT
-IMAGER_CMT
-RESIZER_CMT
-FSCK_PROG
-FSCK_MAN
-E2INITRD_PROG
-E2INITRD_MAN
-UUIDD_CMT
-GETTEXT_PACKAGE
-PACKAGE
-VERSION
-SET_MAKE
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-MKINSTALLDIRS
-USE_NLS
-MSGFMT
-GMSGFMT
-XGETTEXT
-MSGMERGE
-RANLIB
-ALLOCA
-GLIBC21
-HAVE_POSIX_PRINTF
-HAVE_ASPRINTF
-HAVE_SNPRINTF
-HAVE_WPRINTF
-LIBICONV
-LTLIBICONV
-INTLBISON
-BUILD_INCLUDED_LIBINTL
-USE_INCLUDED_LIBINTL
-CATOBJEXT
-DATADIRNAME
-INSTOBJEXT
-GENCAT
-INTLOBJS
-INTL_LIBTOOL_SUFFIX_PREFIX
-INTLLIBS
-LIBINTL
-LTLIBINTL
-POSUB
-BINARY_TYPE
-LN
-LN_S
-MV
-CP
-RM
-CHMOD
-AWK
-SED
-PERL
-LDCONFIG
-AR
-STRIP
-MAKEINFO
-BUILD_CC
-SIZEOF_SHORT
-SIZEOF_INT
-SIZEOF_LONG
-SIZEOF_LONG_LONG
+ac_subst_vars='LTLIBOBJS
+LIBOBJS
+BUILD_LDFLAGS
+BUILD_CFLAGS
+INTL_FLAGS
+DO_TEST_SUITE
+ET_DIR
+SS_DIR
+LDFLAG_STATIC
+root_sysconfdir
+root_libdir
+root_sbindir
+root_bindir
+root_prefix
+UNIX_CMT
+CYGWIN_CMT
+LINUX_CMT
+UNI_DIFF_OPTS
+SEM_INIT_LIB
SOCKET_LIB
+SIZEOF_LONG_LONG
+SIZEOF_LONG
+SIZEOF_INT
+SIZEOF_SHORT
+BUILD_CC
+MAKEINFO
+STRIP
+AR
+LDCONFIG
+PERL
+SED
+AWK
+CHMOD
+RM
+CP
+MV
+LN_S
+LN
+ifNotGNUmake
+ifGNUmake
+BINARY_TYPE
+POSUB
+LTLIBINTL
+LIBINTL
+INTLLIBS
+INTL_LIBTOOL_SUFFIX_PREFIX
+INTLOBJS
+GENCAT
+INSTOBJEXT
+DATADIRNAME
+CATOBJEXT
+USE_INCLUDED_LIBINTL
+BUILD_INCLUDED_LIBINTL
+INTLBISON
+LTLIBICONV
+LIBICONV
+HAVE_WPRINTF
+HAVE_SNPRINTF
+HAVE_ASPRINTF
+HAVE_POSIX_PRINTF
+GLIBC21
+ALLOCA
+RANLIB
+MSGMERGE
+XGETTEXT
+GMSGFMT
+MSGFMT
+USE_NLS
+MKINSTALLDIRS
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+SET_MAKE
+VERSION
+PACKAGE
+GETTEXT_PACKAGE
+UUIDD_CMT
+E2INITRD_MAN
+E2INITRD_PROG
+FSCK_MAN
+FSCK_PROG
+RESIZER_CMT
+IMAGER_CMT
+DEBUGFS_CMT
+BLKID_CMT
+DEPPROFILED_LIBBLKID
+PROFILED_LIBBLKID
+DEPSTATIC_LIBBLKID
+STATIC_LIBBLKID
+DEPLIBBLKID
+LIBBLKID
+UUID_CMT
+DEPPROFILED_LIBUUID
+PROFILED_LIBUUID
+DEPSTATIC_LIBUUID
+STATIC_LIBUUID
+DEPLIBUUID
+LIBUUID
+PKG_CONFIG
+TEST_IO_CMT
+PRIVATE_LIBS_CMT
+LDFLAG_DYNAMIC
+PROFILED_LIB_EXT
+STATIC_LIB_EXT
+LIB_EXT
+CHECKER_CMT
+PROFILE_CMT
+BSDLIB_CMT
+ELF_CMT
+HTREE_CMT
+Q
+E
+MAINTAINER_CMT
+LINUX_INCLUDE
+EGREP
+GREP
+CPP
DLOPEN_LIB
-SEM_INIT_LIB
-UNI_DIFF_OPTS
-LINUX_CMT
-CYGWIN_CMT
-UNIX_CMT
-root_prefix
-root_bindir
-root_sbindir
-root_libdir
-root_sysconfdir
-LDFLAG_STATIC
-SS_DIR
-ET_DIR
-DO_TEST_SUITE
-INTL_FLAGS
-BUILD_CFLAGS
-BUILD_LDFLAGS
-LIBOBJS
-LTLIBOBJS'
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+E2FSPROGS_PKGVER
+E2FSPROGS_VERSION
+E2FSPROGS_DAY
+E2FSPROGS_MONTH
+E2FSPROGS_YEAR
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
ac_subst_files='MCONFIG
MAKEFILE_ELF
MAKEFILE_BSDLIB
@@ -786,6 +772,40 @@ MAKEFILE_CHECKER
MAKEFILE_LIBRARY
ASM_TYPES_HEADER
PUBLIC_CONFIG_HEADER'
+ac_user_opts='
+enable_option_checking
+with_diet_libc
+with_cc
+with_ccopts
+with_ldopts
+with_root_prefix
+enable_maintainer_mode
+enable_verbose_makecmds
+enable_compression
+enable_htree
+enable_elf_shlibs
+enable_bsd_shlibs
+enable_profile
+enable_checker
+enable_jbd_debug
+enable_blkid_debug
+enable_testio_debug
+enable_libuuid
+enable_libblkid
+enable_debugfs
+enable_imager
+enable_resizer
+enable_fsck
+enable_e2initrd_helper
+enable_tls
+enable_uuidd
+enable_nls
+with_gnu_ld
+enable_rpath
+with_libiconv_prefix
+with_included_gettext
+with_libintl_prefix
+'
ac_precious_vars='build_alias
host_alias
target_alias
@@ -801,6 +821,8 @@ PKG_CONFIG'
# Initialize some variables set by options.
ac_init_help=
ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
# The variables have the same names as the options, with
# dashes changed to underlines.
cache_file=/dev/null
@@ -899,13 +921,20 @@ do
datarootdir=$ac_optarg ;;
-disable-* | --disable-*)
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=no ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=no ;;
-docdir | --docdir | --docdi | --doc | --do)
ac_prev=docdir ;;
@@ -918,13 +947,20 @@ do
dvidir=$ac_optarg ;;
-enable-* | --enable-*)
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=\$ac_optarg ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1115,22 +1151,36 @@ do
ac_init_version=: ;;
-with-* | --with-*)
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=\$ac_optarg ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=\$ac_optarg ;;
-without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=no ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=no ;;
--x)
# Obsolete; use --with-x.
@@ -1150,25 +1200,25 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; }
+ -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
;;
*=*)
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+ esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
*)
# FIXME: should be removed in autoconf 3.0.
- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
@@ -1177,23 +1227,36 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "missing argument to $ac_option"
fi
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ esac
+fi
+
+# Check all directory arguments for consistency.
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
do
eval ac_val=\$$ac_var
+ # Remove trailing slashes.
+ case $ac_val in
+ */ )
+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+ eval $ac_var=\$ac_val;;
+ esac
+ # Be sure to have absolute directory names.
case $ac_val in
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1207,7 +1270,7 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
@@ -1223,23 +1286,21 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { echo "$as_me: error: Working directory cannot be determined" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { echo "$as_me: error: pwd does not report name of working directory" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "pwd does not report name of working directory"
# Find the source files, if location was not specified.
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
# Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+ ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_myself" : 'X\(//\)[^/]' \| \
+ X"$as_myself" : 'X\(//\)$' \| \
+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -1266,13 +1327,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
- { (exit 1); exit 1; }; }
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1320,9 +1379,9 @@ Configuration:
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
+ [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
+ [PREFIX]
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
@@ -1332,25 +1391,25 @@ for instance \`--prefix=\$HOME'.
For better control, use the options below.
Fine tuning of the installation directories:
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
- --infodir=DIR info documentation [DATAROOTDIR/info]
- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
- --mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
- --htmldir=DIR html documentation [DOCDIR]
- --dvidir=DIR dvi documentation [DOCDIR]
- --pdfdir=DIR pdf documentation [DOCDIR]
- --psdir=DIR ps documentation [DOCDIR]
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
_ACEOF
cat <<\_ACEOF
@@ -1366,9 +1425,11 @@ if test -n "$ac_init_help"; then
cat <<\_ACEOF
Optional Features:
+ --disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-maintainer-mode enable makefile rules useful for maintainers
+ --enable-verbose-makecmds enable verbose make command output
--enable-compression enable EXPERIMENTAL compression support
--enable-htree enable EXPERIMENTAL htree directory support
--enable-elf-shlibs select ELF shared libraries
@@ -1378,6 +1439,7 @@ Optional Features:
--enable-jbd-debug enable journal debugging
--enable-blkid-debug enable blkid debugging
--disable-testio-debug disable the use of the test I/O manager for debugging
+ --disable-libuuid do not build private uuid library
--disable-libblkid do not build private blkid library
--disable-debugfs disable support of debugfs program
--disable-imager disable support of e2image program
@@ -1393,10 +1455,9 @@ Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-diet-libc use diet libc
- --with-cc=COMPILER select compiler to use
- --with-linker=LINKER select linker to use
- --with-ccopts=CCOPTS select compiler command line options
- --with-ldopts=LDOPTS select linker command line options
+ --with-cc no longer supported, use CC= instead
+ --with-ccopts no longer supported, use CFLAGS= instead
+ --with-ldopts no longer supported, use LDFLAGS= instead
--with-root-prefix=PREFIX override prefix variable for files to be placed in the root
--with-gnu-ld assume the C compiler uses GNU ld default=no
--with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
@@ -1419,6 +1480,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
+Report bugs to the package provider.
_ACEOF
ac_status=$?
fi
@@ -1426,15 +1488,17 @@ fi
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" || continue
+ test -d "$ac_dir" ||
+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+ continue
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1470,7 +1534,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
echo &&
$SHELL "$ac_srcdir/configure" --help=recursive
else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi || ac_status=$?
cd "$ac_pwd" || { ac_status=$?; break; }
done
@@ -1480,21 +1544,700 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
configure
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.64
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
exit
fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ 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:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ return $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ 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:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ 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_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ return $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ return $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_header_compiler=yes
+else
+ ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ ac_header_preproc=yes
+else
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+ yes:no: )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ 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:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && { 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:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then :
+ ac_retval=0
+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
+
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ return $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=no"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_type
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $2 (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+# --------------------------------------------
+# Tries to find the compile-time value of EXPR in a program that includes
+# INCLUDES, setting VAR accordingly. Returns whether the value could be
+# computed
+ac_fn_c_compute_int ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_hi=$ac_mid; break
+else
+ as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) < 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_lo=$ac_mid; break
+else
+ as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ ac_lo= ac_hi=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_hi=$ac_mid
+else
+ as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in #((
+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+'') ac_retval=1 ;;
+esac
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (($2) < 0)
+ {
+ long int i = longval ();
+ if (i != ($2))
+ return 1;
+ fprintf (f, "%ld", i);
+ }
+ else
+ {
+ unsigned long int i = ulongval ();
+ if (i != ($2))
+ return 1;
+ fprintf (f, "%lu", i);
+ }
+ /* Do not output a trailing newline, as this causes \r\n confusion
+ on some platforms. */
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+else
+ ac_retval=1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f conftest.val
+
+ fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ return $ac_retval
+
+} # ac_fn_c_compute_int
+
+# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+# ----------------------------------------------------
+# Tries to find if the field MEMBER exists in type AGGR, after including
+# INCLUDES, setting cache variable VAR accordingly.
+ac_fn_c_check_member ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (ac_aggr.$3)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$4=yes"
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (sizeof ac_aggr.$3)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$4=yes"
+else
+ eval "$4=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$4
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_member
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR
+# ------------------------------------
+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+ac_fn_c_check_decl ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
+$as_echo_n "checking whether $2 is declared... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+#ifndef $2
+ (void) $2;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_decl
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 $as_me, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@
@@ -1530,8 +2273,8 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
-done
+ $as_echo "PATH: $as_dir"
+ done
IFS=$as_save_IFS
} >&5
@@ -1565,12 +2308,12 @@ do
| -silent | --silent | --silen | --sile | --sil)
continue ;;
*\'*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
2)
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+ as_fn_append ac_configure_args1 " '$ac_arg'"
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
@@ -1586,13 +2329,13 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
- ac_configure_args="$ac_configure_args '$ac_arg'"
+ as_fn_append ac_configure_args " '$ac_arg'"
;;
esac
done
done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
@@ -1617,12 +2360,13 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
- *) $as_unset $ac_var ;;
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) { eval $ac_var=; unset $ac_var;} ;;
esac ;;
esac
done
@@ -1651,9 +2395,9 @@ _ASBOX
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- echo "$ac_var='\''$ac_val'\''"
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
@@ -1668,9 +2412,9 @@ _ASBOX
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- echo "$ac_var='\''$ac_val'\''"
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
@@ -1686,64 +2430,69 @@ _ASBOX
echo
fi
test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
+ $as_echo "$as_me: caught signal $ac_signal"
+ $as_echo "$as_me: exit $exit_status"
} >&5
rm -f core *.core core.conftest.* &&
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
done
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -f -r conftest* confdefs.h
+$as_echo "/* confdefs.h */" > confdefs.h
+
# Predefined preprocessor variables.
cat >>confdefs.h <<_ACEOF
#define PACKAGE_NAME "$PACKAGE_NAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION "$PACKAGE_VERSION"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_STRING "$PACKAGE_STRING"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- set x "$CONFIG_SITE"
+ ac_site_file1=$CONFIG_SITE
elif test "x$prefix" != xNONE; then
- set x "$prefix/share/config.site" "$prefix/etc/config.site"
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
else
- set x "$ac_default_prefix/share/config.site" \
- "$ac_default_prefix/etc/config.site"
+ ac_site_file1=$ac_default_prefix/share/config.site
+ ac_site_file2=$ac_default_prefix/etc/config.site
fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
+ test "x$ac_site_file" = xNONE && continue
if test -r "$ac_site_file"; then
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
fi
@@ -1753,16 +2502,16 @@ if test -r "$cache_file"; then
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
*) . "./$cache_file";;
esac
fi
else
- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -1776,60 +2525,56 @@ for ac_var in $ac_precious_vars; do
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=:
+ # differences in whitespace do not lead to failure.
+ ac_old_val_w=`echo x $ac_old_val`
+ ac_new_val_w=`echo x $ac_new_val`
+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ ac_cache_corrupted=:
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ eval $ac_var=\$ac_old_val
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
esac
fi
done
if $ac_cache_corrupted; then
- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -1841,24 +2586,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_aux_dir=
for ac_dir in config "$srcdir"/config; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
+ for ac_t in install-sh install.sh shtool; do
+ if test -f "$ac_dir/$ac_t"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
+ break 2
+ fi
+ done
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -1902,8 +2639,8 @@ Sep) MONTH_NUM=09; E2FSPROGS_MONTH="September" ;;
Oct) MONTH_NUM=10; E2FSPROGS_MONTH="October" ;;
Nov) MONTH_NUM=11; E2FSPROGS_MONTH="November" ;;
Dec) MONTH_NUM=12; E2FSPROGS_MONTH="December" ;;
-*) { echo "$as_me:$LINENO: WARNING: Unknown month $MONTH??" >&5
-echo "$as_me: WARNING: Unknown month $MONTH??" >&2;} ;;
+*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unknown month $MONTH??" >&5
+$as_echo "$as_me: WARNING: Unknown month $MONTH??" >&2;} ;;
esac
base_ver=`echo $E2FSPROGS_VERSION | \
@@ -1921,10 +2658,10 @@ case $E2FSPROGS_VERSION in
esac
unset DATE MONTH YEAR base_ver pre_vers date_spec
-{ echo "$as_me:$LINENO: result: Generating configuration file for e2fsprogs version $E2FSPROGS_VERSION" >&5
-echo "${ECHO_T}Generating configuration file for e2fsprogs version $E2FSPROGS_VERSION" >&6; }
-{ echo "$as_me:$LINENO: result: Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}" >&5
-echo "${ECHO_T}Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Generating configuration file for e2fsprogs version $E2FSPROGS_VERSION" >&5
+$as_echo "Generating configuration file for e2fsprogs version $E2FSPROGS_VERSION" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}" >&5
+$as_echo "Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}" >&6; }
@@ -1932,35 +2669,27 @@ echo "${ECHO_T}Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}" >&6; }
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
- { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -1976,28 +2705,24 @@ IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-if test "${ac_cv_host+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
- { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -2013,28 +2738,7 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-WITH_DIET_LIBC=
-
-# Check whether --with-diet-libc was given.
-if test "${with_diet_libc+set}" = set; then
- withval=$with_diet_libc; CC="diet cc -nostdinc"
-WITH_DIET_LIBC=yes
-{ echo "$as_me:$LINENO: result: CC=$CC" >&5
-echo "${ECHO_T}CC=$CC" >&6; }
-fi
-
-# Check whether --with-cc was given.
-if test "${with_cc+set}" = set; then
- withval=$with_cc; { echo "$as_me:$LINENO: result: CC=$withval" >&5
-echo "${ECHO_T}CC=$withval" >&6; }
-CC=$withval
-else
- if test -z "$CC" ; then CC=cc; fi
-{ echo "$as_me:$LINENO: result: CC defaults to $CC" >&5
-echo "${ECHO_T}CC defaults to $CC" >&6; }
-fi
-export CC
-
+DLOPEN_LIB=''
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2043,10 +2747,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2056,25 +2760,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2083,10 +2787,10 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2096,25 +2800,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_CC" = x; then
@@ -2122,12 +2826,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@ -2140,10 +2840,10 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2153,25 +2853,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2180,10 +2880,10 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2194,18 +2894,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
fi
ac_cv_prog_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
@@ -2224,11 +2924,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2239,10 +2939,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2252,25 +2952,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2283,10 +2983,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2296,25 +2996,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2326,12 +3026,8 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@ -2341,98 +3037,82 @@ fi
fi
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler --version >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ rm -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+#include <stdio.h>
int
main ()
{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
;
return 0;
}
_ACEOF
ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort. b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions. Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
ac_rmfiles=
for ac_file in $ac_files
do
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
* ) ac_rmfiles="$ac_rmfiles $ac_file";;
esac
done
rm -f $ac_rmfiles
-if { (ac_try="$ac_link_default"
+if { { ac_try="$ac_link_default"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_link_default") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
@@ -2442,14 +3122,14 @@ for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
;;
[ab].out )
# We found the default executable, but exeext='' is most
# certainly right.
break;;
*.* )
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
@@ -2468,78 +3148,75 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
else
ac_file=''
fi
-
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
-if test -z "$ac_file"; then
- echo "$as_me: failed program was:" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+if test -z "$ac_file"; then :
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
fi
-
ac_exeext=$ac_cv_exeext
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
if { ac_try='./$ac_file'
- { (case "(($ac_try" in
+ { { case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
cross_compiling=no
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+See \`config.log' for more details." "$LINENO" 5; }
fi
fi
fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
ac_clean_files=$ac_clean_files_save
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
-
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-if { (ac_try="$ac_link"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_link") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -2547,37 +3224,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
break;;
* ) break;;
esac
done
else
- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
fi
-
rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-if test "${ac_cv_objext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if test "${ac_cv_objext+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -2589,51 +3260,46 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
+if { { ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_compile") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
done
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
fi
-
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -2647,54 +3313,34 @@ 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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_compiler_gnu=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GCC=yes
+else
+ GCC=
+fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
ac_cv_prog_cc_g=no
CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -2705,34 +3351,27 @@ 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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_g=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
- CFLAGS=""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+int
+main ()
+{
+
+ ;
+ return 0;
+}
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -2743,35 +3382,576 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
+ CFLAGS="-g -O2"
+ else
+ CFLAGS="-g"
+ fi
+else
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
+ else
+ CFLAGS=
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+ xno)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dl_dlopen=yes
+else
+ ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+ DLOPEN_LIB=-ldl
+$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
+
+fi
+
+
+WITH_DIET_LIBC=
+
+# Check whether --with-diet-libc was given.
+if test "${with_diet_libc+set}" = set; then :
+ withval=$with_diet_libc; CC="diet cc -nostdinc"
+WITH_DIET_LIBC=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: CC=$CC" >&5
+$as_echo "CC=$CC" >&6; }
+fi
+
+# Check whether --with-cc was given.
+if test "${with_cc+set}" = set; then :
+ withval=$with_cc; as_fn_error "--with-cc no longer supported; use CC= instead" "$LINENO" 5
+fi
+
+
+# Check whether --with-ccopts was given.
+if test "${with_ccopts+set}" = set; then :
+ withval=$with_ccopts; as_fn_error "--with-ccopts no longer supported; use CFLAGS= instead" "$LINENO" 5
+fi
+
+
+# Check whether --with-ldopts was given.
+if test "${with_ldopts+set}" = set; then :
+ withval=$with_ldopts; as_fn_error "--with-ldopts no longer supported; use LDFLAGS= instead" "$LINENO" 5
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+else
+ CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ fi
+fi
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $# != 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+ fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in cl.exe
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$CC" && break
+ done
+fi
+if test -z "$CC"; then
+ ac_ct_CC=$CC
+ for ac_prog in cl.exe
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CC" && break
+done
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- 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
- :
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ rm -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
- ac_c_werror_flag=$ac_save_c_werror_flag
- CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
+#endif
+
+ ;
+ return 0;
+}
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_compiler_gnu=yes
+else
+ ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GCC=yes
+else
+ GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -2782,42 +3962,49 @@ 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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_g=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int
+main ()
+{
-fi
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
@@ -2833,18 +4020,14 @@ else
CFLAGS=
fi
fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
@@ -2901,31 +4084,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
- 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 "echo \"\$as_me:$LINENO: $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
- 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
+ if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_c89=$ac_arg
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
@@ -2936,17 +4097,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
- { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
xno)
- { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
*)
CC="$CC $ac_cv_prog_cc_c89"
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -2959,15 +4122,15 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if test "${ac_cv_prog_CPP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -2981,11 +4144,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -2994,76 +4153,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
-
rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
fi
-
rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+if $ac_preproc_ok; then :
break
fi
@@ -3075,8 +4192,8 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
@@ -3086,11 +4203,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -3099,83 +4212,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
-
rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
fi
-
rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
+if $ac_preproc_ok; then :
+
else
- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
fi
ac_ext=c
@@ -3185,66 +4255,40 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-# Check whether --with-linker was given.
-if test "${with_linker+set}" = set; then
- withval=$with_linker; { echo "$as_me:$LINENO: result: LD=$withval" >&5
-echo "${ECHO_T}LD=$withval" >&6; }
-LD=$withval
-else
- if test -z "$LD" ; then LD=$CC; fi
-{ echo "$as_me:$LINENO: result: LD defaults to $LD" >&5
-echo "${ECHO_T}LD defaults to $LD" >&6; }
-fi
-export LD
-
-
-# Check whether --with-ccopts was given.
-if test "${with_ccopts+set}" = set; then
- withval=$with_ccopts; { echo "$as_me:$LINENO: result: CCOPTS is $withval" >&5
-echo "${ECHO_T}CCOPTS is $withval" >&6; }
-CFLAGS=$withval
-fi
-
-
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
+ if test -z "$GREP"; then
ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
- # Check for GNU ac_path_GREP and select it if it is found.
+ for ac_prog in grep ggrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
*GNU*)
ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
*)
ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ $as_echo_n 0123456789 >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- echo 'GREP' >> "conftest.nl"
+ $as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
@@ -3256,77 +4300,61 @@ case `"$ac_path_GREP" --version 2>&1` in
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
-
- $ac_path_GREP_found && break 3
+ $ac_path_GREP_found && break 3
+ done
+ done
done
-done
-
-done
IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
+ if test -z "$ac_cv_path_GREP"; then
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
else
ac_cv_path_GREP=$GREP
fi
-
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
GREP="$ac_cv_path_GREP"
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
then ac_cv_path_EGREP="$GREP -E"
else
- # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+ if test -z "$EGREP"; then
ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
- # Check for GNU ac_path_EGREP and select it if it is found.
+ for ac_prog in egrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
*GNU*)
ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
*)
ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ $as_echo_n 0123456789 >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- echo 'EGREP' >> "conftest.nl"
+ $as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
@@ -3338,46 +4366,31 @@ case `"$ac_path_EGREP" --version 2>&1` in
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
-
- $ac_path_EGREP_found && break 3
+ $ac_path_EGREP_found && break 3
+ done
+ done
done
-done
-
-done
IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
+ if test -z "$ac_cv_path_EGREP"; then
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
else
ac_cv_path_EGREP=$EGREP
fi
-
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
@@ -3392,47 +4405,23 @@ 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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_header_stdc=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <string.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -3442,18 +4431,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
+ $EGREP "free" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -3463,14 +4448,10 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; 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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
@@ -3497,113 +4478,36 @@ main ()
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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+ ac_cv_header_stdc=no
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
fi
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&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 "echo \"\$as_me:$LINENO: $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
- 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
- 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 echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -3611,132 +4515,8 @@ fi
done
-if test "${ac_cv_header_linux_fs_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for linux/fs.h" >&5
-echo $ECHO_N "checking for linux/fs.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_linux_fs_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_fs_h" >&5
-echo "${ECHO_T}$ac_cv_header_linux_fs_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking linux/fs.h usability" >&5
-echo $ECHO_N "checking linux/fs.h usability... $ECHO_C" >&6; }
-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 <linux/fs.h>
-_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 "echo \"\$as_me:$LINENO: $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
- 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_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking linux/fs.h presence" >&5
-echo $ECHO_N "checking linux/fs.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <linux/fs.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: linux/fs.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: linux/fs.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: linux/fs.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: linux/fs.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: linux/fs.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: linux/fs.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: linux/fs.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: linux/fs.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: linux/fs.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: linux/fs.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: linux/fs.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: linux/fs.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: linux/fs.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: linux/fs.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: linux/fs.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: linux/fs.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for linux/fs.h" >&5
-echo $ECHO_N "checking for linux/fs.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_linux_fs_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_linux_fs_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_fs_h" >&5
-echo "${ECHO_T}$ac_cv_header_linux_fs_h" >&6; }
-
-fi
-if test $ac_cv_header_linux_fs_h = yes; then
+ac_fn_c_check_header_mongrel "$LINENO" "linux/fs.h" "ac_cv_header_linux_fs_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_fs_h" = x""yes; then :
linux_headers=yes
else
linux_headers=no
@@ -3747,8 +4527,8 @@ if test "$linux_headers" != yes; then
LINUX_INCLUDE='-I$(top_builddir)/include'
fi
-{ echo "$as_me:$LINENO: checking for additional special compiler flags" >&5
-echo $ECHO_N "checking for additional special compiler flags... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional special compiler flags" >&5
+$as_echo_n "checking for additional special compiler flags... " >&6; }
if test "$GCC" = yes
then
case "$host_cpu" in
@@ -3757,100 +4537,111 @@ then
fi
if test "x$addcflags" != x
then
- { echo "$as_me:$LINENO: result: $addcflags" >&5
-echo "${ECHO_T}$addcflags" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $addcflags" >&5
+$as_echo "$addcflags" >&6; }
CFLAGS="$addcflags $CFLAGS"
else
- { echo "$as_me:$LINENO: result: (none)" >&5
-echo "${ECHO_T}(none)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: (none)" >&5
+$as_echo "(none)" >&6; }
fi
LIB_EXT=.a
STATIC_LIB_EXT=.a
PROFILED_LIB_EXT=.a
-# Check whether --with-ldopts was given.
-if test "${with_ldopts+set}" = set; then
- withval=$with_ldopts; { echo "$as_me:$LINENO: result: LDFLAGS is $withval" >&5
-echo "${ECHO_T}LDFLAGS is $withval" >&6; }
-LDFLAGS=$withval
-fi
-
-
# Check whether --with-root-prefix was given.
-if test "${with_root_prefix+set}" = set; then
+if test "${with_root_prefix+set}" = set; then :
withval=$with_root_prefix; root_prefix=$withval
else
root_prefix=NONE
fi
# Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
+if test "${enable_maintainer_mode+set}" = set; then :
enableval=$enable_maintainer_mode; if test "$enableval" = "no"
then
MAINTAINER_CMT=#
- { echo "$as_me:$LINENO: result: Disabling maintainer mode" >&5
-echo "${ECHO_T}Disabling maintainer mode" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling maintainer mode" >&5
+$as_echo "Disabling maintainer mode" >&6; }
else
MAINTAINER_CMT=
- { echo "$as_me:$LINENO: result: Enabling maintainer mode" >&5
-echo "${ECHO_T}Enabling maintainer mode" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling maintainer mode" >&5
+$as_echo "Enabling maintainer mode" >&6; }
fi
else
MAINTAINER_CMT=#
-{ echo "$as_me:$LINENO: result: Disabling maintainer mode by default" >&5
-echo "${ECHO_T}Disabling maintainer mode by default" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling maintainer mode by default" >&5
+$as_echo "Disabling maintainer mode by default" >&6; }
fi
+# Check whether --enable-verbose-makecmds was given.
+if test "${enable_verbose_makecmds+set}" = set; then :
+ enableval=$enable_verbose_makecmds; if test "$enableval" = "no"
+then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling verbose make commands" >&5
+$as_echo "Disabling verbose make commands" >&6; }
+ E=@echo
+ Q=@
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling verbose make commands" >&5
+$as_echo "Enabling verbose make commands" >&6; }
+ E=@\\#
+ Q=
+fi
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling verbose make commands" >&5
+$as_echo "Disabling verbose make commands" >&6; }
+E=@echo
+Q=@
+
+fi
+
+
+
# Check whether --enable-compression was given.
-if test "${enable_compression+set}" = set; then
+if test "${enable_compression+set}" = set; then :
enableval=$enable_compression; if test "$enableval" = "no"
then
- { echo "$as_me:$LINENO: result: Disabling compression support" >&5
-echo "${ECHO_T}Disabling compression support" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling compression support" >&5
+$as_echo "Disabling compression support" >&6; }
else
- cat >>confdefs.h <<\_ACEOF
-#define ENABLE_COMPRESSION 1
-_ACEOF
+ $as_echo "#define ENABLE_COMPRESSION 1" >>confdefs.h
- { echo "$as_me:$LINENO: result: Enabling compression support" >&5
-echo "${ECHO_T}Enabling compression support" >&6; }
- { echo "$as_me:$LINENO: WARNING: Compression support is experimental" >&5
-echo "$as_me: WARNING: Compression support is experimental" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling compression support" >&5
+$as_echo "Enabling compression support" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Compression support is experimental" >&5
+$as_echo "$as_me: WARNING: Compression support is experimental" >&2;}
fi
else
- { echo "$as_me:$LINENO: result: Disabling compression support by default" >&5
-echo "${ECHO_T}Disabling compression support by default" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling compression support by default" >&5
+$as_echo "Disabling compression support by default" >&6; }
fi
# Check whether --enable-htree was given.
-if test "${enable_htree+set}" = set; then
+if test "${enable_htree+set}" = set; then :
enableval=$enable_htree; if test "$enableval" = "no"
then
HTREE_CMT=#
- { echo "$as_me:$LINENO: result: Disabling htree directory support" >&5
-echo "${ECHO_T}Disabling htree directory support" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling htree directory support" >&5
+$as_echo "Disabling htree directory support" >&6; }
else
HTREE_CMT=
- cat >>confdefs.h <<\_ACEOF
-#define ENABLE_HTREE 1
-_ACEOF
+ $as_echo "#define ENABLE_HTREE 1" >>confdefs.h
- { echo "$as_me:$LINENO: result: Enabling htree directory support" >&5
-echo "${ECHO_T}Enabling htree directory support" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling htree directory support" >&5
+$as_echo "Enabling htree directory support" >&6; }
fi
else
HTREE_CMT=
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_HTREE 1
-_ACEOF
+$as_echo "#define ENABLE_HTREE 1" >>confdefs.h
-{ echo "$as_me:$LINENO: result: Enabling htree directory support by default" >&5
-echo "${ECHO_T}Enabling htree directory support by default" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling htree directory support by default" >&5
+$as_echo "Enabling htree directory support by default" >&6; }
fi
@@ -3859,13 +4650,13 @@ E2_PKG_CONFIG_STATIC=--static
LDFLAG_DYNAMIC=
PRIVATE_LIBS_CMT=
# Check whether --enable-elf-shlibs was given.
-if test "${enable_elf_shlibs+set}" = set; then
+if test "${enable_elf_shlibs+set}" = set; then :
enableval=$enable_elf_shlibs; if test "$enableval" = "no"
then
ELF_CMT=#
MAKEFILE_ELF=/dev/null
- { echo "$as_me:$LINENO: result: Disabling ELF shared libraries" >&5
-echo "${ECHO_T}Disabling ELF shared libraries" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling ELF shared libraries" >&5
+$as_echo "Disabling ELF shared libraries" >&6; }
else
E2_PKG_CONFIG_STATIC=
ELF_CMT=
@@ -3879,28 +4670,28 @@ else
LIB_EXT=.so
PRIVATE_LIBS_CMT=#
LDFLAG_DYNAMIC='-Wl,-rpath-link,$(top_builddir)/lib'
- { echo "$as_me:$LINENO: result: Enabling ELF shared libraries" >&5
-echo "${ECHO_T}Enabling ELF shared libraries" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling ELF shared libraries" >&5
+$as_echo "Enabling ELF shared libraries" >&6; }
fi
else
MAKEFILE_ELF=/dev/null
ELF_CMT=#
-{ echo "$as_me:$LINENO: result: Disabling ELF shared libraries by default" >&5
-echo "${ECHO_T}Disabling ELF shared libraries by default" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling ELF shared libraries by default" >&5
+$as_echo "Disabling ELF shared libraries by default" >&6; }
fi
# Check whether --enable-bsd-shlibs was given.
-if test "${enable_bsd_shlibs+set}" = set; then
+if test "${enable_bsd_shlibs+set}" = set; then :
enableval=$enable_bsd_shlibs; if test "$enableval" = "no"
then
BSDLIB_CMT=#
MAKEFILE_BSDLIB=/dev/null
- { echo "$as_me:$LINENO: result: Disabling BSD shared libraries" >&5
-echo "${ECHO_T}Disabling BSD shared libraries" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling BSD shared libraries" >&5
+$as_echo "Disabling BSD shared libraries" >&6; }
else
E2_PKG_CONFIG_STATIC=
BSDLIB_CMT=
@@ -3912,66 +4703,66 @@ else
LIB_EXT=.dylib
;;
esac
- { echo "$as_me:$LINENO: result: Enabling BSD shared libraries" >&5
-echo "${ECHO_T}Enabling BSD shared libraries" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling BSD shared libraries" >&5
+$as_echo "Enabling BSD shared libraries" >&6; }
fi
else
MAKEFILE_BSDLIB=/dev/null
BSDLIB_CMT=#
-{ echo "$as_me:$LINENO: result: Disabling BSD shared libraries by default" >&5
-echo "${ECHO_T}Disabling BSD shared libraries by default" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling BSD shared libraries by default" >&5
+$as_echo "Disabling BSD shared libraries by default" >&6; }
fi
# Check whether --enable-profile was given.
-if test "${enable_profile+set}" = set; then
+if test "${enable_profile+set}" = set; then :
enableval=$enable_profile; if test "$enableval" = "no"
then
PROFILE_CMT=#
MAKEFILE_PROFILE=/dev/null
- { echo "$as_me:$LINENO: result: Disabling profiling libraries" >&5
-echo "${ECHO_T}Disabling profiling libraries" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling profiling libraries" >&5
+$as_echo "Disabling profiling libraries" >&6; }
else
PROFILE_CMT=
MAKEFILE_PROFILE=$srcdir/lib/Makefile.profile
PROFILED_LIB_EXT=_p.a
- { echo "$as_me:$LINENO: result: Building profiling libraries" >&5
-echo "${ECHO_T}Building profiling libraries" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building profiling libraries" >&5
+$as_echo "Building profiling libraries" >&6; }
fi
else
PROFILE_CMT=#
MAKEFILE_PROFILE=/dev/null
-{ echo "$as_me:$LINENO: result: Disabling profiling libraries by default" >&5
-echo "${ECHO_T}Disabling profiling libraries by default" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling profiling libraries by default" >&5
+$as_echo "Disabling profiling libraries by default" >&6; }
fi
# Check whether --enable-checker was given.
-if test "${enable_checker+set}" = set; then
+if test "${enable_checker+set}" = set; then :
enableval=$enable_checker; if test "$enableval" = "no"
then
CHECKER_CMT=#
MAKEFILE_CHECKER=/dev/null
- { echo "$as_me:$LINENO: result: Disabling checker libraries" >&5
-echo "${ECHO_T}Disabling checker libraries" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling checker libraries" >&5
+$as_echo "Disabling checker libraries" >&6; }
else
CHECKER_CMT=
MAKEFILE_CHECKER=$srcdir/lib/Makefile.checker
- { echo "$as_me:$LINENO: result: Building checker libraries" >&5
-echo "${ECHO_T}Building checker libraries" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building checker libraries" >&5
+$as_echo "Building checker libraries" >&6; }
fi
else
CHECKER_CMT=#
MAKEFILE_CHECKER=/dev/null
-{ echo "$as_me:$LINENO: result: Disabling checker libraries by default" >&5
-echo "${ECHO_T}Disabling checker libraries by default" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling checker libraries by default" >&5
+$as_echo "Disabling checker libraries by default" >&6; }
fi
@@ -3983,70 +4774,62 @@ fi
# Check whether --enable-jbd-debug was given.
-if test "${enable_jbd_debug+set}" = set; then
+if test "${enable_jbd_debug+set}" = set; then :
enableval=$enable_jbd_debug; if test "$enableval" = "no"
then
- { echo "$as_me:$LINENO: result: Disabling journal debugging" >&5
-echo "${ECHO_T}Disabling journal debugging" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling journal debugging" >&5
+$as_echo "Disabling journal debugging" >&6; }
else
- cat >>confdefs.h <<\_ACEOF
-#define CONFIG_JBD_DEBUG 1
-_ACEOF
+ $as_echo "#define CONFIG_JBD_DEBUG 1" >>confdefs.h
- { echo "$as_me:$LINENO: result: Enabling journal debugging" >&5
-echo "${ECHO_T}Enabling journal debugging" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling journal debugging" >&5
+$as_echo "Enabling journal debugging" >&6; }
fi
else
- { echo "$as_me:$LINENO: result: Disabling journal debugging by default" >&5
-echo "${ECHO_T}Disabling journal debugging by default" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling journal debugging by default" >&5
+$as_echo "Disabling journal debugging by default" >&6; }
fi
# Check whether --enable-blkid-debug was given.
-if test "${enable_blkid_debug+set}" = set; then
+if test "${enable_blkid_debug+set}" = set; then :
enableval=$enable_blkid_debug; if test "$enableval" = "no"
then
- { echo "$as_me:$LINENO: result: Disabling blkid debugging" >&5
-echo "${ECHO_T}Disabling blkid debugging" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling blkid debugging" >&5
+$as_echo "Disabling blkid debugging" >&6; }
else
- cat >>confdefs.h <<\_ACEOF
-#define CONFIG_BLKID_DEBUG 1
-_ACEOF
+ $as_echo "#define CONFIG_BLKID_DEBUG 1" >>confdefs.h
- { echo "$as_me:$LINENO: result: Enabling blkid debugging" >&5
-echo "${ECHO_T}Enabling blkid debugging" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling blkid debugging" >&5
+$as_echo "Enabling blkid debugging" >&6; }
fi
else
- { echo "$as_me:$LINENO: result: Disabling blkid debugging by default" >&5
-echo "${ECHO_T}Disabling blkid debugging by default" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling blkid debugging by default" >&5
+$as_echo "Disabling blkid debugging by default" >&6; }
fi
# Check whether --enable-testio-debug was given.
-if test "${enable_testio_debug+set}" = set; then
+if test "${enable_testio_debug+set}" = set; then :
enableval=$enable_testio_debug; if test "$enableval" = "no"
then
- { echo "$as_me:$LINENO: result: Disabling testio debugging" >&5
-echo "${ECHO_T}Disabling testio debugging" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling testio debugging" >&5
+$as_echo "Disabling testio debugging" >&6; }
TEST_IO_CMT="#"
else
TEST_IO_CMT=
- cat >>confdefs.h <<\_ACEOF
-#define CONFIG_TESTIO_DEBUG 1
-_ACEOF
+ $as_echo "#define CONFIG_TESTIO_DEBUG 1" >>confdefs.h
- { echo "$as_me:$LINENO: result: Enabling testio debugging" >&5
-echo "${ECHO_T}Enabling testio debugging" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling testio debugging" >&5
+$as_echo "Enabling testio debugging" >&6; }
fi
else
- { echo "$as_me:$LINENO: result: Enabling testio debugging by default" >&5
-echo "${ECHO_T}Enabling testio debugging by default" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define CONFIG_TESTIO_DEBUG 1
-_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling testio debugging by default" >&5
+$as_echo "Enabling testio debugging by default" >&6; }
+$as_echo "#define CONFIG_TESTIO_DEBUG 1" >>confdefs.h
TEST_IO_CMT=
@@ -4059,10 +4842,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
@@ -4074,14 +4857,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
;;
@@ -4089,11 +4872,11 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -4102,10 +4885,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
@@ -4117,14 +4900,221 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+
+fi
+LIBUUID=
+DEPLIBUUID=
+STATIC_LIBUUID=
+DEPSTATIC_LIBUUID=
+PROFILED_LIBUUID=
+DEPPROFILED_LIBUUID=
+UUID_CMT=
+# Check whether --enable-libuuid was given.
+if test "${enable_libuuid+set}" = set; then :
+ enableval=$enable_libuuid; if test "$enableval" = "no"
+then
+ if test -z "$PKG_CONFIG"; then
+ as_fn_error "pkg-config not installed; please install it." "$LINENO" 5
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5
+$as_echo_n "checking for uuid_generate in -luuid... " >&6; }
+if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-luuid $LIBUUID $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char uuid_generate ();
+int
+main ()
+{
+return uuid_generate ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_uuid_uuid_generate=yes
+else
+ ac_cv_lib_uuid_uuid_generate=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate" >&5
+$as_echo "$ac_cv_lib_uuid_uuid_generate" >&6; }
+if test "x$ac_cv_lib_uuid_uuid_generate" = x""yes; then :
+ LIBUUID=`$PKG_CONFIG --libs uuid`;
+ STATIC_LIBUUID=`$PKG_CONFIG --static --libs uuid`
+else
+ as_fn_error "external uuid library not found" "$LINENO" 5
+fi
+
+ UUID_CMT=#
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling private uuid library" >&5
+$as_echo "Disabling private uuid library" >&6; }
+else
+ LIBUUID='$(LIB)/libuuid'$LIB_EXT
+ DEPLIBUUID=$LIBUUID
+ STATIC_LIBUUID='$(LIB)/libuuid'$STATIC_LIB_EXT
+ DEPSTATIC_LIBUUID=$STATIC_LIBUUID
+ PROFILED_LIBUUID='$(LIB)/libuuid'$PROFILED_LIB_EXT
+ DEPPROFILED_LIBUUID=$PROFILED_LIBUUID
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling private uuid library" >&5
+$as_echo "Enabling private uuid library" >&6; }
+fi
+
+else
+ LIBUUID='$(LIB)/libuuid'$LIB_EXT
+DEPLIBUUID=$LIBUUID
+STATIC_LIBUUID='$(LIB)/libuuid'$STATIC_LIB_EXT
+DEPSTATIC_LIBUUID=$STATIC_LIBUUID
+PROFILED_LIBUUID='$(LIB)/libuuid'$PROFILED_LIB_EXT
+DEPPROFILED_LIBUUID=$PROFILED_LIBUUID
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling private uuid library by default" >&5
+$as_echo "Enabling private uuid library by default" >&6; }
+
+fi
+
+
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
IFS=$as_save_IFS
;;
@@ -4132,11 +5122,11 @@ esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -4144,12 +5134,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -4161,14 +5147,14 @@ fi
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
- { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
PKG_CONFIG=""
fi
@@ -4181,27 +5167,21 @@ PROFILED_LIBBLKID=
DEPPROFILED_LIBBLKID=
BLKID_CMT=
# Check whether --enable-libblkid was given.
-if test "${enable_libblkid+set}" = set; then
+if test "${enable_libblkid+set}" = set; then :
enableval=$enable_libblkid; if test "$enableval" = "no"
then
if test -z "$PKG_CONFIG"; then
- { { echo "$as_me:$LINENO: error: pkg-config not installed; please install it." >&5
-echo "$as_me: error: pkg-config not installed; please install it." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "pkg-config not installed; please install it." "$LINENO" 5
fi
- { echo "$as_me:$LINENO: checking for blkid_get_cache in -lblkid" >&5
-echo $ECHO_N "checking for blkid_get_cache in -lblkid... $ECHO_C" >&6; }
-if test "${ac_cv_lib_blkid_blkid_get_cache+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for blkid_get_cache in -lblkid" >&5
+$as_echo_n "checking for blkid_get_cache in -lblkid... " >&6; }
+if test "${ac_cv_lib_blkid_blkid_get_cache+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lblkid $LIBBLKID $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -4219,50 +5199,27 @@ return blkid_get_cache ();
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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_blkid_blkid_get_cache=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_blkid_blkid_get_cache=no
+ ac_cv_lib_blkid_blkid_get_cache=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_blkid_blkid_get_cache" >&5
-echo "${ECHO_T}$ac_cv_lib_blkid_blkid_get_cache" >&6; }
-if test $ac_cv_lib_blkid_blkid_get_cache = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_blkid_blkid_get_cache" >&5
+$as_echo "$ac_cv_lib_blkid_blkid_get_cache" >&6; }
+if test "x$ac_cv_lib_blkid_blkid_get_cache" = x""yes; then :
LIBBLKID=`$PKG_CONFIG --libs blkid`;
STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`
else
- { { echo "$as_me:$LINENO: error: external blkid library not found" >&5
-echo "$as_me: error: external blkid library not found" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "external blkid library not found" "$LINENO" 5
fi
BLKID_CMT=#
- { echo "$as_me:$LINENO: result: Disabling private blkid library" >&5
-echo "${ECHO_T}Disabling private blkid library" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling private blkid library" >&5
+$as_echo "Disabling private blkid library" >&6; }
else
LIBBLKID='$(LIB)/libblkid'$LIB_EXT
DEPLIBBLKID=$LIBBLKID
@@ -4270,12 +5227,10 @@ else
DEPSTATIC_LIBBLKID=$STATIC_LIBBLKID
PROFILED_LIBBLKID='$(LIB)/libblkid'$PROFILED_LIB_EXT
DEPPROFILED_LIBBLKID=$PROFILED_LIBBLKID
- cat >>confdefs.h <<\_ACEOF
-#define CONFIG_BUILD_FINDFS 1
-_ACEOF
+ $as_echo "#define CONFIG_BUILD_FINDFS 1" >>confdefs.h
- { echo "$as_me:$LINENO: result: Enabling private blkid library" >&5
-echo "${ECHO_T}Enabling private blkid library" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling private blkid library" >&5
+$as_echo "Enabling private blkid library" >&6; }
fi
else
@@ -4285,12 +5240,10 @@ STATIC_LIBBLKID='$(LIB)/libblkid'$STATIC_LIB_EXT
DEPSTATIC_LIBBLKID=$STATIC_LIBBLKID
PROFILED_LIBBLKID='$(LIB)/libblkid'$PROFILED_LIB_EXT
DEPPROFILED_LIBBLKID=$PROFILED_LIBBLKID
-cat >>confdefs.h <<\_ACEOF
-#define CONFIG_BUILD_FINDFS 1
-_ACEOF
+$as_echo "#define CONFIG_BUILD_FINDFS 1" >>confdefs.h
-{ echo "$as_me:$LINENO: result: Enabling private blkid library by default" >&5
-echo "${ECHO_T}Enabling private blkid library by default" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling private blkid library by default" >&5
+$as_echo "Enabling private blkid library by default" >&6; }
fi
@@ -4302,92 +5255,92 @@ fi
# Check whether --enable-debugfs was given.
-if test "${enable_debugfs+set}" = set; then
+if test "${enable_debugfs+set}" = set; then :
enableval=$enable_debugfs; if test "$enableval" = "no"
then
- { echo "$as_me:$LINENO: result: Disabling debugfs support" >&5
-echo "${ECHO_T}Disabling debugfs support" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling debugfs support" >&5
+$as_echo "Disabling debugfs support" >&6; }
DEBUGFS_CMT="#"
else
DEBUGFS_CMT=
- { echo "$as_me:$LINENO: result: Enabling debugfs support" >&5
-echo "${ECHO_T}Enabling debugfs support" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling debugfs support" >&5
+$as_echo "Enabling debugfs support" >&6; }
fi
else
- { echo "$as_me:$LINENO: result: Enabling debugfs support by default" >&5
-echo "${ECHO_T}Enabling debugfs support by default" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling debugfs support by default" >&5
+$as_echo "Enabling debugfs support by default" >&6; }
DEBUGFS_CMT=
fi
# Check whether --enable-imager was given.
-if test "${enable_imager+set}" = set; then
+if test "${enable_imager+set}" = set; then :
enableval=$enable_imager; if test "$enableval" = "no"
then
- { echo "$as_me:$LINENO: result: Disabling e2image support" >&5
-echo "${ECHO_T}Disabling e2image support" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling e2image support" >&5
+$as_echo "Disabling e2image support" >&6; }
IMAGER_CMT="#"
else
IMAGER_CMT=
- { echo "$as_me:$LINENO: result: Enabling e2image support" >&5
-echo "${ECHO_T}Enabling e2image support" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling e2image support" >&5
+$as_echo "Enabling e2image support" >&6; }
fi
else
- { echo "$as_me:$LINENO: result: Enabling e2image support by default" >&5
-echo "${ECHO_T}Enabling e2image support by default" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling e2image support by default" >&5
+$as_echo "Enabling e2image support by default" >&6; }
IMAGER_CMT=
fi
# Check whether --enable-resizer was given.
-if test "${enable_resizer+set}" = set; then
+if test "${enable_resizer+set}" = set; then :
enableval=$enable_resizer; if test "$enableval" = "no"
then
- { echo "$as_me:$LINENO: result: Disabling e2resize support" >&5
-echo "${ECHO_T}Disabling e2resize support" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling e2resize support" >&5
+$as_echo "Disabling e2resize support" >&6; }
RESIZER_CMT="#"
else
RESIZER_CMT=
- { echo "$as_me:$LINENO: result: Enabling e2resize support" >&5
-echo "${ECHO_T}Enabling e2resize support" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling e2resize support" >&5
+$as_echo "Enabling e2resize support" >&6; }
fi
else
- { echo "$as_me:$LINENO: result: Enabling e2resize support by default" >&5
-echo "${ECHO_T}Enabling e2resize support by default" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling e2resize support by default" >&5
+$as_echo "Enabling e2resize support by default" >&6; }
RESIZER_CMT=
fi
# Check whether --enable-fsck was given.
-if test "${enable_fsck+set}" = set; then
+if test "${enable_fsck+set}" = set; then :
enableval=$enable_fsck; if test "$enableval" = "no"
then
FSCK_PROG='' FSCK_MAN=''
- { echo "$as_me:$LINENO: result: Not building fsck wrapper" >&5
-echo "${ECHO_T}Not building fsck wrapper" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building fsck wrapper" >&5
+$as_echo "Not building fsck wrapper" >&6; }
else
FSCK_PROG=fsck FSCK_MAN=fsck.8
- { echo "$as_me:$LINENO: result: Building fsck wrapper" >&5
-echo "${ECHO_T}Building fsck wrapper" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building fsck wrapper" >&5
+$as_echo "Building fsck wrapper" >&6; }
fi
else
case "$host_os" in
gnu*)
FSCK_PROG='' FSCK_MAN=''
- { echo "$as_me:$LINENO: result: Not building fsck wrapper by default" >&5
-echo "${ECHO_T}Not building fsck wrapper by default" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building fsck wrapper by default" >&5
+$as_echo "Not building fsck wrapper by default" >&6; }
;;
*)
FSCK_PROG=fsck FSCK_MAN=fsck.8
- { echo "$as_me:$LINENO: result: Building fsck wrapper by default" >&5
-echo "${ECHO_T}Building fsck wrapper by default" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building fsck wrapper by default" >&5
+$as_echo "Building fsck wrapper by default" >&6; }
esac
fi
@@ -4395,50 +5348,50 @@ fi
# Check whether --enable-e2initrd-helper was given.
-if test "${enable_e2initrd_helper+set}" = set; then
+if test "${enable_e2initrd_helper+set}" = set; then :
enableval=$enable_e2initrd_helper; if test "$enableval" = "no"
then
E2INITRD_PROG='' E2INITRD_MAN=''
- { echo "$as_me:$LINENO: result: Not building e2initrd helper" >&5
-echo "${ECHO_T}Not building e2initrd helper" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building e2initrd helper" >&5
+$as_echo "Not building e2initrd helper" >&6; }
else
E2INITRD_PROG=e2initrd_helper E2INITRD_MAN=e2initrd_helper.8
- { echo "$as_me:$LINENO: result: Building e2initrd helper" >&5
-echo "${ECHO_T}Building e2initrd helper" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building e2initrd helper" >&5
+$as_echo "Building e2initrd helper" >&6; }
fi
else
E2INITRD_PROG=e2initrd_helper E2INITRD_MAN=e2initrd_helper.8
-{ echo "$as_me:$LINENO: result: Building e2initrd helper by default" >&5
-echo "${ECHO_T}Building e2initrd helper by default" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Building e2initrd helper by default" >&5
+$as_echo "Building e2initrd helper by default" >&6; }
fi
# Check whether --enable-tls was given.
-if test "${enable_tls+set}" = set; then
+if test "${enable_tls+set}" = set; then :
enableval=$enable_tls; if test "$enableval" = "no"
then
try_tls=""
- { echo "$as_me:$LINENO: result: Disabling thread local support" >&5
-echo "${ECHO_T}Disabling thread local support" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling thread local support" >&5
+$as_echo "Disabling thread local support" >&6; }
else
try_tls="yes"
- { echo "$as_me:$LINENO: result: Enabling thread local support" >&5
-echo "${ECHO_T}Enabling thread local support" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling thread local support" >&5
+$as_echo "Enabling thread local support" >&6; }
fi
else
if test -n "$WITH_DIET_LIBC"
then
try_tls=""
- { echo "$as_me:$LINENO: result: Diet libc does not support thread local support" >&5
-echo "${ECHO_T}Diet libc does not support thread local support" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Diet libc does not support thread local support" >&5
+$as_echo "Diet libc does not support thread local support" >&6; }
else
try_tls="yes"
- { echo "$as_me:$LINENO: result: Try using thread local support by default" >&5
-echo "${ECHO_T}Try using thread local support by default" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Try using thread local support by default" >&5
+$as_echo "Try using thread local support by default" >&6; }
fi
fi
@@ -4446,10 +5399,10 @@ fi
if test "$try_tls" = "yes"
then
- { echo "$as_me:$LINENO: checking for thread local storage (TLS) class" >&5
-echo $ECHO_N "checking for thread local storage (TLS) class... $ECHO_C" >&6; }
- if test "${ac_cv_tls+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for thread local storage (TLS) class" >&5
+$as_echo_n "checking for thread local storage (TLS) class... " >&6; }
+ if test "${ac_cv_tls+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ax_tls_keywords="__thread __declspec(thread) none"
@@ -4457,11 +5410,7 @@ else
case $ax_tls_keyword in
none) ac_cv_tls=none ; break ;;
*)
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
static void
@@ -4477,32 +5426,12 @@ 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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_tls=$ax_tls_keyword ; break
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_tls=none
+ ac_cv_tls=none
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
esac
done
@@ -4517,35 +5446,31 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
fi
- { echo "$as_me:$LINENO: result: $ac_cv_tls" >&5
-echo "${ECHO_T}$ac_cv_tls" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tls" >&5
+$as_echo "$ac_cv_tls" >&6; }
fi
# Check whether --enable-uuidd was given.
-if test "${enable_uuidd+set}" = set; then
+if test "${enable_uuidd+set}" = set; then :
enableval=$enable_uuidd; if test "$enableval" = "no"
then
- { echo "$as_me:$LINENO: result: Not building uuidd" >&5
-echo "${ECHO_T}Not building uuidd" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building uuidd" >&5
+$as_echo "Not building uuidd" >&6; }
UUIDD_CMT="#"
else
- cat >>confdefs.h <<\_ACEOF
-#define USE_UUIDD 1
-_ACEOF
+ $as_echo "#define USE_UUIDD 1" >>confdefs.h
UUIDD_CMT=""
- { echo "$as_me:$LINENO: result: Building uuidd" >&5
-echo "${ECHO_T}Building uuidd" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building uuidd" >&5
+$as_echo "Building uuidd" >&6; }
fi
else
- cat >>confdefs.h <<\_ACEOF
-#define USE_UUIDD 1
-_ACEOF
+ $as_echo "#define USE_UUIDD 1" >>confdefs.h
UUIDD_CMT=""
-{ echo "$as_me:$LINENO: result: Building uuidd by default" >&5
-echo "${ECHO_T}Building uuidd by default" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Building uuidd by default" >&5
+$as_echo "Building uuidd by default" >&6; }
fi
@@ -4568,11 +5493,12 @@ _ACEOF
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
@@ -4589,12 +5515,12 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
SET_MAKE=
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -4611,22 +5537,23 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${ac_cv_path_install+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
- ./ | .// | /cC/* | \
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+ ./ | .// | /[cC]/* | \
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
@@ -4644,17 +5571,29 @@ case $as_dir/ in
# program-specific install script used by HP pwplus--don't use.
:
else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
+ rm -rf conftest.one conftest.two conftest.dir
+ echo one > conftest.one
+ echo two > conftest.two
+ mkdir conftest.dir
+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+ test -s conftest.one && test -s conftest.two &&
+ test -s conftest.dir/conftest.one &&
+ test -s conftest.dir/conftest.two
+ then
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
fi
fi
done
done
;;
esac
-done
+
+ done
IFS=$as_save_IFS
+rm -rf conftest.one conftest.two conftest.dir
fi
if test "${ac_cv_path_install+set}" = set; then
@@ -4667,8 +5606,8 @@ fi
INSTALL=$ac_install_sh
fi
fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
@@ -4692,17 +5631,17 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
# Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then
+if test "${enable_nls+set}" = set; then :
enableval=$enable_nls; USE_NLS=$enableval
else
USE_NLS=yes
fi
- { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
@@ -4739,10 +5678,10 @@ rm -f conf$$.file
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
[\\/]* | ?:[\\/]*)
@@ -4770,19 +5709,19 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != ":"; then
- { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $GMSGFMT in
[\\/]* | ?:[\\/]*)
@@ -4794,14 +5733,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
@@ -4810,11 +5749,11 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
- { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -4850,10 +5789,10 @@ rm -f conf$$.file
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
[\\/]* | ?:[\\/]*)
@@ -4881,11 +5820,11 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
- { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
rm -f messages.po
@@ -4921,10 +5860,10 @@ rm -f conf$$.file
# Extract the first word of "msgmerge", so it can be a program name with args.
set dummy msgmerge; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case "$MSGMERGE" in
[\\/]* | ?:[\\/]*)
@@ -4951,11 +5890,11 @@ esac
fi
MSGMERGE="$ac_cv_path_MSGMERGE"
if test "$MSGMERGE" != ":"; then
- { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-echo "${ECHO_T}$MSGMERGE" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+$as_echo "$MSGMERGE" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -4965,8 +5904,8 @@ fi
: ;
else
GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
- { echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
-echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
+$as_echo "found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
GMSGFMT=":"
fi
fi
@@ -4976,8 +5915,8 @@ echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
(if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
: ;
else
- { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
+$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
rm -f messages.po
@@ -4989,10 +5928,10 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -5002,25 +5941,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -5029,10 +5968,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -5042,25 +5981,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_RANLIB" = x; then
@@ -5068,12 +6007,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
RANLIB=$ac_ct_RANLIB
@@ -5083,18 +6018,14 @@ else
fi
- { echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
-echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6; }
-if test "${ac_cv_lib_cposix_strerror+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strerror in -lcposix" >&5
+$as_echo_n "checking for strerror in -lcposix... " >&6; }
+if test "${ac_cv_lib_cposix_strerror+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcposix $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -5112,54 +6043,29 @@ return strerror ();
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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_cposix_strerror=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_cposix_strerror=no
+ ac_cv_lib_cposix_strerror=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
-echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6; }
-if test $ac_cv_lib_cposix_strerror = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cposix_strerror" >&5
+$as_echo "$ac_cv_lib_cposix_strerror" >&6; }
+if test "x$ac_cv_lib_cposix_strerror" = x""yes; then :
LIBS="$LIBS -lcposix"
fi
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
-if test "${ac_cv_c_const+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if test "${ac_cv_c_const+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -5219,54 +6125,28 @@ 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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_const=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_c_const=no
+ ac_cv_c_const=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
if test $ac_cv_c_const = no; then
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
+$as_echo "#define const /**/" >>confdefs.h
fi
- { echo "$as_me:$LINENO: checking for signed" >&5
-echo $ECHO_N "checking for signed... $ECHO_C" >&6; }
-if test "${bh_cv_c_signed+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for signed" >&5
+$as_echo_n "checking for signed... " >&6; }
+if test "${bh_cv_c_signed+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -5277,55 +6157,29 @@ signed char x;
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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
bh_cv_c_signed=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- bh_cv_c_signed=no
+ bh_cv_c_signed=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $bh_cv_c_signed" >&5
-echo "${ECHO_T}$bh_cv_c_signed" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bh_cv_c_signed" >&5
+$as_echo "$bh_cv_c_signed" >&6; }
if test $bh_cv_c_signed = no; then
-cat >>confdefs.h <<\_ACEOF
-#define signed
-_ACEOF
+$as_echo "#define signed /**/" >>confdefs.h
fi
-{ echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
-if test "${ac_cv_c_inline+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if test "${ac_cv_c_inline+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifndef __cplusplus
typedef int foo_t;
@@ -5334,39 +6188,16 @@ $ac_kw foo_t foo () {return 0; }
#endif
_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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_inline=$ac_kw
-else
- 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
test "$ac_cv_c_inline" != no && break
done
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
case $ac_cv_c_inline in
inline | yes) ;;
@@ -5383,61 +6214,9 @@ _ACEOF
;;
esac
-{ echo "$as_me:$LINENO: checking for off_t" >&5
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_off_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&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
-typedef off_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
- 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 "echo \"\$as_me:$LINENO: $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
- 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_type_off_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_off_t=no
-fi
+ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
+if test "x$ac_cv_type_off_t" = x""yes; then :
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
-if test $ac_cv_type_off_t = yes; then
- :
else
cat >>confdefs.h <<_ACEOF
@@ -5446,61 +6225,9 @@ _ACEOF
fi
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&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
-typedef size_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
- 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 "echo \"\$as_me:$LINENO: $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
- 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_type_size_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_size_t=no
-fi
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = x""yes; then :
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-if test $ac_cv_type_size_t = yes; then
- :
else
cat >>confdefs.h <<_ACEOF
@@ -5510,16 +6237,12 @@ _ACEOF
fi
- { echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long" >&5
+$as_echo_n "checking for long long... " >&6; }
+if test "${ac_cv_type_long_long+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
long long ll = 1LL; int i = 63;
int
@@ -5531,59 +6254,32 @@ long long llmax = (long long) -1;
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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_type_long_long=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_long_long=no
+ ac_cv_type_long_long=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long" >&5
+$as_echo "$ac_cv_type_long_long" >&6; }
if test $ac_cv_type_long_long = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LONG_LONG 1
-_ACEOF
+$as_echo "#define HAVE_LONG_LONG 1" >>confdefs.h
fi
- { echo "$as_me:$LINENO: checking for long double" >&5
-echo $ECHO_N "checking for long double... $ECHO_C" >&6; }
-if test "${gt_cv_c_long_double+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double" >&5
+$as_echo_n "checking for long double... " >&6; }
+if test "${gt_cv_c_long_double+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test "$GCC" = yes; then
gt_cv_c_long_double=yes
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* The Stardent Vistra knows sizeof(long double), but does not support it. */
@@ -5599,55 +6295,29 @@ 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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
gt_cv_c_long_double=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_c_long_double=no
+ gt_cv_c_long_double=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
fi
-{ echo "$as_me:$LINENO: result: $gt_cv_c_long_double" >&5
-echo "${ECHO_T}$gt_cv_c_long_double" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_long_double" >&5
+$as_echo "$gt_cv_c_long_double" >&6; }
if test $gt_cv_c_long_double = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LONG_DOUBLE 1
-_ACEOF
+$as_echo "#define HAVE_LONG_DOUBLE 1" >>confdefs.h
fi
- { echo "$as_me:$LINENO: checking for wchar_t" >&5
-echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6; }
-if test "${gt_cv_c_wchar_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
+$as_echo_n "checking for wchar_t... " >&6; }
+if test "${gt_cv_c_wchar_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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stddef.h>
wchar_t foo = (wchar_t)'\0';
@@ -5659,54 +6329,28 @@ 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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
gt_cv_c_wchar_t=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_c_wchar_t=no
+ gt_cv_c_wchar_t=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5
-echo "${ECHO_T}$gt_cv_c_wchar_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5
+$as_echo "$gt_cv_c_wchar_t" >&6; }
if test $gt_cv_c_wchar_t = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WCHAR_T 1
-_ACEOF
+$as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h
fi
- { echo "$as_me:$LINENO: checking for wint_t" >&5
-echo $ECHO_N "checking for wint_t... $ECHO_C" >&6; }
-if test "${gt_cv_c_wint_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <wchar.h>
wint_t foo = (wchar_t)'\0';
@@ -5718,54 +6362,28 @@ 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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
gt_cv_c_wint_t=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_c_wint_t=no
+ gt_cv_c_wint_t=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5
-echo "${ECHO_T}$gt_cv_c_wint_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$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
+$as_echo "#define HAVE_WINT_T 1" >>confdefs.h
fi
- { echo "$as_me:$LINENO: checking for inttypes.h" >&5
-echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; }
-if test "${jm_ac_cv_header_inttypes_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inttypes.h" >&5
+$as_echo_n "checking for inttypes.h... " >&6; }
+if test "${jm_ac_cv_header_inttypes_h+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <inttypes.h>
@@ -5777,35 +6395,15 @@ uintmax_t i = (uintmax_t) -1;
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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
jm_ac_cv_header_inttypes_h=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- jm_ac_cv_header_inttypes_h=no
+ jm_ac_cv_header_inttypes_h=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $jm_ac_cv_header_inttypes_h" >&5
-echo "${ECHO_T}$jm_ac_cv_header_inttypes_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $jm_ac_cv_header_inttypes_h" >&5
+$as_echo "$jm_ac_cv_header_inttypes_h" >&6; }
if test $jm_ac_cv_header_inttypes_h = yes; then
cat >>confdefs.h <<_ACEOF
@@ -5815,16 +6413,12 @@ _ACEOF
fi
- { echo "$as_me:$LINENO: checking for stdint.h" >&5
-echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6; }
-if test "${jm_ac_cv_header_stdint_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint.h" >&5
+$as_echo_n "checking for stdint.h... " >&6; }
+if test "${jm_ac_cv_header_stdint_h+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <stdint.h>
@@ -5836,35 +6430,15 @@ uintmax_t i = (uintmax_t) -1;
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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
jm_ac_cv_header_stdint_h=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- jm_ac_cv_header_stdint_h=no
+ jm_ac_cv_header_stdint_h=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $jm_ac_cv_header_stdint_h" >&5
-echo "${ECHO_T}$jm_ac_cv_header_stdint_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $jm_ac_cv_header_stdint_h" >&5
+$as_echo "$jm_ac_cv_header_stdint_h" >&6; }
if test $jm_ac_cv_header_stdint_h = yes; then
cat >>confdefs.h <<_ACEOF
@@ -5876,16 +6450,12 @@ _ACEOF
- { echo "$as_me:$LINENO: checking for intmax_t" >&5
-echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6; }
-if test "${gt_cv_c_intmax_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intmax_t" >&5
+$as_echo_n "checking for intmax_t... " >&6; }
+if test "${gt_cv_c_intmax_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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stddef.h>
@@ -5905,58 +6475,32 @@ intmax_t x = -1;
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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
gt_cv_c_intmax_t=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_c_intmax_t=no
+ gt_cv_c_intmax_t=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $gt_cv_c_intmax_t" >&5
-echo "${ECHO_T}$gt_cv_c_intmax_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_intmax_t" >&5
+$as_echo "$gt_cv_c_intmax_t" >&6; }
if test $gt_cv_c_intmax_t = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_INTMAX_T 1
-_ACEOF
+$as_echo "#define HAVE_INTMAX_T 1" >>confdefs.h
fi
- { echo "$as_me:$LINENO: checking whether printf() supports POSIX/XSI format strings" >&5
-echo $ECHO_N "checking whether printf() supports POSIX/XSI format strings... $ECHO_C" >&6; }
-if test "${gt_cv_func_printf_posix+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether printf() supports POSIX/XSI format strings" >&5
+$as_echo_n "checking whether printf() supports POSIX/XSI format strings... " >&6; }
+if test "${gt_cv_func_printf_posix+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ 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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
@@ -5965,7 +6509,7 @@ cat >>conftest.$ac_ext <<_ACEOF
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "notposix" >/dev/null 2>&1; then
+ $EGREP "notposix" >/dev/null 2>&1; then :
gt_cv_func_printf_posix="guessing no"
else
gt_cv_func_printf_posix="guessing yes"
@@ -5974,11 +6518,7 @@ rm -f conftest*
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
@@ -5993,65 +6533,35 @@ int main ()
return (strcmp (buf, "55 33") != 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
gt_cv_func_printf_posix=yes
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gt_cv_func_printf_posix=no
+ gt_cv_func_printf_posix=no
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_printf_posix" >&5
-echo "${ECHO_T}$gt_cv_func_printf_posix" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_printf_posix" >&5
+$as_echo "$gt_cv_func_printf_posix" >&6; }
case $gt_cv_func_printf_posix in
*yes)
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_POSIX_PRINTF 1
-_ACEOF
+$as_echo "#define HAVE_POSIX_PRINTF 1" >>confdefs.h
;;
esac
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
-{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if test "${ac_cv_working_alloca_h+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <alloca.h>
int
@@ -6063,55 +6573,28 @@ char *p = (char *) alloca (2 * sizeof (int));
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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_working_alloca_h=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_working_alloca_h=no
+ ac_cv_working_alloca_h=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
if test $ac_cv_working_alloca_h = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA_H 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
fi
-{ echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if test "${ac_cv_func_alloca_works+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __GNUC__
# define alloca __builtin_alloca
@@ -6143,43 +6626,20 @@ char *p = (char *) alloca (1);
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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_func_alloca_works=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_alloca_works=no
+ ac_cv_func_alloca_works=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
if test $ac_cv_func_alloca_works = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
else
# The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -6189,21 +6649,15 @@ else
ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-cat >>confdefs.h <<\_ACEOF
-#define C_ALLOCA 1
-_ACEOF
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
-{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
-if test "${ac_cv_os_cray+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if test "${ac_cv_os_cray+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#if defined CRAY && ! defined CRAY2
webecray
@@ -6213,7 +6667,7 @@ wenotbecray
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "webecray" >/dev/null 2>&1; then
+ $EGREP "webecray" >/dev/null 2>&1; then :
ac_cv_os_cray=yes
else
ac_cv_os_cray=no
@@ -6221,94 +6675,14 @@ fi
rm -f conftest*
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- 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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define CRAY_STACKSEG_END $ac_func
@@ -6320,19 +6694,15 @@ fi
done
fi
-{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if test "${ac_cv_c_stack_direction+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ac_cv_c_stack_direction=0
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
int
@@ -6355,43 +6725,18 @@ main ()
return find_stack_direction () < 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_c_stack_direction=1
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_stack_direction=-1
+ ac_cv_c_stack_direction=-1
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
cat >>confdefs.h <<_ACEOF
#define STACK_DIRECTION $ac_cv_c_stack_direction
_ACEOF
@@ -6399,254 +6744,40 @@ _ACEOF
fi
-
-
for ac_header in stdlib.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-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 "echo \"\$as_me:$LINENO: $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
- 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_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
done
-
for ac_func in getpagesize
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- 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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+ ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
+if test "x$ac_cv_func_getpagesize" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_GETPAGESIZE 1
_ACEOF
fi
done
-{ echo "$as_me:$LINENO: checking for working mmap" >&5
-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }
-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
+$as_echo_n "checking for working mmap... " >&6; }
+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ac_cv_func_mmap_fixed_mapped=no
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
/* malloc might have been renamed as rpl_malloc. */
@@ -6775,62 +6906,32 @@ main ()
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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_func_mmap_fixed_mapped=yes
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_mmap_fixed_mapped=no
+ ac_cv_func_mmap_fixed_mapped=no
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
+$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
if test $ac_cv_func_mmap_fixed_mapped = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MMAP 1
-_ACEOF
+$as_echo "#define HAVE_MMAP 1" >>confdefs.h
fi
rm -f conftest.mmap
- { echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5
-echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6; }
-if test "${ac_cv_gnu_library_2_1+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$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; }
+if test "${ac_cv_gnu_library_2_1+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <features.h>
@@ -6842,7 +6943,7 @@ cat >>conftest.$ac_ext <<_ACEOF
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "Lucky GNU user" >/dev/null 2>&1; then
+ $EGREP "Lucky GNU user" >/dev/null 2>&1; then :
ac_cv_gnu_library_2_1=yes
else
ac_cv_gnu_library_2_1=no
@@ -6852,21 +6953,21 @@ rm -f conftest*
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
-echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5
+$as_echo "$ac_cv_gnu_library_2_1" >&6; }
GLIBC21="$ac_cv_gnu_library_2_1"
- { echo "$as_me:$LINENO: checking whether integer division by zero raises SIGFPE" >&5
-echo $ECHO_N "checking whether integer division by zero raises SIGFPE... $ECHO_C" >&6; }
-if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether integer division by zero raises SIGFPE" >&5
+$as_echo_n "checking whether integer division by zero raises SIGFPE... " >&6; }
+if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
# Guess based on the CPU.
case "$host_cpu" in
@@ -6877,11 +6978,7 @@ else
esac
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
@@ -6921,43 +7018,19 @@ int main ()
}
_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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
gt_cv_int_divbyzero_sigfpe=yes
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gt_cv_int_divbyzero_sigfpe=no
+ gt_cv_int_divbyzero_sigfpe=no
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
-{ echo "$as_me:$LINENO: result: $gt_cv_int_divbyzero_sigfpe" >&5
-echo "${ECHO_T}$gt_cv_int_divbyzero_sigfpe" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_int_divbyzero_sigfpe" >&5
+$as_echo "$gt_cv_int_divbyzero_sigfpe" >&6; }
case "$gt_cv_int_divbyzero_sigfpe" in
*yes) value=1;;
*) value=0;;
@@ -6969,16 +7042,12 @@ _ACEOF
- { echo "$as_me:$LINENO: checking for unsigned long long" >&5
-echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6; }
-if test "${ac_cv_type_unsigned_long_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long" >&5
+$as_echo_n "checking for unsigned long long... " >&6; }
+if test "${ac_cv_type_unsigned_long_long+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
unsigned long long ull = 1ULL; int i = 63;
int
@@ -6990,42 +7059,19 @@ unsigned long long ullmax = (unsigned long long) -1;
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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_type_unsigned_long_long=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_unsigned_long_long=no
+ ac_cv_type_unsigned_long_long=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long" >&5
+$as_echo "$ac_cv_type_unsigned_long_long" >&6; }
if test $ac_cv_type_unsigned_long_long = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UNSIGNED_LONG_LONG 1
-_ACEOF
+$as_echo "#define HAVE_UNSIGNED_LONG_LONG 1" >>confdefs.h
fi
@@ -7044,24 +7090,18 @@ _ACEOF
else
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UINTMAX_T 1
-_ACEOF
+$as_echo "#define HAVE_UINTMAX_T 1" >>confdefs.h
fi
- { echo "$as_me:$LINENO: checking for inttypes.h" >&5
-echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; }
-if test "${gt_cv_header_inttypes_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inttypes.h" >&5
+$as_echo_n "checking for inttypes.h... " >&6; }
+if test "${gt_cv_header_inttypes_h+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <inttypes.h>
@@ -7073,36 +7113,16 @@ 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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
gt_cv_header_inttypes_h=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_header_inttypes_h=no
+ gt_cv_header_inttypes_h=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $gt_cv_header_inttypes_h" >&5
-echo "${ECHO_T}$gt_cv_header_inttypes_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_header_inttypes_h" >&5
+$as_echo "$gt_cv_header_inttypes_h" >&6; }
if test $gt_cv_header_inttypes_h = yes; then
cat >>confdefs.h <<_ACEOF
@@ -7114,17 +7134,13 @@ _ACEOF
if test $gt_cv_header_inttypes_h = yes; then
- { echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5
-echo $ECHO_N "checking whether the inttypes.h PRIxNN macros are broken... $ECHO_C" >&6; }
-if test "${gt_cv_inttypes_pri_broken+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the inttypes.h PRIxNN macros are broken" >&5
+$as_echo_n "checking whether the inttypes.h PRIxNN macros are broken... " >&6; }
+if test "${gt_cv_inttypes_pri_broken+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <inttypes.h>
#ifdef PRId32
@@ -7139,36 +7155,16 @@ 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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
gt_cv_inttypes_pri_broken=no
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_inttypes_pri_broken=yes
+ gt_cv_inttypes_pri_broken=yes
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5
-echo "${ECHO_T}$gt_cv_inttypes_pri_broken" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_inttypes_pri_broken" >&5
+$as_echo "$gt_cv_inttypes_pri_broken" >&6; }
fi
if test "$gt_cv_inttypes_pri_broken" = yes; then
@@ -7179,154 +7175,22 @@ _ACEOF
fi
-
-for ac_header in stdint.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-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 "echo \"\$as_me:$LINENO: $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
- 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_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ for ac_header in stdint.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdint_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_STDINT_H 1
_ACEOF
fi
done
- { echo "$as_me:$LINENO: checking for SIZE_MAX" >&5
-echo $ECHO_N "checking for SIZE_MAX... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIZE_MAX" >&5
+$as_echo_n "checking for SIZE_MAX... " >&6; }
result=
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <limits.h>
@@ -7339,948 +7203,35 @@ Found it
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "Found it" >/dev/null 2>&1; then
+ $EGREP "Found it" >/dev/null 2>&1; then :
result=yes
fi
rm -f conftest*
if test -z "$result"; then
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 / 10) >= 0)];
-test_array [0] = 0
+ if ac_fn_c_compute_int "$LINENO" "~(size_t)0 / 10" "res_hi" "#include <stddef.h>"; then :
- ;
- 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 "echo \"\$as_me:$LINENO: $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
- 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_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_hi=$ac_mid; break
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
+ result=?
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 / 10) < 0)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 / 10) >= $ac_mid)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_lo=$ac_mid; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-fi
+ if ac_fn_c_compute_int "$LINENO" "~(size_t)0 % 10" "res_lo" "#include <stddef.h>"; then :
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
+ result=?
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)];
-test_array [0] = 0
+ if ac_fn_c_compute_int "$LINENO" "sizeof (size_t) <= sizeof (unsigned int)" "fits_in_uint" "#include <stddef.h>"; then :
- ;
- 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 "echo \"\$as_me:$LINENO: $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
- 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_hi=$ac_mid
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) res_hi=$ac_lo;;
-'') result=? ;;
-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 <stddef.h>
-static long int longval () { return ~(size_t)0 / 10; }
-static unsigned long int ulongval () { return ~(size_t)0 / 10; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if ((~(size_t)0 / 10) < 0)
- {
- long int i = longval ();
- if (i != (~(size_t)0 / 10))
- return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != (~(size_t)0 / 10))
- return 1;
- fprintf (f, "%lu\n", i);
- }
- return ferror (f) || fclose (f) != 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- res_hi=`cat conftest.val`
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-result=?
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 % 10) >= 0)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_hi=$ac_mid; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 % 10) < 0)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 % 10) >= $ac_mid)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_lo=$ac_mid; break
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
+ result=?
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_hi=$ac_mid
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) res_lo=$ac_lo;;
-'') result=? ;;
-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 <stddef.h>
-static long int longval () { return ~(size_t)0 % 10; }
-static unsigned long int ulongval () { return ~(size_t)0 % 10; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if ((~(size_t)0 % 10) < 0)
- {
- long int i = longval ();
- if (i != (~(size_t)0 % 10))
- return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != (~(size_t)0 % 10))
- return 1;
- fprintf (f, "%lu\n", i);
- }
- return ferror (f) || fclose (f) != 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- res_lo=`cat conftest.val`
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-result=?
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= 0)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_hi=$ac_mid; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) < 0)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= $ac_mid)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_lo=$ac_mid; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-int
-main ()
-{
-static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_hi=$ac_mid
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) fits_in_uint=$ac_lo;;
-'') result=? ;;
-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 <stddef.h>
-static long int longval () { return sizeof (size_t) <= sizeof (unsigned int); }
-static unsigned long int ulongval () { return sizeof (size_t) <= sizeof (unsigned int); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if ((sizeof (size_t) <= sizeof (unsigned int)) < 0)
- {
- long int i = longval ();
- if (i != (sizeof (size_t) <= sizeof (unsigned int)))
- return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != (sizeof (size_t) <= sizeof (unsigned int)))
- return 1;
- fprintf (f, "%lu\n", i);
- }
- return ferror (f) || fclose (f) != 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- fits_in_uint=`cat conftest.val`
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-result=?
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
if test "$fits_in_uint" = 1; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stddef.h>
extern size_t foo;
@@ -8294,31 +7245,9 @@ 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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
fits_in_uint=0
-else
- 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
if test -z "$result"; then
@@ -8331,8 +7260,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
result='~(size_t)0'
fi
fi
- { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
if test "$result" != yes; then
cat >>confdefs.h <<_ACEOF
@@ -8343,140 +7272,12 @@ _ACEOF
-
-for ac_header in stdint.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-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 "echo \"\$as_me:$LINENO: $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
- 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_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ for ac_header in stdint.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdint_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_STDINT_H 1
_ACEOF
fi
@@ -8502,7 +7303,7 @@ done
# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
+if test "${with_gnu_ld+set}" = set; then :
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
@@ -8524,8 +7325,8 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- { echo "$as_me:$LINENO: checking for ld used by GCC" >&5
-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
+$as_echo_n "checking for ld used by GCC... " >&6; }
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -8554,14 +7355,14 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
;;
esac
elif test "$with_gnu_ld" = yes; then
- { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
else
- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
fi
-if test "${acl_cv_path_LD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${acl_cv_path_LD+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
@@ -8588,19 +7389,17 @@ fi
LD="$acl_cv_path_LD"
if test -n "$LD"; then
- { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
-if test "${acl_cv_prog_gnu_ld+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${acl_cv_prog_gnu_ld+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU ld's only accept -v.
case `$LD -v 2>&1 </dev/null` in
@@ -8610,16 +7409,16 @@ case `$LD -v 2>&1 </dev/null` in
acl_cv_prog_gnu_ld=no ;;
esac
fi
-{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+$as_echo "$acl_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$acl_cv_prog_gnu_ld
- { echo "$as_me:$LINENO: checking for shared library run path origin" >&5
-echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; }
-if test "${acl_cv_rpath+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+$as_echo_n "checking for shared library run path origin... " >&6; }
+if test "${acl_cv_rpath+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
@@ -8629,8 +7428,8 @@ else
acl_cv_rpath=done
fi
-{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
-echo "${ECHO_T}$acl_cv_rpath" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+$as_echo "$acl_cv_rpath" >&6; }
wl="$acl_cv_wl"
libext="$acl_cv_libext"
shlibext="$acl_cv_shlibext"
@@ -8639,7 +7438,7 @@ echo "${ECHO_T}$acl_cv_rpath" >&6; }
hardcode_direct="$acl_cv_hardcode_direct"
hardcode_minus_L="$acl_cv_hardcode_minus_L"
# Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then
+if test "${enable_rpath+set}" = set; then :
enableval=$enable_rpath; :
else
enable_rpath=yes
@@ -8667,7 +7466,7 @@ fi
# Check whether --with-libiconv-prefix was given.
-if test "${with_libiconv_prefix+set}" = set; then
+if test "${with_libiconv_prefix+set}" = set; then :
withval=$with_libiconv_prefix;
if test "X$withval" = "Xno"; then
use_additional=no
@@ -9035,334 +7834,42 @@ fi
- { echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
-echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_ptrdiff_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&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
-typedef ptrdiff_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
- 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 "echo \"\$as_me:$LINENO: $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
- 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_type_ptrdiff_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_ptrdiff_t=no
-fi
+ ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
+if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
-echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6; }
-if test $ac_cv_type_ptrdiff_t = yes; then
- :
else
-cat >>confdefs.h <<\_ACEOF
-#define ptrdiff_t long
-_ACEOF
+$as_echo "#define ptrdiff_t long" >>confdefs.h
fi
-
-
-
-
-
-
-
-
-
-
-for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+ for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
stdlib.h string.h unistd.h sys/param.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-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 "echo \"\$as_me:$LINENO: $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
- 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_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
done
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in asprintf fwprintf getcwd getegid geteuid getgid getuid \
+ for ac_func in asprintf fwprintf getcwd getegid geteuid getgid getuid \
mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
__fsetlocking
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- 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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
@@ -9370,16 +7877,12 @@ done
- { echo "$as_me:$LINENO: checking whether _snprintf is declared" >&5
-echo $ECHO_N "checking whether _snprintf is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl__snprintf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$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 :
+ $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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
int
@@ -9394,35 +7897,15 @@ 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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_have_decl__snprintf=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl__snprintf=no
+ ac_cv_have_decl__snprintf=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl__snprintf" >&5
-echo "${ECHO_T}$ac_cv_have_decl__snprintf" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl__snprintf" >&5
+$as_echo "$ac_cv_have_decl__snprintf" >&6; }
if test $ac_cv_have_decl__snprintf = yes; then
gt_value=1
else
@@ -9435,16 +7918,12 @@ _ACEOF
- { echo "$as_me:$LINENO: checking whether _snwprintf is declared" >&5
-echo $ECHO_N "checking whether _snwprintf is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl__snwprintf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _snwprintf is declared" >&5
+$as_echo_n "checking whether _snwprintf is declared... " >&6; }
+if test "${ac_cv_have_decl__snwprintf+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
int
@@ -9459,35 +7938,15 @@ 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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_have_decl__snwprintf=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl__snwprintf=no
+ ac_cv_have_decl__snwprintf=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl__snwprintf" >&5
-echo "${ECHO_T}$ac_cv_have_decl__snwprintf" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl__snwprintf" >&5
+$as_echo "$ac_cv_have_decl__snwprintf" >&6; }
if test $ac_cv_have_decl__snwprintf = yes; then
gt_value=1
else
@@ -9501,16 +7960,12 @@ _ACEOF
- { echo "$as_me:$LINENO: checking whether feof_unlocked is declared" >&5
-echo $ECHO_N "checking whether feof_unlocked is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether feof_unlocked is declared" >&5
+$as_echo_n "checking whether feof_unlocked is declared... " >&6; }
+if test "${ac_cv_have_decl_feof_unlocked+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
int
@@ -9525,35 +7980,15 @@ 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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_have_decl_feof_unlocked=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl_feof_unlocked=no
+ ac_cv_have_decl_feof_unlocked=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_feof_unlocked" >&5
-echo "${ECHO_T}$ac_cv_have_decl_feof_unlocked" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_feof_unlocked" >&5
+$as_echo "$ac_cv_have_decl_feof_unlocked" >&6; }
if test $ac_cv_have_decl_feof_unlocked = yes; then
gt_value=1
else
@@ -9566,16 +8001,12 @@ _ACEOF
- { echo "$as_me:$LINENO: checking whether fgets_unlocked is declared" >&5
-echo $ECHO_N "checking whether fgets_unlocked is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fgets_unlocked is declared" >&5
+$as_echo_n "checking whether fgets_unlocked is declared... " >&6; }
+if test "${ac_cv_have_decl_fgets_unlocked+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
int
@@ -9590,35 +8021,15 @@ 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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_have_decl_fgets_unlocked=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl_fgets_unlocked=no
+ ac_cv_have_decl_fgets_unlocked=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_fgets_unlocked" >&5
-echo "${ECHO_T}$ac_cv_have_decl_fgets_unlocked" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_fgets_unlocked" >&5
+$as_echo "$ac_cv_have_decl_fgets_unlocked" >&6; }
if test $ac_cv_have_decl_fgets_unlocked = yes; then
gt_value=1
else
@@ -9631,16 +8042,12 @@ _ACEOF
- { echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5
-echo $ECHO_N "checking whether getc_unlocked is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getc_unlocked is declared" >&5
+$as_echo_n "checking whether getc_unlocked is declared... " >&6; }
+if test "${ac_cv_have_decl_getc_unlocked+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
int
@@ -9655,35 +8062,15 @@ 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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_have_decl_getc_unlocked=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl_getc_unlocked=no
+ ac_cv_have_decl_getc_unlocked=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5
-echo "${ECHO_T}$ac_cv_have_decl_getc_unlocked" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_getc_unlocked" >&5
+$as_echo "$ac_cv_have_decl_getc_unlocked" >&6; }
if test $ac_cv_have_decl_getc_unlocked = yes; then
gt_value=1
else
@@ -9750,19 +8137,15 @@ _ACEOF
done
- { echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
-if test "${am_cv_func_iconv+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
+if test "${am_cv_func_iconv+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
@@ -9776,42 +8159,15 @@ iconv_t cd = iconv_open("","");
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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
am_cv_func_iconv=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test "$am_cv_func_iconv" != yes; then
am_save_LIBS="$LIBS"
LIBS="$LIBS $LIBICONV"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
@@ -9825,53 +8181,28 @@ iconv_t cd = iconv_open("","");
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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
am_cv_lib_iconv=yes
am_cv_func_iconv=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$am_save_LIBS"
fi
fi
-{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-echo "${ECHO_T}$am_cv_func_iconv" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+$as_echo "$am_cv_func_iconv" >&6; }
if test "$am_cv_func_iconv" = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ICONV 1
-_ACEOF
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
fi
if test "$am_cv_lib_iconv" = yes; then
- { echo "$as_me:$LINENO: checking how to link with libiconv" >&5
-echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: $LIBICONV" >&5
-echo "${ECHO_T}$LIBICONV" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+$as_echo "$LIBICONV" >&6; }
else
CPPFLAGS="$am_save_CPPFLAGS"
LIBICONV=
@@ -9881,17 +8212,13 @@ echo "${ECHO_T}$LIBICONV" >&6; }
if test "$am_cv_func_iconv" = yes; then
- { echo "$as_me:$LINENO: checking for iconv declaration" >&5
-echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6; }
- if test "${am_cv_proto_iconv+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
+$as_echo_n "checking for iconv declaration... " >&6; }
+ if test "${am_cv_proto_iconv+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
@@ -9914,39 +8241,19 @@ 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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
am_cv_proto_iconv_arg1=""
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- am_cv_proto_iconv_arg1="const"
+ am_cv_proto_iconv_arg1="const"
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
fi
am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
- { echo "$as_me:$LINENO: result: ${ac_t:-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
}$am_cv_proto_iconv" >&5
-echo "${ECHO_T}${ac_t:-
+$as_echo "${ac_t:-
}$am_cv_proto_iconv" >&6; }
cat >>confdefs.h <<_ACEOF
@@ -9956,16 +8263,12 @@ _ACEOF
fi
- { echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
-echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6; }
-if test "${am_cv_langinfo_codeset+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+$as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
+if test "${am_cv_langinfo_codeset+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <langinfo.h>
int
@@ -9976,58 +8279,31 @@ char* cs = nl_langinfo(CODESET);
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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
am_cv_langinfo_codeset=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- am_cv_langinfo_codeset=no
+ am_cv_langinfo_codeset=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
-echo "${ECHO_T}$am_cv_langinfo_codeset" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
+$as_echo "$am_cv_langinfo_codeset" >&6; }
if test $am_cv_langinfo_codeset = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LANGINFO_CODESET 1
-_ACEOF
+$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
fi
if test $ac_cv_header_locale_h = yes; then
- { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
+$as_echo_n "checking for LC_MESSAGES... " >&6; }
+if test "${am_cv_val_LC_MESSAGES+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <locale.h>
int
@@ -10038,42 +8314,19 @@ return LC_MESSAGES
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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
am_cv_val_LC_MESSAGES=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- am_cv_val_LC_MESSAGES=no
+ am_cv_val_LC_MESSAGES=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
+$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
if test $am_cv_val_LC_MESSAGES = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LC_MESSAGES 1
-_ACEOF
+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
fi
@@ -10083,10 +8336,10 @@ _ACEOF
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_INTLBISON+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_INTLBISON+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$INTLBISON"; then
ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test.
@@ -10096,25 +8349,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_INTLBISON="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
INTLBISON=$ac_cv_prog_INTLBISON
if test -n "$INTLBISON"; then
- { echo "$as_me:$LINENO: result: $INTLBISON" >&5
-echo "${ECHO_T}$INTLBISON" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLBISON" >&5
+$as_echo "$INTLBISON" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -10124,8 +8377,8 @@ done
if test -z "$INTLBISON"; then
ac_verc_fail=yes
else
- { echo "$as_me:$LINENO: checking version of bison" >&5
-echo $ECHO_N "checking version of bison... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of bison" >&5
+$as_echo_n "checking version of bison... " >&6; }
ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
case $ac_prog_version in
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -10133,8 +8386,8 @@ echo $ECHO_N "checking version of bison... $ECHO_C" >&6; }
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
esac
- { echo "$as_me:$LINENO: result: $ac_prog_version" >&5
-echo "${ECHO_T}$ac_prog_version" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5
+$as_echo "$ac_prog_version" >&6; }
fi
if test $ac_verc_fail = yes; then
INTLBISON=:
@@ -10155,17 +8408,17 @@ echo "${ECHO_T}$ac_prog_version" >&6; }
- { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
# Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then
+if test "${enable_nls+set}" = set; then :
enableval=$enable_nls; USE_NLS=$enableval
else
USE_NLS=yes
fi
- { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
@@ -10180,18 +8433,18 @@ echo "${ECHO_T}$USE_NLS" >&6; }
if test "$USE_NLS" = "yes"; then
gt_use_preinstalled_gnugettext=no
- { echo "$as_me:$LINENO: checking whether included gettext is requested" >&5
-echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether included gettext is requested" >&5
+$as_echo_n "checking whether included gettext is requested... " >&6; }
# Check whether --with-included-gettext was given.
-if test "${with_included_gettext+set}" = set; then
+if test "${with_included_gettext+set}" = set; then :
withval=$with_included_gettext; nls_cv_force_use_gnu_gettext=$withval
else
nls_cv_force_use_gnu_gettext=no
fi
- { echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5
-echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $nls_cv_force_use_gnu_gettext" >&5
+$as_echo "$nls_cv_force_use_gnu_gettext" >&6; }
nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
@@ -10201,16 +8454,12 @@ echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6; }
- { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
-echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; }
-if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+$as_echo_n "checking for GNU gettext in libc... " >&6; }
+if test "${gt_cv_func_gnugettext1_libc+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <libintl.h>
extern int _nl_msg_cat_cntr;
@@ -10224,37 +8473,16 @@ return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
gt_cv_func_gnugettext1_libc=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_func_gnugettext1_libc=no
+ gt_cv_func_gnugettext1_libc=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
-echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libc" >&5
+$as_echo "$gt_cv_func_gnugettext1_libc" >&6; }
if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
@@ -10275,7 +8503,7 @@ echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6; }
# Check whether --with-libintl-prefix was given.
-if test "${with_libintl_prefix+set}" = set; then
+if test "${with_libintl_prefix+set}" = set; then :
withval=$with_libintl_prefix;
if test "X$withval" = "Xno"; then
use_additional=no
@@ -10636,20 +8864,16 @@ fi
done
fi
- { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
-echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; }
-if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+$as_echo_n "checking for GNU gettext in libintl... " >&6; }
+if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
gt_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $INCINTL"
gt_save_LIBS="$LIBS"
LIBS="$LIBS $LIBINTL"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <libintl.h>
extern int _nl_msg_cat_cntr;
@@ -10667,41 +8891,16 @@ return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
gt_cv_func_gnugettext1_libintl=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- gt_cv_func_gnugettext1_libintl=no
+ gt_cv_func_gnugettext1_libintl=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
LIBS="$LIBS $LIBICONV"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <libintl.h>
extern int _nl_msg_cat_cntr;
@@ -10719,43 +8918,20 @@ return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
LIBINTL="$LIBINTL $LIBICONV"
LTLIBINTL="$LTLIBINTL $LTLIBICONV"
gt_cv_func_gnugettext1_libintl=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
CPPFLAGS="$gt_save_CPPFLAGS"
LIBS="$gt_save_LIBS"
fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
-echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libintl" >&5
+$as_echo "$gt_cv_func_gnugettext1_libintl" >&6; }
fi
if test "$gt_cv_func_gnugettext1_libc" = "yes" \
@@ -10792,22 +8968,20 @@ echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6; }
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_NLS 1
-_ACEOF
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
else
USE_NLS=no
fi
fi
- { echo "$as_me:$LINENO: checking whether to use NLS" >&5
-echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
+$as_echo_n "checking whether to use NLS... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
if test "$USE_NLS" = "yes"; then
- { echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
-echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
+$as_echo_n "checking where the gettext function comes from... " >&6; }
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
gt_source="external libintl"
@@ -10817,18 +8991,18 @@ echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6; }
else
gt_source="included intl directory"
fi
- { echo "$as_me:$LINENO: result: $gt_source" >&5
-echo "${ECHO_T}$gt_source" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
+$as_echo "$gt_source" >&6; }
fi
if test "$USE_NLS" = "yes"; then
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
- { echo "$as_me:$LINENO: checking how to link with libintl" >&5
-echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: $LIBINTL" >&5
-echo "${ECHO_T}$LIBINTL" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
+$as_echo_n "checking how to link with libintl... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
+$as_echo "$LIBINTL" >&6; }
for element in $INCINTL; do
haveit=
@@ -10855,14 +9029,10 @@ echo "${ECHO_T}$LIBINTL" >&6; }
fi
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETTEXT 1
-_ACEOF
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DCGETTEXT 1
-_ACEOF
+$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
fi
@@ -10907,11 +9077,12 @@ _ACEOF
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
@@ -10928,21 +9099,50 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
SET_MAKE=
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
+$as_echo_n "checking for GNU make... " >&6; }
+if test "${_cv_gnu_make_command+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ _cv_gnu_make_command='' ;
+ for a in "$MAKE" make gmake gnumake ; do
+ if test -z "$a" ; then continue ; fi ;
+ if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
+ _cv_gnu_make_command=$a ;
+ break;
+ fi
+ done ;
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cv_gnu_make_command" >&5
+$as_echo "$_cv_gnu_make_command" >&6; } ;
+ if test "x$_cv_gnu_make_command" != "x" ; then
+ ifGNUmake='' ;
+ ifNotGNUmake='#' ;
+ else
+ ifGNUmake='#' ;
+ ifNotGNUmake='' ;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"Not found\"" >&5
+$as_echo "\"Not found\"" >&6; };
+ fi
+
+
+
# Extract the first word of "ln", so it can be a program name with args.
set dummy ln; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_LN+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_LN+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $LN in
[\\/]* | ?:[\\/]*)
@@ -10954,14 +9154,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_LN" && ac_cv_path_LN="ln"
@@ -10970,31 +9170,31 @@ esac
fi
LN=$ac_cv_path_LN
if test -n "$LN"; then
- { echo "$as_me:$LINENO: result: $LN" >&5
-echo "${ECHO_T}$LN" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LN" >&5
+$as_echo "$LN" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
LN_S=$as_ln_s
if test "$LN_S" = "ln -s"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
fi
# Extract the first word of "mv", so it can be a program name with args.
set dummy mv; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_MV+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MV+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $MV in
[\\/]* | ?:[\\/]*)
@@ -11006,14 +9206,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_MV" && ac_cv_path_MV="mv"
@@ -11022,20 +9222,20 @@ esac
fi
MV=$ac_cv_path_MV
if test -n "$MV"; then
- { echo "$as_me:$LINENO: result: $MV" >&5
-echo "${ECHO_T}$MV" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MV" >&5
+$as_echo "$MV" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
# Extract the first word of "cp", so it can be a program name with args.
set dummy cp; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_CP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_CP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $CP in
[\\/]* | ?:[\\/]*)
@@ -11047,14 +9247,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_CP" && ac_cv_path_CP="cp"
@@ -11063,20 +9263,20 @@ esac
fi
CP=$ac_cv_path_CP
if test -n "$CP"; then
- { echo "$as_me:$LINENO: result: $CP" >&5
-echo "${ECHO_T}$CP" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CP" >&5
+$as_echo "$CP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
# Extract the first word of "rm", so it can be a program name with args.
set dummy rm; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_RM+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_RM+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $RM in
[\\/]* | ?:[\\/]*)
@@ -11088,14 +9288,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_RM" && ac_cv_path_RM="rm"
@@ -11104,20 +9304,20 @@ esac
fi
RM=$ac_cv_path_RM
if test -n "$RM"; then
- { echo "$as_me:$LINENO: result: $RM" >&5
-echo "${ECHO_T}$RM" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
+$as_echo "$RM" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
# Extract the first word of "chmod", so it can be a program name with args.
set dummy chmod; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_CHMOD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_CHMOD+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $CHMOD in
[\\/]* | ?:[\\/]*)
@@ -11129,14 +9329,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_CHMOD" && ac_cv_path_CHMOD=":"
@@ -11145,11 +9345,11 @@ esac
fi
CHMOD=$ac_cv_path_CHMOD
if test -n "$CHMOD"; then
- { echo "$as_me:$LINENO: result: $CHMOD" >&5
-echo "${ECHO_T}$CHMOD" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHMOD" >&5
+$as_echo "$CHMOD" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -11157,10 +9357,10 @@ for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -11170,73 +9370,68 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
test -n "$AWK" && break
done
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
then ac_cv_path_EGREP="$GREP -E"
else
- # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+ if test -z "$EGREP"; then
ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
- # Check for GNU ac_path_EGREP and select it if it is found.
+ for ac_prog in egrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
*GNU*)
ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
*)
ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ $as_echo_n 0123456789 >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- echo 'EGREP' >> "conftest.nl"
+ $as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
@@ -11248,42 +9443,31 @@ case `"$ac_path_EGREP" --version 2>&1` in
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
-
- $ac_path_EGREP_found && break 3
+ $ac_path_EGREP_found && break 3
+ done
+ done
done
-done
-
-done
IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
+ if test -z "$ac_cv_path_EGREP"; then
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
else
ac_cv_path_EGREP=$EGREP
fi
-
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
# Extract the first word of "sed", so it can be a program name with args.
set dummy sed; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_SED+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_SED+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $SED in
[\\/]* | ?:[\\/]*)
@@ -11295,14 +9479,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_SED" && ac_cv_path_SED="sed"
@@ -11311,20 +9495,20 @@ esac
fi
SED=$ac_cv_path_SED
if test -n "$SED"; then
- { echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
+$as_echo "$SED" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_PERL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PERL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $PERL in
[\\/]* | ?:[\\/]*)
@@ -11336,14 +9520,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="perl"
@@ -11352,20 +9536,20 @@ esac
fi
PERL=$ac_cv_path_PERL
if test -n "$PERL"; then
- { echo "$as_me:$LINENO: result: $PERL" >&5
-echo "${ECHO_T}$PERL" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
+$as_echo "$PERL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
# Extract the first word of "ldconfig", so it can be a program name with args.
set dummy ldconfig; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_LDCONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_LDCONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $LDCONFIG in
[\\/]* | ?:[\\/]*)
@@ -11377,14 +9561,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_LDCONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_LDCONFIG" && ac_cv_path_LDCONFIG=":"
@@ -11393,21 +9577,21 @@ esac
fi
LDCONFIG=$ac_cv_path_LDCONFIG
if test -n "$LDCONFIG"; then
- { echo "$as_me:$LINENO: result: $LDCONFIG" >&5
-echo "${ECHO_T}$LDCONFIG" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDCONFIG" >&5
+$as_echo "$LDCONFIG" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -11417,25 +9601,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
AR=$ac_cv_prog_AR
if test -n "$AR"; then
- { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -11444,10 +9628,10 @@ if test -z "$ac_cv_prog_AR"; then
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@ -11457,25 +9641,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AR="ar"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_AR=$ac_cv_prog_ac_ct_AR
if test -n "$ac_ct_AR"; then
- { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_AR" = x; then
@@ -11483,12 +9667,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
AR=$ac_ct_AR
@@ -11500,10 +9680,10 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -11513,25 +9693,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -11540,10 +9720,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -11553,25 +9733,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_RANLIB" = x; then
@@ -11579,12 +9759,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
RANLIB=$ac_ct_RANLIB
@@ -11596,10 +9772,10 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -11609,25 +9785,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -11636,10 +9812,10 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -11649,25 +9825,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_STRIP" = x; then
@@ -11675,12 +9851,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
STRIP=$ac_ct_STRIP
@@ -11691,10 +9863,10 @@ fi
# Extract the first word of "makeinfo", so it can be a program name with args.
set dummy makeinfo; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_MAKEINFO+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_MAKEINFO+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$MAKEINFO"; then
ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
@@ -11704,25 +9876,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_MAKEINFO="makeinfo"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
MAKEINFO=$ac_cv_prog_MAKEINFO
if test -n "$MAKEINFO"; then
- { echo "$as_me:$LINENO: result: $MAKEINFO" >&5
-echo "${ECHO_T}$MAKEINFO" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKEINFO" >&5
+$as_echo "$MAKEINFO" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -11731,9 +9903,9 @@ if test "_$MAKEINFO" = "_"; then
else
case "$MAKEINFO" in
*/missing.*)
- { echo "$as_me:$LINENO: WARNING:
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
*** Makeinfo is missing. Info documentation will not be built." >&5
-echo "$as_me: WARNING:
+$as_echo "$as_me: WARNING:
*** Makeinfo is missing. Info documentation will not be built." >&2;}
;;
*)
@@ -11741,85 +9913,6 @@ echo "$as_me: WARNING:
esac
fi
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
- ./ | .// | /cC/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
- /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
- elif test $ac_prog = install &&
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
- fi
- fi
- done
- done
- ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
# See if we need a separate native compiler.
if test $cross_compiling = no; then
@@ -11830,10 +9923,10 @@ else
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_BUILD_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_BUILD_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$BUILD_CC"; then
ac_cv_prog_BUILD_CC="$BUILD_CC" # Let the user override the test.
@@ -11843,25 +9936,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_BUILD_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
BUILD_CC=$ac_cv_prog_BUILD_CC
if test -n "$BUILD_CC"; then
- { echo "$as_me:$LINENO: result: $BUILD_CC" >&5
-echo "${ECHO_T}$BUILD_CC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
+$as_echo "$BUILD_CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -11869,262 +9962,42 @@ fi
done
fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
for ac_header in dirent.h errno.h getopt.h malloc.h mntent.h paths.h semaphore.h setjmp.h signal.h stdarg.h stdint.h stdlib.h termios.h termio.h unistd.h utime.h linux/fd.h linux/major.h net/if_dl.h netinet/in.h sys/disklabel.h sys/file.h sys/ioctl.h sys/mkdev.h sys/mman.h sys/prctl.h sys/queue.h sys/resource.h sys/select.h sys/socket.h sys/sockio.h sys/stat.h sys/syscall.h sys/sysmacros.h sys/time.h sys/types.h sys/un.h sys/wait.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-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 "echo \"\$as_me:$LINENO: $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
- 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_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
done
-
-
for ac_header in sys/disk.h sys/mount.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
#if HAVE_SYS_QUEUE_H
#include <sys/queue.h>
#endif
-
-#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 "echo \"\$as_me:$LINENO: $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
- 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
- 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 echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
done
-
for ac_header in net/if.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
+do :
+ ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
@@ -12132,225 +10005,28 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <sys/socket.h>
#endif
-
-#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 "echo \"\$as_me:$LINENO: $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
- 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
- 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 echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+"
+if test "x$ac_cv_header_net_if_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_NET_IF_H 1
_ACEOF
fi
done
-
for ac_func in vprintf
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- 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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+ ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
+if test "x$ac_cv_func_vprintf" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-{ echo "$as_me:$LINENO: checking for _doprnt" >&5
-echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6; }
-if test "${ac_cv_func__doprnt+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define _doprnt innocuous__doprnt
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char _doprnt (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef _doprnt
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char _doprnt ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub__doprnt || defined __stub____doprnt
-choke me
-#endif
-
-int
-main ()
-{
-return _doprnt ();
- ;
- return 0;
-}
+#define HAVE_VPRINTF 1
_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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_func__doprnt=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func__doprnt=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-echo "${ECHO_T}$ac_cv_func__doprnt" >&6; }
-if test $ac_cv_func__doprnt = yes; then
+ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
+if test "x$ac_cv_func__doprnt" = x""yes; then :
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DOPRNT 1
-_ACEOF
+$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
fi
@@ -12358,688 +10034,62 @@ fi
done
-{ echo "$as_me:$LINENO: checking for struct dirent.d_reclen" >&5
-echo $ECHO_N "checking for struct dirent.d_reclen... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_dirent_d_reclen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&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 <dirent.h>
-
-int
-main ()
-{
-static struct dirent ac_aggr;
-if (ac_aggr.d_reclen)
-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 "echo \"\$as_me:$LINENO: $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
- 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_member_struct_dirent_d_reclen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <dirent.h>
-
-int
-main ()
-{
-static struct dirent ac_aggr;
-if (sizeof ac_aggr.d_reclen)
-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 "echo \"\$as_me:$LINENO: $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
- 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_member_struct_dirent_d_reclen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_member_struct_dirent_d_reclen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_dirent_d_reclen" >&5
-echo "${ECHO_T}$ac_cv_member_struct_dirent_d_reclen" >&6; }
-if test $ac_cv_member_struct_dirent_d_reclen = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_RECLEN_DIRENT 1
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking for ssize_t" >&5
-echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_ssize_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&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 <sys/types.h>
-
-typedef ssize_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
- 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 "echo \"\$as_me:$LINENO: $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
- 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_type_ssize_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_ssize_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
-echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; }
-if test $ac_cv_type_ssize_t = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_TYPE_SSIZE_T 1
-_ACEOF
+ac_fn_c_check_member "$LINENO" "struct dirent" "d_reclen" "ac_cv_member_struct_dirent_d_reclen" "#include <dirent.h>
+"
+if test "x$ac_cv_member_struct_dirent_d_reclen" = x""yes; then :
+ $as_echo "#define HAVE_RECLEN_DIRENT 1" >>confdefs.h
fi
-{ echo "$as_me:$LINENO: checking whether llseek is declared" >&5
-echo $ECHO_N "checking whether llseek is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_llseek+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&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 <unistd.h>
-
-int
-main ()
-{
-#ifndef llseek
- (void) llseek;
-#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 "echo \"\$as_me:$LINENO: $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
- 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_llseek=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "#include <sys/types.h>
+"
+if test "x$ac_cv_type_ssize_t" = x""yes; then :
+ $as_echo "#define HAVE_TYPE_SSIZE_T 1" >>confdefs.h
- ac_cv_have_decl_llseek=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_llseek" >&5
-echo "${ECHO_T}$ac_cv_have_decl_llseek" >&6; }
-if test $ac_cv_have_decl_llseek = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_LLSEEK_PROTOTYPE 1
-_ACEOF
+ac_fn_c_check_decl "$LINENO" "llseek" "ac_cv_have_decl_llseek" "#include <unistd.h>
+"
+if test "x$ac_cv_have_decl_llseek" = x""yes; then :
+ $as_echo "#define HAVE_LLSEEK_PROTOTYPE 1" >>confdefs.h
fi
-{ echo "$as_me:$LINENO: checking whether lseek64 is declared" >&5
-echo $ECHO_N "checking whether lseek64 is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_lseek64+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#define _LARGEFILE_SOURCE
+ac_fn_c_check_decl "$LINENO" "lseek64" "ac_cv_have_decl_lseek64" "#define _LARGEFILE_SOURCE
#define _LARGEFILE64_SOURCE
#include <unistd.h>
+"
+if test "x$ac_cv_have_decl_lseek64" = x""yes; then :
+ $as_echo "#define HAVE_LSEEK64_PROTOTYPE 1" >>confdefs.h
-int
-main ()
-{
-#ifndef lseek64
- (void) lseek64;
-#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 "echo \"\$as_me:$LINENO: $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
- 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_lseek64=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl_lseek64=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_lseek64" >&5
-echo "${ECHO_T}$ac_cv_have_decl_lseek64" >&6; }
-if test $ac_cv_have_decl_lseek64 = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_LSEEK64_PROTOTYPE 1
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking for short" >&5
-echo $ECHO_N "checking for short... $ECHO_C" >&6; }
-if test "${ac_cv_type_short+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&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
-typedef short ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
- 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 "echo \"\$as_me:$LINENO: $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
- 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_type_short=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_short=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-echo "${ECHO_T}$ac_cv_type_short" >&6; }
-
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of short" >&5
-echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_short+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
+$as_echo_n "checking size of short... " >&6; }
+if test "${ac_cv_sizeof_short+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-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
- typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then :
- ;
- 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 "echo \"\$as_me:$LINENO: $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
- 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_lo=0 ac_mid=0
- while :; do
- 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
- typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_hi=$ac_mid; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- 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
- typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_hi=-1 ac_mid=-1
- while :; do
- 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
- typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_lo=$ac_mid; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- 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
- typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_hi=$ac_mid
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_short=$ac_lo;;
-'') if test "$ac_cv_type_short" = yes; then
- { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
- else
- ac_cv_sizeof_short=0
- fi ;;
-esac
-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
- typedef short ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
- long int i = longval ();
- if (i != ((long int) (sizeof (ac__type_sizeof_))))
- return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (ac__type_sizeof_))))
- return 1;
- fprintf (f, "%lu\n", i);
- }
- return ferror (f) || fclose (f) != 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_short=`cat conftest.val`
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_short" = yes; then
- { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
+ if test "$ac_cv_type_short" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (short)
+See \`config.log' for more details." "$LINENO" 5; }; }
else
ac_cv_sizeof_short=0
fi
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
+$as_echo "$ac_cv_sizeof_short" >&6; }
@@ -13048,403 +10098,32 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-{ echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6; }
-if test "${ac_cv_type_int+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&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
-typedef int ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
- 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 "echo \"\$as_me:$LINENO: $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
- 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_type_int=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6; }
-
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-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
- typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_lo=0 ac_mid=0
- while :; do
- 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
- typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_hi=$ac_mid; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- 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
- typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_hi=-1 ac_mid=-1
- while :; do
- 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
- typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_lo=$ac_mid; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- 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
- typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_hi=$ac_mid
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_int=$ac_lo;;
-'') if test "$ac_cv_type_int" = yes; then
- { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
- else
- ac_cv_sizeof_int=0
- fi ;;
-esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
+if test "${ac_cv_sizeof_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. */
-$ac_includes_default
- typedef int ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
- long int i = longval ();
- if (i != ((long int) (sizeof (ac__type_sizeof_))))
- return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (ac__type_sizeof_))))
- return 1;
- fprintf (f, "%lu\n", i);
- }
- return ferror (f) || fclose (f) != 0;
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
- ;
- 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_int=`cat conftest.val`
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_int" = yes; then
- { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
+ if test "$ac_cv_type_int" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (int)
+See \`config.log' for more details." "$LINENO" 5; }; }
else
ac_cv_sizeof_int=0
fi
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+$as_echo "$ac_cv_sizeof_int" >&6; }
@@ -13453,403 +10132,32 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-{ echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&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
-typedef long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
- 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 "echo \"\$as_me:$LINENO: $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
- 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_type_long=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6; }
-
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if test "${ac_cv_sizeof_long+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-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
- typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
- ;
- 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 "echo \"\$as_me:$LINENO: $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
- 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_lo=0 ac_mid=0
- while :; do
- 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
- typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_hi=$ac_mid; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- 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
- typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_hi=-1 ac_mid=-1
- while :; do
- 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
- typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_lo=$ac_mid; break
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- 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
- typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_hi=$ac_mid
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') if test "$ac_cv_type_long" = yes; then
- { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
- else
- ac_cv_sizeof_long=0
- fi ;;
-esac
-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
- typedef long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
- long int i = longval ();
- if (i != ((long int) (sizeof (ac__type_sizeof_))))
- return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (ac__type_sizeof_))))
- return 1;
- fprintf (f, "%lu\n", i);
- }
- return ferror (f) || fclose (f) != 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_long=`cat conftest.val`
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long" = yes; then
- { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
+ if test "$ac_cv_type_long" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long)
+See \`config.log' for more details." "$LINENO" 5; }; }
else
ac_cv_sizeof_long=0
fi
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
@@ -13858,654 +10166,271 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-{ echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&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
-typedef long long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
- 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 "echo \"\$as_me:$LINENO: $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
- 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_type_long_long=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_long_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
-
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of long long" >&5
-echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_long_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+$as_echo_n "checking size of long long... " >&6; }
+if test "${ac_cv_sizeof_long_long+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-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
- typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_lo=0 ac_mid=0
- while :; do
- 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
- typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then :
- ;
- 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 "echo \"\$as_me:$LINENO: $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
- 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_hi=$ac_mid; break
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ if test "$ac_cv_type_long_long" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long long)
+See \`config.log' for more details." "$LINENO" 5; }; }
+ else
+ ac_cv_sizeof_long_long=0
+ fi
+fi
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
+$as_echo "$ac_cv_sizeof_long_long" >&6; }
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- 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
- typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
- typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 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 "echo \"\$as_me:$LINENO: $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
- 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_lo=$ac_mid; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-fi
+SIZEOF_SHORT=$ac_cv_sizeof_short
+SIZEOF_INT=$ac_cv_sizeof_int
+SIZEOF_LONG=$ac_cv_sizeof_long
+SIZEOF_LONG_LONG=$ac_cv_sizeof_long_long
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_lo= ac_hi=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if test "${ac_cv_c_bigendian+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_c_bigendian=unknown
+ # See if we're dealing with a universal compiler.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifndef __APPLE_CC__
+ not a universal capable compiler
+ #endif
+ typedef int dummy;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+ # Check for potential -arch flags. It is not universal unless
+ # there are at least two -arch flags with different values.
+ ac_arch=
+ ac_prev=
+ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+ if test -n "$ac_prev"; then
+ case $ac_word in
+ i?86 | x86_64 | ppc | ppc64)
+ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+ ac_arch=$ac_word
+ else
+ ac_cv_c_bigendian=universal
+ break
+ fi
+ ;;
+ esac
+ ac_prev=
+ elif test "x$ac_word" = "x-arch"; then
+ ac_prev=arch
+ fi
+ done
+fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ if test $ac_cv_c_bigendian = unknown; then
+ # See if sys/param.h defines the BYTE_ORDER macro.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
- typedef long long ac__type_sizeof_;
+#include <sys/types.h>
+ #include <sys/param.h>
+
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+ && LITTLE_ENDIAN)
+ bogus endian macros
+ #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 "echo \"\$as_me:$LINENO: $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
- 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_hi=$ac_mid
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_long=$ac_lo;;
-'') if test "$ac_cv_type_long_long" = yes; then
- { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
- else
- ac_cv_sizeof_long_long=0
- fi ;;
-esac
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ # It does; now see whether it defined to BIG_ENDIAN or not.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
- typedef long long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
+#include <sys/types.h>
+ #include <sys/param.h>
+
int
main ()
{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
- long int i = longval ();
- if (i != ((long int) (sizeof (ac__type_sizeof_))))
- return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (ac__type_sizeof_))))
- return 1;
- fprintf (f, "%lu\n", i);
- }
- return ferror (f) || fclose (f) != 0;
+#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+ #endif
;
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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_long_long=`cat conftest.val`
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_bigendian=yes
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long_long" = yes; then
- { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
- else
- ac_cv_sizeof_long_long=0
- fi
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_bigendian=no
fi
-rm -f conftest.val
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-_ACEOF
-
-
-SIZEOF_SHORT=$ac_cv_sizeof_short
-SIZEOF_INT=$ac_cv_sizeof_int
-SIZEOF_LONG=$ac_cv_sizeof_long
-SIZEOF_LONG_LONG=$ac_cv_sizeof_long_long
-
-
-
-
-{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- # See if sys/param.h defines the BYTE_ORDER macro.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test $ac_cv_c_bigendian = unknown; then
+ # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/param.h>
+#include <limits.h>
int
main ()
{
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
- && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
- bogus endian macros
-#endif
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+ bogus endian macros
+ #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 "echo \"\$as_me:$LINENO: $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
- 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
- # It does; now see whether it defined to BIG_ENDIAN or not.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ # It does; now see whether it defined to _BIG_ENDIAN or not.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/param.h>
+#include <limits.h>
int
main ()
{
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
+#ifndef _BIG_ENDIAN
+ not big endian
+ #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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_bigendian=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_c_bigendian=no
+ ac_cv_c_bigendian=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- 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
+ if test $ac_cv_c_bigendian = unknown; then
+ # Compile a test program.
+ if test "$cross_compiling" = yes; then :
+ # Try to guess by grepping values from an object file.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+short int ascii_mm[] =
+ { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+ short int ascii_ii[] =
+ { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+ int use_ascii (int i) {
+ return ascii_mm[i] + ascii_ii[i];
+ }
+ short int ebcdic_ii[] =
+ { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+ short int ebcdic_mm[] =
+ { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+ int use_ebcdic (int i) {
+ return ebcdic_mm[i] + ebcdic_ii[i];
+ }
+ extern int foo;
- # It does not; compile a test program.
-if test "$cross_compiling" = yes; then
- # try to guess the endianness by grepping values into an object file
- ac_cv_c_bigendian=unknown
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
{
- _ascii (); _ebcdic ();
+return use_ascii (foo) == use_ebcdic (foo);
;
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 "echo \"\$as_me:$LINENO: $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
- 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
- if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
- ac_cv_c_bigendian=yes
-fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
- if test "$ac_cv_c_bigendian" = unknown; then
- ac_cv_c_bigendian=no
- else
- # finding both strings is unlikely to happen, but who knows?
- ac_cv_c_bigendian=unknown
- fi
-fi
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+if ac_fn_c_try_compile "$LINENO"; then :
+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+ ac_cv_c_bigendian=yes
+ fi
+ if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+ if test "$ac_cv_c_bigendian" = unknown; then
+ ac_cv_c_bigendian=no
+ else
+ # finding both strings is unlikely to happen, but who knows?
+ ac_cv_c_bigendian=unknown
+ fi
+ fi
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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
int
main ()
{
- /* Are we little or big endian? From Harbison&Steele. */
- union
- {
- long int l;
- char c[sizeof (long int)];
- } u;
- u.l = 1;
- return u.c[sizeof (long int) - 1] == 1;
+ /* Are we little or big endian? From Harbison&Steele. */
+ union
+ {
+ long int l;
+ char c[sizeof (long int)];
+ } u;
+ u.l = 1;
+ return u.c[sizeof (long int) - 1] == 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_c_bigendian=no
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian=yes
+ ac_cv_c_bigendian=yes
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
+ fi
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+ yes)
+ $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+;; #(
+ no)
+ ;; #(
+ universal)
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
-case $ac_cv_c_bigendian in
- yes)
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
-_ACEOF
- ;;
- no)
- ;;
- *)
- { { echo "$as_me:$LINENO: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-echo "$as_me: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
- { (exit 1); exit 1; }; } ;;
-esac
+ ;; #(
+ *)
+ as_fn_error "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
BUILD_CC="$BUILD_CC" CPP="$CPP" /bin/sh $ac_aux_dir/parse-types.sh
ASM_TYPES_HEADER=./asm_types.h
@@ -14525,200 +10450,20 @@ fi
rm -f tmp_config.$$
PUBLIC_CONFIG_HEADER=./public_config.h
-
for ac_header in inttypes.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-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 "echo \"\$as_me:$LINENO: $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
- 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_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default"
+if test "x$ac_cv_header_inttypes_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_INTTYPES_H 1
_ACEOF
fi
done
-{ echo "$as_me:$LINENO: checking for intptr_t" >&5
-echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_intptr_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&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
-typedef intptr_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
- 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 "echo \"\$as_me:$LINENO: $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
- 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_type_intptr_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_intptr_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
-echo "${ECHO_T}$ac_cv_type_intptr_t" >&6; }
-if test $ac_cv_type_intptr_t = yes; then
+ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
+if test "x$ac_cv_type_intptr_t" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_INTPTR_T 1
@@ -14727,16 +10472,12 @@ _ACEOF
fi
-{ echo "$as_me:$LINENO: checking whether struct stat has a st_flags field" >&5
-echo $ECHO_N "checking whether struct stat has a st_flags field... $ECHO_C" >&6; }
-if test "${e2fsprogs_cv_struct_st_flags+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct stat has a st_flags field" >&5
+$as_echo_n "checking whether struct stat has a st_flags field... " >&6; }
+if test "${e2fsprogs_cv_struct_st_flags+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/stat.h>
int
@@ -14747,47 +10488,23 @@ struct stat stat; stat.st_flags = 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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
e2fsprogs_cv_struct_st_flags=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- e2fsprogs_cv_struct_st_flags=no
+ e2fsprogs_cv_struct_st_flags=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $e2fsprogs_cv_struct_st_flags" >&5
-echo "${ECHO_T}$e2fsprogs_cv_struct_st_flags" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $e2fsprogs_cv_struct_st_flags" >&5
+$as_echo "$e2fsprogs_cv_struct_st_flags" >&6; }
if test "$e2fsprogs_cv_struct_st_flags" = yes; then
- { echo "$as_me:$LINENO: checking whether st_flags field is useful" >&5
-echo $ECHO_N "checking whether st_flags field is useful... $ECHO_C" >&6; }
- if test "${e2fsprogs_cv_struct_st_flags_immut+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether st_flags field is useful" >&5
+$as_echo_n "checking whether st_flags field is useful... " >&6; }
+ if test "${e2fsprogs_cv_struct_st_flags_immut+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/stat.h>
int
@@ -14798,141 +10515,25 @@ struct stat stat; stat.st_flags |= UF_IMMUTABLE;
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 "echo \"\$as_me:$LINENO: $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
- 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
+if ac_fn_c_try_compile "$LINENO"; then :
e2fsprogs_cv_struct_st_flags_immut=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- e2fsprogs_cv_struct_st_flags_immut=no
+ e2fsprogs_cv_struct_st_flags_immut=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
- { echo "$as_me:$LINENO: result: $e2fsprogs_cv_struct_st_flags_immut" >&5
-echo "${ECHO_T}$e2fsprogs_cv_struct_st_flags_immut" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $e2fsprogs_cv_struct_st_flags_immut" >&5
+$as_echo "$e2fsprogs_cv_struct_st_flags_immut" >&6; }
if test "$e2fsprogs_cv_struct_st_flags_immut" = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_STAT_FLAGS 1
-_ACEOF
+ $as_echo "#define HAVE_STAT_FLAGS 1" >>confdefs.h
fi
fi
-{ echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5
-echo $ECHO_N "checking for struct sockaddr.sa_len... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&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 <sys/types.h>
- #include <sys/socket.h>
-
-int
-main ()
-{
-static struct sockaddr ac_aggr;
-if (ac_aggr.sa_len)
-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 "echo \"\$as_me:$LINENO: $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
- 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_member_struct_sockaddr_sa_len=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
+ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#include <sys/types.h>
#include <sys/socket.h>
-
-int
-main ()
-{
-static struct sockaddr ac_aggr;
-if (sizeof ac_aggr.sa_len)
-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 "echo \"\$as_me:$LINENO: $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
- 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_member_struct_sockaddr_sa_len=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_member_struct_sockaddr_sa_len=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5
-echo "${ECHO_T}$ac_cv_member_struct_sockaddr_sa_len" >&6; }
-if test $ac_cv_member_struct_sockaddr_sa_len = yes; then
+"
+if test "x$ac_cv_member_struct_sockaddr_sa_len" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SA_LEN 1
@@ -14940,69 +10541,15 @@ _ACEOF
fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if test -n "$BLKID_CMT"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing blkid_probe_all" >&5
+$as_echo_n "checking for library containing blkid_probe_all... " >&6; }
+if test "${ac_cv_search_blkid_probe_all+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -15010,75 +10557,70 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
+char blkid_probe_all ();
int
main ()
{
-return $ac_func ();
+return blkid_probe_all ();
;
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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
+for ac_lib in '' blkid; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_blkid_probe_all=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_blkid_probe_all+set}" = set; then :
+ break
+fi
+done
+if test "${ac_cv_search_blkid_probe_all+set}" = set; then :
+
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_search_blkid_probe_all=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_blkid_probe_all" >&5
+$as_echo "$ac_cv_search_blkid_probe_all" >&6; }
+ac_res=$ac_cv_search_blkid_probe_all
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- eval "$as_ac_var=no"
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit blkid_probe_get_topology
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
SOCKET_LIB=''
-{ echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
-echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; }
-if test "${ac_cv_lib_socket_socket+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
+$as_echo_n "checking for socket in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_socket+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -15096,130 +10638,34 @@ return socket ();
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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_socket_socket=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_socket_socket=no
+ ac_cv_lib_socket_socket=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; }
-if test $ac_cv_lib_socket_socket = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
+$as_echo "$ac_cv_lib_socket_socket" >&6; }
+if test "x$ac_cv_lib_socket_socket" = x""yes; then :
SOCKET_LIB=-lsocket
fi
-DLOPEN_LIB=''
-{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
- ;
- 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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
- DLOPEN_LIB=-ldl
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DLOPEN 1
-_ACEOF
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for optreset" >&5
-echo $ECHO_N "checking for optreset... $ECHO_C" >&6; }
-if test "${ac_cv_have_optreset+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for optreset" >&5
+$as_echo_n "checking for optreset... " >&6; }
+if test "${ac_cv_have_optreset+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <unistd.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "optreset" >/dev/null 2>&1; then
+ $EGREP "optreset" >/dev/null 2>&1; then :
ac_cv_have_optreset=yes
else
ac_cv_have_optreset=no
@@ -15227,111 +10673,25 @@ fi
rm -f conftest*
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_optreset" >&5
-echo "${ECHO_T}$ac_cv_have_optreset" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_optreset" >&5
+$as_echo "$ac_cv_have_optreset" >&6; }
if test $ac_cv_have_optreset = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_OPTRESET 1
-_ACEOF
+ $as_echo "#define HAVE_OPTRESET 1" >>confdefs.h
fi
SEM_INIT_LIB=''
-{ echo "$as_me:$LINENO: checking for sem_init" >&5
-echo $ECHO_N "checking for sem_init... $ECHO_C" >&6; }
-if test "${ac_cv_func_sem_init+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define sem_init to an innocuous variant, in case <limits.h> declares sem_init.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define sem_init innocuous_sem_init
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char sem_init (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef sem_init
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sem_init ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_sem_init || defined __stub___sem_init
-choke me
-#endif
+ac_fn_c_check_func "$LINENO" "sem_init" "ac_cv_func_sem_init"
+if test "x$ac_cv_func_sem_init" = x""yes; then :
-int
-main ()
-{
-return sem_init ();
- ;
- 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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_func_sem_init=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_sem_init=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_sem_init" >&5
-echo "${ECHO_T}$ac_cv_func_sem_init" >&6; }
-if test $ac_cv_func_sem_init = yes; then
- :
-else
- { echo "$as_me:$LINENO: checking for sem_init in -lpthread" >&5
-echo $ECHO_N "checking for sem_init in -lpthread... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pthread_sem_init+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sem_init in -lpthread" >&5
+$as_echo_n "checking for sem_init in -lpthread... " >&6; }
+if test "${ac_cv_lib_pthread_sem_init+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpthread $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -15349,57 +10709,30 @@ return sem_init ();
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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_pthread_sem_init=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_pthread_sem_init=no
+ ac_cv_lib_pthread_sem_init=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_sem_init" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread_sem_init" >&6; }
-if test $ac_cv_lib_pthread_sem_init = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_SEM_INIT 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_sem_init" >&5
+$as_echo "$ac_cv_lib_pthread_sem_init" >&6; }
+if test "x$ac_cv_lib_pthread_sem_init" = x""yes; then :
+ $as_echo "#define HAVE_SEM_INIT 1" >>confdefs.h
SEM_INIT_LIB=-lpthread
else
- { echo "$as_me:$LINENO: checking for sem_init in -lrt" >&5
-echo $ECHO_N "checking for sem_init in -lrt... $ECHO_C" >&6; }
-if test "${ac_cv_lib_rt_sem_init+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sem_init in -lrt" >&5
+$as_echo_n "checking for sem_init in -lrt... " >&6; }
+if test "${ac_cv_lib_rt_sem_init+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lrt $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -15417,57 +10750,30 @@ return sem_init ();
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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_rt_sem_init=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_rt_sem_init=no
+ ac_cv_lib_rt_sem_init=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_sem_init" >&5
-echo "${ECHO_T}$ac_cv_lib_rt_sem_init" >&6; }
-if test $ac_cv_lib_rt_sem_init = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_SEM_INIT 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sem_init" >&5
+$as_echo "$ac_cv_lib_rt_sem_init" >&6; }
+if test "x$ac_cv_lib_rt_sem_init" = x""yes; then :
+ $as_echo "#define HAVE_SEM_INIT 1" >>confdefs.h
SEM_INIT_LIB=-lrt
else
- { echo "$as_me:$LINENO: checking for sem_init in -lposix4" >&5
-echo $ECHO_N "checking for sem_init in -lposix4... $ECHO_C" >&6; }
-if test "${ac_cv_lib_posix4_sem_init+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sem_init in -lposix4" >&5
+$as_echo_n "checking for sem_init in -lposix4... " >&6; }
+if test "${ac_cv_lib_posix4_sem_init+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lposix4 $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -15485,42 +10791,19 @@ return sem_init ();
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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_posix4_sem_init=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_posix4_sem_init=no
+ ac_cv_lib_posix4_sem_init=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix4_sem_init" >&5
-echo "${ECHO_T}$ac_cv_lib_posix4_sem_init" >&6; }
-if test $ac_cv_lib_posix4_sem_init = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_SEM_INIT 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sem_init" >&5
+$as_echo "$ac_cv_lib_posix4_sem_init" >&6; }
+if test "x$ac_cv_lib_posix4_sem_init" = x""yes; then :
+ $as_echo "#define HAVE_SEM_INIT 1" >>confdefs.h
SEM_INIT_LIB=-lposix4
fi
@@ -15531,21 +10814,19 @@ fi
fi
-{ echo "$as_me:$LINENO: checking for unified diff option" >&5
-echo $ECHO_N "checking for unified diff option... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unified diff option" >&5
+$as_echo_n "checking for unified diff option... " >&6; }
if diff -u $0 $0 > /dev/null 2>&1 ; then
UNI_DIFF_OPTS=-u
else
UNI_DIFF_OPTS=-c
fi
-{ echo "$as_me:$LINENO: result: $UNI_DIFF_OPTS" >&5
-echo "${ECHO_T}$UNI_DIFF_OPTS" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNI_DIFF_OPTS" >&5
+$as_echo "$UNI_DIFF_OPTS" >&6; }
case "$host_os" in
linux*)
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_EXT2_IOCTLS 1
-_ACEOF
+ $as_echo "#define HAVE_EXT2_IOCTLS 1" >>confdefs.h
;;
esac
@@ -15568,8 +10849,8 @@ case "$host_os" in
linux* | gnu* | k*bsd*-gnu)
if test "$prefix" = NONE -a "$root_prefix" = NONE ; then
root_prefix="";
- { echo "$as_me:$LINENO: result: On $host_os systems, root_prefix defaults to ''" >&5
-echo "${ECHO_T}On $host_os systems, root_prefix defaults to ''" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: On $host_os systems, root_prefix defaults to ''" >&5
+$as_echo "On $host_os systems, root_prefix defaults to ''" >&6; }
fi
;;
esac
@@ -15577,11 +10858,11 @@ case "$host_os" in
linux* | gnu* | k*bsd*-gnu)
if test "$prefix" = NONE ; then
prefix="/usr";
- { echo "$as_me:$LINENO: result: On $host_os systems, prefix defaults to /usr" >&5
-echo "${ECHO_T}On $host_os systems, prefix defaults to /usr" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: On $host_os systems, prefix defaults to /usr" >&5
+$as_echo "On $host_os systems, prefix defaults to /usr" >&6; }
if test "$mandir" = '${prefix}/man' ; then
- { echo "$as_me:$LINENO: result: ...and mandir defaults to /usr/share/man" >&5
-echo "${ECHO_T}...and mandir defaults to /usr/share/man" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ...and mandir defaults to /usr/share/man" >&5
+$as_echo "...and mandir defaults to /usr/share/man" >&6; }
mandir=/usr/share/man
fi
fi
@@ -15605,40 +10886,36 @@ else
fi
if test "$bindir" != '${exec_prefix}/bin'; then
root_bindir=$bindir
- { echo "$as_me:$LINENO: result: Setting root_bindir to $root_bindir" >&5
-echo "${ECHO_T}Setting root_bindir to $root_bindir" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting root_bindir to $root_bindir" >&5
+$as_echo "Setting root_bindir to $root_bindir" >&6; }
fi
if test "$sbindir" != '${exec_prefix}/sbin'; then
root_sbindir=$sbindir
- { echo "$as_me:$LINENO: result: Setting root_sbindir to $root_sbindir" >&5
-echo "${ECHO_T}Setting root_sbindir to $root_sbindir" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting root_sbindir to $root_sbindir" >&5
+$as_echo "Setting root_sbindir to $root_sbindir" >&6; }
fi
if test "$libdir" != '${exec_prefix}/lib'; then
root_libdir=$libdir
- { echo "$as_me:$LINENO: result: Setting root_libdir to $root_libdir" >&5
-echo "${ECHO_T}Setting root_libdir to $root_libdir" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting root_libdir to $root_libdir" >&5
+$as_echo "Setting root_libdir to $root_libdir" >&6; }
fi
if test "$sysconfdir" != '${prefix}/etc'; then
root_sysconfdir=$sysconfdir
- { echo "$as_me:$LINENO: result: Setting root_sysconfdir to $root_sysconfdir" >&5
-echo "${ECHO_T}Setting root_sysconfdir to $root_sysconfdir" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting root_sysconfdir to $root_sysconfdir" >&5
+$as_echo "Setting root_sysconfdir to $root_sysconfdir" >&6; }
fi
-{ echo "$as_me:$LINENO: checking whether linker accepts -static" >&5
-echo $ECHO_N "checking whether linker accepts -static... $ECHO_C" >&6; }
-if test "${ac_cv_e2fsprogs_use_static+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether linker accepts -static" >&5
+$as_echo_n "checking whether linker accepts -static... " >&6; }
+if test "${ac_cv_e2fsprogs_use_static+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
SAVE_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -static"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
int
@@ -15649,34 +10926,13 @@ fflush(stdout);
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 "echo \"\$as_me:$LINENO: $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
- 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 &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_e2fsprogs_use_static=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_e2fsprogs_use_static=no
+ ac_cv_e2fsprogs_use_static=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$SAVE_LDFLAGS
fi
@@ -15685,8 +10941,8 @@ solaris2.*)
ac_cv_e2fsprogs_use_static=no
;;
esac
-{ echo "$as_me:$LINENO: result: $ac_cv_e2fsprogs_use_static" >&5
-echo "${ECHO_T}$ac_cv_e2fsprogs_use_static" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_e2fsprogs_use_static" >&5
+$as_echo "$ac_cv_e2fsprogs_use_static" >&6; }
LDFLAG_STATIC=
if test $ac_cv_e2fsprogs_use_static = yes; then
LDFLAG_STATIC=-static
@@ -15694,11 +10950,9 @@ fi
case "$host_os" in
darwin*)
- { echo "$as_me:$LINENO: result: Using Apple Darwin / GNU libintl workaround" >&5
-echo "${ECHO_T}Using Apple Darwin / GNU libintl workaround" >&6; }
- cat >>confdefs.h <<\_ACEOF
-#define _INTL_REDIRECT_MACROS 1
-_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using Apple Darwin / GNU libintl workaround" >&5
+$as_echo "Using Apple Darwin / GNU libintl workaround" >&6; }
+ $as_echo "#define _INTL_REDIRECT_MACROS 1" >>confdefs.h
;;
esac
@@ -15740,7 +10994,8 @@ for i in MCONFIG Makefile e2fsprogs.spec \
lib/e2p/e2p.pc lib/blkid/blkid.pc lib/ext2fs/ext2fs.pc \
misc/Makefile ext2ed/Makefile e2fsck/Makefile \
debugfs/Makefile tests/Makefile tests/progs/Makefile \
- resize/Makefile doc/Makefile intl/Makefile po/Makefile.in ; do
+ resize/Makefile doc/Makefile intl/Makefile \
+ intl/libgnuintl.h po/Makefile.in ; do
if test -d `dirname ${srcdir}/$i` ; then
outlist="$outlist $i"
fi
@@ -15774,12 +11029,13 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
- *) $as_unset $ac_var ;;
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) { eval $ac_var=; unset $ac_var;} ;;
esac ;;
esac
done
@@ -15787,8 +11043,8 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
+ # `set' does not quote correctly, so add quotes: double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -15811,12 +11067,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
- { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
cat confcache >$cache_file
else
- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
@@ -15833,6 +11089,12 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
# take arguments), then branch to the quote section. Otherwise,
# look for a macro that doesn't take arguments.
ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
t clear
:clear
s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
@@ -15862,11 +11124,11 @@ ac_ltlibobjs=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`echo "$ac_i" | sed "$ac_script"`
+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
@@ -15874,12 +11136,15 @@ LTLIBOBJS=$ac_ltlibobjs
+
: ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
@@ -15889,59 +11154,79 @@ cat >$CONFIG_STATUS <<_ACEOF
debug=false
ac_cs_recheck=false
ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
else
- PATH_SEPARATOR=:
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in #(
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
fi
- rm -f conf$$.sh
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
@@ -15950,20 +11235,18 @@ fi
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
-as_nl='
-'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -15974,32 +11257,111 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
-done
+ $as_echo "$as_me: error: $1" >&2
+ as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
+
-# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -16013,13 +11375,17 @@ else
as_basename=false
fi
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
-# Name of the executable.
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -16034,104 +11400,103 @@ echo X/"$0" |
}
s/.*/./; q'`
-# CDPATH.
-$as_unset CDPATH
-
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /[$]LINENO/=
- ' <$as_myself |
- sed '
- s/[$]LINENO.*/&-/
- t lineno
- b
- :lineno
- N
- :loop
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
+ fi
else
as_ln_s='cp -p'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
@@ -16148,12 +11513,12 @@ else
as_test_x='
eval sh -c '\''
if test -d "$1"; then
- test -d "$1/.";
+ test -d "$1/.";
else
- case $1 in
- -*)set "./$1";;
+ case $1 in #(
+ -*)set "./$1";;
esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
@@ -16168,13 +11533,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -16187,27 +11558,35 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
config_files="$ac_config_files"
config_commands="$ac_config_commands"
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration. Unless the files
+and actions are specified as TAGs, all are instantiated by default.
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [TAG]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
- -q, --quiet do not print progress messages
+ -q, --quiet, --silent
+ do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
- instantiate the configuration file FILE
+ --file=FILE[:TEMPLATE]
+ instantiate the configuration file FILE
Configuration files:
$config_files
@@ -16215,27 +11594,28 @@ $config_files
Configuration commands:
$config_commands
-Report bugs to <bug-autoconf at gnu.org>."
+Report bugs to the package provider."
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.61,
- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.64,
+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value. By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
ac_need_defaults=:
while test $# != 0
do
@@ -16257,25 +11637,27 @@ do
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- echo "$ac_cs_version"; exit ;;
+ $as_echo "$ac_cs_version"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
--he | --h | --help | --hel | -h )
- echo "$ac_cs_usage"; exit ;;
+ $as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;
# This is an error.
- -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; } ;;
+ -*) as_fn_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
- *) ac_config_targets="$ac_config_targets $1"
+ *) as_fn_append ac_config_targets " $1"
ac_need_defaults=false ;;
esac
@@ -16290,27 +11672,29 @@ if $ac_cs_silent; then
fi
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
- CONFIG_SHELL=$SHELL
+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ shift
+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+ CONFIG_SHELL='$SHELL'
export CONFIG_SHELL
- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ exec "\$@"
fi
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
exec 5>>config.log
{
echo
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
## Running $as_me. ##
_ASBOX
- echo "$ac_log"
+ $as_echo "$ac_log"
} >&5
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#
# INIT-COMMANDS
#
@@ -16324,7 +11708,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# Handling of arguments.
for ac_config_target in $ac_config_targets
@@ -16333,9 +11717,7 @@ do
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"$outlist") CONFIG_FILES="$CONFIG_FILES $outlist" ;;
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -16361,7 +11743,7 @@ $debug ||
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
+ trap 'as_fn_exit 1' 1 2 13 15
}
# Create a (secure) tmp directory for tmp files.
@@ -16372,310 +11754,174 @@ $debug ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} ||
-{
- echo "$me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
-}
-
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
if test -n "$CONFIG_FILES"; then
-_ACEOF
-
-# Create sed commands to just substitute file output variables.
-
-# Remaining file output variables are in a fragment that also has non-file
-# output varibles.
-
-
-
+if $AWK 'BEGIN { getline <"/dev/null" }' </dev/null 2>/dev/null; then
+ ac_cs_awk_getline=:
+ ac_cs_awk_pipe_init=
+ ac_cs_awk_read_file='
+ while ((getline aline < (F[key])) > 0)
+ print(aline)
+ close(F[key])'
+ ac_cs_awk_pipe_fini=
+else
+ ac_cs_awk_getline=false
+ ac_cs_awk_pipe_init="print \"cat <<'|#_!!_#|' &&\""
+ ac_cs_awk_read_file='
+ print "|#_!!_#|"
+ print "cat " F[key] " &&"
+ '$ac_cs_awk_pipe_init
+ # The final `:' finishes the AND list.
+ ac_cs_awk_pipe_fini='END { print "|#_!!_#|"; print ":" }'
+fi
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+ eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+ ac_cs_awk_cr='\r'
+else
+ ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
+
+# Create commands to substitute file output variables.
+{
+ echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" &&
+ echo 'cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&' &&
+ echo "$ac_subst_files" | sed 's/.*/F["&"]="$&"/' &&
+ echo "_ACAWK" &&
+ echo "_ACEOF"
+} >conf$$files.sh &&
+. ./conf$$files.sh ||
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+rm -f conf$$files.sh
+
+{
+ echo "cat >conf$$subs.awk <<_ACEOF" &&
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+ echo "_ACEOF"
+} >conf$$subs.sh ||
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-E2FSPROGS_YEAR!$E2FSPROGS_YEAR$ac_delim
-E2FSPROGS_MONTH!$E2FSPROGS_MONTH$ac_delim
-E2FSPROGS_DAY!$E2FSPROGS_DAY$ac_delim
-E2FSPROGS_VERSION!$E2FSPROGS_VERSION$ac_delim
-E2FSPROGS_PKGVER!$E2FSPROGS_PKGVER$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-CPP!$CPP$ac_delim
-LD!$LD$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-LINUX_INCLUDE!$LINUX_INCLUDE$ac_delim
-MAINTAINER_CMT!$MAINTAINER_CMT$ac_delim
-HTREE_CMT!$HTREE_CMT$ac_delim
-ELF_CMT!$ELF_CMT$ac_delim
-BSDLIB_CMT!$BSDLIB_CMT$ac_delim
-PROFILE_CMT!$PROFILE_CMT$ac_delim
-CHECKER_CMT!$CHECKER_CMT$ac_delim
-LIB_EXT!$LIB_EXT$ac_delim
-STATIC_LIB_EXT!$STATIC_LIB_EXT$ac_delim
-PROFILED_LIB_EXT!$PROFILED_LIB_EXT$ac_delim
-LDFLAG_DYNAMIC!$LDFLAG_DYNAMIC$ac_delim
-PRIVATE_LIBS_CMT!$PRIVATE_LIBS_CMT$ac_delim
-_ACEOF
+ . ./conf$$subs.sh ||
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
- ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-/^[ ]*@MCONFIG@[ ]*$/{
-r $MCONFIG
-d
-}
-/^[ ]*@MAKEFILE_ELF@[ ]*$/{
-r $MAKEFILE_ELF
-d
-}
-/^[ ]*@MAKEFILE_BSDLIB@[ ]*$/{
-r $MAKEFILE_BSDLIB
-d
-}
-/^[ ]*@MAKEFILE_PROFILE@[ ]*$/{
-r $MAKEFILE_PROFILE
-d
-}
-/^[ ]*@MAKEFILE_CHECKER@[ ]*$/{
-r $MAKEFILE_CHECKER
-d
-}
-/^[ ]*@MAKEFILE_LIBRARY@[ ]*$/{
-r $MAKEFILE_LIBRARY
-d
-}
-/^[ ]*@ASM_TYPES_HEADER@[ ]*$/{
-r $ASM_TYPES_HEADER
-d
-}
-/^[ ]*@PUBLIC_CONFIG_HEADER@[ ]*$/{
-r $PUBLIC_CONFIG_HEADER
-d
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+ N
+ s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+ for (key in S) S_is_set[key] = 1
+ FS = ""
+ \$ac_cs_awk_pipe_init
+}
+{
+ line = $ 0
+ nfields = split(line, field, "@")
+ substed = 0
+ len = length(field[1])
+ for (i = 2; i < nfields; i++) {
+ key = field[i]
+ keylen = length(key)
+ if (S_is_set[key]) {
+ value = S[key]
+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+ len += length(value) + length(field[++i])
+ substed = 1
+ } else
+ len += 1 + keylen
+ }
+ if (nfields == 3 && !substed) {
+ key = field[2]
+ if (F[key] != "" && line ~ /^[ ]*@.*@[ ]*$/) {
+ \$ac_cs_awk_read_file
+ next
+ }
+ }
+ print line
}
+\$ac_cs_awk_pipe_fini
+_ACAWK
_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_ACEOF
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-TEST_IO_CMT!$TEST_IO_CMT$ac_delim
-PKG_CONFIG!$PKG_CONFIG$ac_delim
-LIBBLKID!$LIBBLKID$ac_delim
-DEPLIBBLKID!$DEPLIBBLKID$ac_delim
-STATIC_LIBBLKID!$STATIC_LIBBLKID$ac_delim
-DEPSTATIC_LIBBLKID!$DEPSTATIC_LIBBLKID$ac_delim
-PROFILED_LIBBLKID!$PROFILED_LIBBLKID$ac_delim
-DEPPROFILED_LIBBLKID!$DEPPROFILED_LIBBLKID$ac_delim
-BLKID_CMT!$BLKID_CMT$ac_delim
-DEBUGFS_CMT!$DEBUGFS_CMT$ac_delim
-IMAGER_CMT!$IMAGER_CMT$ac_delim
-RESIZER_CMT!$RESIZER_CMT$ac_delim
-FSCK_PROG!$FSCK_PROG$ac_delim
-FSCK_MAN!$FSCK_MAN$ac_delim
-E2INITRD_PROG!$E2INITRD_PROG$ac_delim
-E2INITRD_MAN!$E2INITRD_MAN$ac_delim
-UUIDD_CMT!$UUIDD_CMT$ac_delim
-GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
-USE_NLS!$USE_NLS$ac_delim
-MSGFMT!$MSGFMT$ac_delim
-GMSGFMT!$GMSGFMT$ac_delim
-XGETTEXT!$XGETTEXT$ac_delim
-MSGMERGE!$MSGMERGE$ac_delim
-RANLIB!$RANLIB$ac_delim
-ALLOCA!$ALLOCA$ac_delim
-GLIBC21!$GLIBC21$ac_delim
-HAVE_POSIX_PRINTF!$HAVE_POSIX_PRINTF$ac_delim
-HAVE_ASPRINTF!$HAVE_ASPRINTF$ac_delim
-HAVE_SNPRINTF!$HAVE_SNPRINTF$ac_delim
-HAVE_WPRINTF!$HAVE_WPRINTF$ac_delim
-LIBICONV!$LIBICONV$ac_delim
-LTLIBICONV!$LTLIBICONV$ac_delim
-INTLBISON!$INTLBISON$ac_delim
-BUILD_INCLUDED_LIBINTL!$BUILD_INCLUDED_LIBINTL$ac_delim
-USE_INCLUDED_LIBINTL!$USE_INCLUDED_LIBINTL$ac_delim
-CATOBJEXT!$CATOBJEXT$ac_delim
-DATADIRNAME!$DATADIRNAME$ac_delim
-INSTOBJEXT!$INSTOBJEXT$ac_delim
-GENCAT!$GENCAT$ac_delim
-INTLOBJS!$INTLOBJS$ac_delim
-INTL_LIBTOOL_SUFFIX_PREFIX!$INTL_LIBTOOL_SUFFIX_PREFIX$ac_delim
-INTLLIBS!$INTLLIBS$ac_delim
-LIBINTL!$LIBINTL$ac_delim
-LTLIBINTL!$LTLIBINTL$ac_delim
-POSUB!$POSUB$ac_delim
-BINARY_TYPE!$BINARY_TYPE$ac_delim
-LN!$LN$ac_delim
-LN_S!$LN_S$ac_delim
-MV!$MV$ac_delim
-CP!$CP$ac_delim
-RM!$RM$ac_delim
-CHMOD!$CHMOD$ac_delim
-AWK!$AWK$ac_delim
-SED!$SED$ac_delim
-PERL!$PERL$ac_delim
-LDCONFIG!$LDCONFIG$ac_delim
-AR!$AR$ac_delim
-STRIP!$STRIP$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-BUILD_CC!$BUILD_CC$ac_delim
-SIZEOF_SHORT!$SIZEOF_SHORT$ac_delim
-SIZEOF_INT!$SIZEOF_INT$ac_delim
-SIZEOF_LONG!$SIZEOF_LONG$ac_delim
-SIZEOF_LONG_LONG!$SIZEOF_LONG_LONG$ac_delim
-SOCKET_LIB!$SOCKET_LIB$ac_delim
-DLOPEN_LIB!$DLOPEN_LIB$ac_delim
-SEM_INIT_LIB!$SEM_INIT_LIB$ac_delim
-UNI_DIFF_OPTS!$UNI_DIFF_OPTS$ac_delim
-LINUX_CMT!$LINUX_CMT$ac_delim
-CYGWIN_CMT!$CYGWIN_CMT$ac_delim
-UNIX_CMT!$UNIX_CMT$ac_delim
-root_prefix!$root_prefix$ac_delim
-root_bindir!$root_bindir$ac_delim
-root_sbindir!$root_sbindir$ac_delim
-root_libdir!$root_libdir$ac_delim
-root_sysconfdir!$root_sysconfdir$ac_delim
-LDFLAG_STATIC!$LDFLAG_STATIC$ac_delim
-SS_DIR!$SS_DIR$ac_delim
-ET_DIR!$ET_DIR$ac_delim
-DO_TEST_SUITE!$DO_TEST_SUITE$ac_delim
-INTL_FLAGS!$INTL_FLAGS$ac_delim
-BUILD_CFLAGS!$BUILD_CFLAGS$ac_delim
-BUILD_LDFLAGS!$BUILD_LDFLAGS$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
- ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+ cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
_ACEOF
-
# VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
@@ -16691,20 +11937,20 @@ s/^[^=]*=[ ]*$//
}'
fi
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
fi # test -n "$CONFIG_FILES"
-for ac_tag in :F $CONFIG_FILES :C $CONFIG_COMMANDS
+eval set X " :F $CONFIG_FILES :C $CONFIG_COMMANDS"
+shift
+for ac_tag
do
case $ac_tag in
:[FHLC]) ac_mode=$ac_tag; continue;;
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
- { (exit 1); exit 1; }; };;
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -16732,26 +11978,34 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
- { (exit 1); exit 1; }; };;
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
- ac_file_inputs="$ac_file_inputs $ac_f"
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ as_fn_append ac_file_inputs " '$ac_f'"
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
- configure_input="Generated from "`IFS=:
- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+ configure_input='Generated from '`
+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+ `' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
fi
+ # Neutralize special characters interpreted by sed in replacement strings.
+ case $configure_input in #(
+ *\&* | *\|* | *\\* )
+ ac_sed_conf_input=`$as_echo "$configure_input" |
+ sed 's/[\\\\&|]/\\\\&/g'`;; #(
+ *) ac_sed_conf_input=$configure_input;;
+ esac
case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin";;
+ *:-:* | *:-) cat >"$tmp/stdin" \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -16761,7 +12015,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -16779,55 +12033,15 @@ echo X"$ac_file" |
q
}
s/.*/./; q'`
- { as_dir="$ac_dir"
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
+ as_dir="$ac_dir"; as_fn_mkdir_p
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -16867,12 +12081,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
esac
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
-
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
p
q
}
@@ -16880,36 +12094,37 @@ case `sed -n '/datarootdir/ {
/@docdir@/p
/@infodir@/p
/@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
*datarootdir*) ac_datarootdir_seen=yes;;
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_datarootdir_hack='
s&@datadir@&$datadir&g
s&@docdir@&$docdir&g
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
- s&\\\${datarootdir}&$datarootdir&g' ;;
+ s&\\\${datarootdir}&$datarootdir&g' ;;
esac
_ACEOF
# Neutralize VPATH when `$srcdir' = `.'.
# Shell code in configure.ac might set extrasub.
# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
$extrasub
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
s&@srcdir@&$ac_srcdir&;t t
s&@abs_srcdir@&$ac_abs_srcdir&;t t
s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -16919,26 +12134,34 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" |
+if $ac_cs_awk_getline; then
+ $AWK -f "$tmp/subs.awk"
+else
+ $AWK -f "$tmp/subs.awk" | $SHELL
+fi >$tmp/out \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
rm -f "$tmp/stdin"
case $ac_file in
- -) cat "$tmp/out"; rm -f "$tmp/out";;
- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
- esac
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ esac \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
;;
- :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
@@ -17058,11 +12281,13 @@ echo "$as_me: executing $ac_file commands" >&6;}
done # for ac_tag
-{ (exit 0); exit 0; }
+as_fn_exit 0
_ACEOF
-chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
+test $ac_write_fail = 0 ||
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
@@ -17082,7 +12307,11 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || { (exit 1); exit 1; }
+ $ac_cs_success || as_fn_exit $?
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
if test -f util/gen-tarball; then chmod +x util/gen-tarball; fi
diff --git a/configure.in b/configure.in
index 781519c..5077a97 100644
--- a/configure.in
+++ b/configure.in
@@ -63,6 +63,14 @@ AC_SUBST(E2FSPROGS_VERSION)
AC_SUBST(E2FSPROGS_PKGVER)
AC_CANONICAL_HOST
dnl
+dnl Check to see if libdl exists for the sake of dlopen
+dnl
+DLOPEN_LIB=''
+AC_CHECK_LIB(dl, dlopen,
+[DLOPEN_LIB=-ldl
+AC_DEFINE(HAVE_DLOPEN)])
+AC_SUBST(DLOPEN_LIB)
+dnl
dnl Use diet libc
dnl
WITH_DIET_LIBC=
@@ -72,37 +80,20 @@ CC="diet cc -nostdinc"
WITH_DIET_LIBC=yes
AC_MSG_RESULT(CC=$CC))dnl
dnl
-dnl set $(CC) from --with-cc=value
-dnl
AC_ARG_WITH([cc],
-[ --with-cc=COMPILER select compiler to use],
-AC_MSG_RESULT(CC=$withval)
-CC=$withval,
-if test -z "$CC" ; then CC=cc; fi
-[AC_MSG_RESULT(CC defaults to $CC)])dnl
-export CC
-AC_SUBST([CC])
-AC_PROG_CC
-AC_PROG_CPP
-dnl
-dnl set $(LD) from --with-linker=value
+AC_HELP_STRING([--with-cc],[no longer supported, use CC= instead]),
+AC_MSG_ERROR([--with-cc no longer supported; use CC= instead]))
dnl
-AC_ARG_WITH([linker],
-[ --with-linker=LINKER select linker to use],
-AC_MSG_RESULT(LD=$withval)
-LD=$withval,
-if test -z "$LD" ; then LD=$CC; fi
-[AC_MSG_RESULT(LD defaults to $LD)])dnl
-export LD
-AC_SUBST([LD])
+AC_ARG_WITH([ccopts],
+AC_HELP_STRING([--with-ccopts],[no longer supported, use CFLAGS= instead]),
+AC_MSG_ERROR([--with-ccopts no longer supported; use CFLAGS= instead]))
dnl
-dnl set $(CCOPTS) from --with-ccopts=value
+AC_ARG_WITH([ldopts],
+AC_HELP_STRING([--with-ldopts],[no longer supported, use LDFLAGS= instead]),
+AC_MSG_ERROR([--with-ldopts no longer supported; use LDFLAGS= instead]))
dnl
-AC_ARG_WITH([ccopts],
-[ --with-ccopts=CCOPTS select compiler command line options],
-AC_MSG_RESULT(CCOPTS is $withval)
-CFLAGS=$withval,
-)dnl
+AC_PROG_CC
+AC_PROG_CPP
dnl
dnl On systems without linux header files, we add an extra include directory
dnl that holds enough to fake it (hopefully). Note that the $(top_srcdir) here
@@ -138,15 +129,6 @@ LIB_EXT=.a
STATIC_LIB_EXT=.a
PROFILED_LIB_EXT=.a
dnl
-dnl set $(LDFLAGS) from --with-ldopts=value
-dnl
-AC_ARG_WITH([ldopts],
-[ --with-ldopts=LDOPTS select linker command line options],
-AC_MSG_RESULT(LDFLAGS is $withval)
-LDFLAGS=$withval,
-)dnl
-AC_SUBST(LDFLAGS)
-dnl
dnl Allow separate `root_prefix' to be specified
dnl
AC_ARG_WITH([root-prefix],
@@ -172,6 +154,28 @@ AC_MSG_RESULT([Disabling maintainer mode by default])
)
AC_SUBST(MAINTAINER_CMT)
dnl
+dnl handle --enable-verbose-makecmds
+dnl
+AC_ARG_ENABLE([verbose-makecmds],
+[ --enable-verbose-makecmds enable verbose make command output],
+if test "$enableval" = "no"
+then
+ AC_MSG_RESULT([Disabling verbose make commands])
+ E=@echo
+ Q=@
+else
+ AC_MSG_RESULT([Enabling verbose make commands])
+ E=@\\#
+ Q=
+fi
+,
+AC_MSG_RESULT([Disabling verbose make commands])
+E=@echo
+Q=@
+)
+AC_SUBST(E)
+AC_SUBST(Q)
+dnl
dnl handle --enable-compression
dnl
AC_ARG_ENABLE([compression],
@@ -379,6 +383,57 @@ TEST_IO_CMT=
)
AC_SUBST(TEST_IO_CMT)
dnl
+dnl handle --disable-libuuid
+dnl
+PKG_PROG_PKG_CONFIG
+LIBUUID=
+DEPLIBUUID=
+STATIC_LIBUUID=
+DEPSTATIC_LIBUUID=
+PROFILED_LIBUUID=
+DEPPROFILED_LIBUUID=
+UUID_CMT=
+AC_ARG_ENABLE([libuuid],
+[ --disable-libuuid do not build private uuid library],
+if test "$enableval" = "no"
+then
+ if test -z "$PKG_CONFIG"; then
+ AC_MSG_ERROR([pkg-config not installed; please install it.])
+ fi
+
+ AC_CHECK_LIB(uuid, uuid_generate,
+ [LIBUUID=`$PKG_CONFIG --libs uuid`;
+ STATIC_LIBUUID=`$PKG_CONFIG --static --libs uuid`],
+ [AC_MSG_ERROR([external uuid library not found])],
+ [$LIBUUID])
+ UUID_CMT=#
+ AC_MSG_RESULT([Disabling private uuid library])
+else
+ LIBUUID='$(LIB)/libuuid'$LIB_EXT
+ DEPLIBUUID=$LIBUUID
+ STATIC_LIBUUID='$(LIB)/libuuid'$STATIC_LIB_EXT
+ DEPSTATIC_LIBUUID=$STATIC_LIBUUID
+ PROFILED_LIBUUID='$(LIB)/libuuid'$PROFILED_LIB_EXT
+ DEPPROFILED_LIBUUID=$PROFILED_LIBUUID
+ AC_MSG_RESULT([Enabling private uuid library])
+fi
+,
+LIBUUID='$(LIB)/libuuid'$LIB_EXT
+DEPLIBUUID=$LIBUUID
+STATIC_LIBUUID='$(LIB)/libuuid'$STATIC_LIB_EXT
+DEPSTATIC_LIBUUID=$STATIC_LIBUUID
+PROFILED_LIBUUID='$(LIB)/libuuid'$PROFILED_LIB_EXT
+DEPPROFILED_LIBUUID=$PROFILED_LIBUUID
+AC_MSG_RESULT([Enabling private uuid library by default])
+)
+AC_SUBST(LIBUUID)
+AC_SUBST(DEPLIBUUID)
+AC_SUBST(STATIC_LIBUUID)
+AC_SUBST(DEPSTATIC_LIBUUID)
+AC_SUBST(PROFILED_LIBUUID)
+AC_SUBST(DEPPROFILED_LIBUUID)
+AC_SUBST(UUID_CMT)
+dnl
dnl handle --disable-libblkid
dnl
PKG_PROG_PKG_CONFIG
@@ -601,6 +656,7 @@ dnl End of configuration options
dnl
AC_SUBST(BINARY_TYPE)
AC_PROG_MAKE_SET
+CHECK_GNU_MAKE
AC_PATH_PROG(LN, ln, ln)
AC_PROG_LN_S
AC_PATH_PROG(MV, mv, mv)
@@ -754,7 +810,14 @@ AC_CHECK_MEMBER(struct sockaddr.sa_len,
[#include <sys/types.h>
#include <sys/socket.h>])
dnl
-AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit)
+dnl This will add -lblkid to the AC_CHECK_FUNCS search if we are using
+dnl the system-provided blkid library
+dnl
+if test -n "$BLKID_CMT"; then
+ AC_SEARCH_LIBS([blkid_probe_all], [blkid])
+fi
+dnl
+AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit blkid_probe_get_topology)
dnl
dnl Check to see if -lsocket is required (solaris) to make something
dnl that uses socket() to compile; this is needed for the UUID library
@@ -763,14 +826,6 @@ SOCKET_LIB=''
AC_CHECK_LIB(socket, socket, [SOCKET_LIB=-lsocket])
AC_SUBST(SOCKET_LIB)
dnl
-dnl Check to see if libdl exists for the sake of dlopen
-dnl
-DLOPEN_LIB=''
-AC_CHECK_LIB(dl, dlopen,
-[DLOPEN_LIB=-ldl
-AC_DEFINE(HAVE_DLOPEN)])
-AC_SUBST(DLOPEN_LIB)
-dnl
dnl See if optreset exists
dnl
AC_MSG_CHECKING(for optreset)
@@ -988,7 +1043,8 @@ for i in MCONFIG Makefile e2fsprogs.spec \
lib/e2p/e2p.pc lib/blkid/blkid.pc lib/ext2fs/ext2fs.pc \
misc/Makefile ext2ed/Makefile e2fsck/Makefile \
debugfs/Makefile tests/Makefile tests/progs/Makefile \
- resize/Makefile doc/Makefile intl/Makefile po/Makefile.in ; do
+ resize/Makefile doc/Makefile intl/Makefile \
+ intl/libgnuintl.h po/Makefile.in ; do
if test -d `dirname ${srcdir}/$i` ; then
outlist="$outlist $i"
fi
diff --git a/contrib/e2croncheck b/contrib/e2croncheck
new file mode 100755
index 0000000..87204be
--- /dev/null
+++ b/contrib/e2croncheck
@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# e2croncheck -- run e2fsck automatically out of /etc/cron.weekly
+#
+# This script is intended to be run by the system administrator
+# periodically from the command line, or to be run once a week
+# or so by the cron daemon to check a mounted filesystem (normally
+# the root filesystem, but it could be used to check other filesystems
+# that are always mounted when the system is booted).
+#
+# Make sure you customize "VG" so it is your LVM volume group name,
+# "VOLUME" so it is the name of the filesystem's logical volume,
+# and "EMAIL" to be your e-mail address
+#
+# Written by Theodore Ts'o, Copyright 2007, 2008, 2009.
+#
+# This file may be redistributed under the terms of the
+# GNU Public License, version 2.
+#
+
+VG=ssd
+VOLUME=root
+SNAPSIZE=100m
+EMAIL=sysadmin at example.com
+
+TMPFILE=`mktemp -t e2fsck.log.XXXXXXXXXX`
+
+OPTS="-Fttv -C0"
+#OPTS="-Fttv -E fragcheck"
+
+set -e
+START="$(date +'%Y%m%d%H%M%S')"
+lvcreate -s -L ${SNAPSIZE} -n "${VOLUME}-snap" "${VG}/${VOLUME}"
+if nice logsave -as $TMPFILE e2fsck -p $OPTS "/dev/${VG}/${VOLUME}-snap" && \
+ nice logsave -as $TMPFILE e2fsck -fy $OPTS "/dev/${VG}/${VOLUME}-snap" ; then
+ echo 'Background scrubbing succeeded!'
+ tune2fs -C 0 -T "${START}" "/dev/${VG}/${VOLUME}"
+else
+ echo 'Background scrubbing failed! Reboot to fsck soon!'
+ tune2fs -C 16000 -T "19000101" "/dev/${VG}/${VOLUME}"
+ if test -n "$RPT-EMAIL"; then
+ mail -s "E2fsck of /dev/${VG}/${VOLUME} failed!" $EMAIL < $TMPFILE
+ fi
+fi
+lvremove -f "${VG}/${VOLUME}-snap"
+rm $TMPFILE
+
diff --git a/contrib/make-sparse.c b/contrib/make-sparse.c
index 4a7a315..1b3d550 100644
--- a/contrib/make-sparse.c
+++ b/contrib/make-sparse.c
@@ -48,6 +48,7 @@ int full_read(int fd, char *buf, size_t count)
int main(int argc, char **argv)
{
int fd, got, i;
+ int zflag = 0;
char buf[1024];
if (argc != 2) {
@@ -69,11 +70,18 @@ int main(int argc, char **argv)
break;
if (i == sizeof(buf)) {
lseek(fd, sizeof(buf), SEEK_CUR);
+ zflag = 1;
continue;
}
}
+ zflag = 0;
write(fd, buf, got);
}
+ if (zflag) {
+ lseek(fd, -1, SEEK_CUR);
+ buf[0] = 0;
+ write(fd, buf, 1);
+ }
return 0;
}
diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in
index f197a7d..e314b91 100644
--- a/debugfs/Makefile.in
+++ b/debugfs/Makefile.in
@@ -26,37 +26,38 @@ SRCS= debug_cmds.c $(srcdir)/debugfs.c $(srcdir)/util.c $(srcdir)/ls.c \
LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBBLKID) \
$(LIBUUID)
-DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(DEPLIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID)
+DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(DEPLIBSS) $(DEPLIBCOM_ERR) \
+ $(DEPLIBBLKID) $(DEPLIBUUID)
.c.o:
- @echo " CC $<"
- @$(CC) -c $(ALL_CFLAGS) $< -o $@
+ $(E) " CC $<"
+ $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
all:: $(PROGS) $(MANPAGES)
debugfs: $(DEBUG_OBJS) $(DEPLIBS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o debugfs $(DEBUG_OBJS) $(LIBS)
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o debugfs $(DEBUG_OBJS) $(LIBS)
debug_cmds.c debug_cmds.h: debug_cmds.ct
- @echo " MK_CMDS $@"
- @$(MK_CMDS) $(srcdir)/debug_cmds.ct
+ $(E) " MK_CMDS $@"
+ $(Q) $(MK_CMDS) $(srcdir)/debug_cmds.ct
debugfs.8: $(DEP_SUBSTITUTE) $(srcdir)/debugfs.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
installdirs:
- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
+ $(E) " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
+ $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
$(DESTDIR)$(man8dir)
install: $(PROGS) $(MANPAGES) installdirs
- @for i in $(PROGS); do \
+ $(Q) for i in $(PROGS); do \
echo " INSTALL $(root_sbindir)/$$i"; \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
done
- @for i in $(MANPAGES); do \
+ $(Q) for i in $(MANPAGES); do \
for j in $(COMPRESS_EXT); do \
$(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
done; \
@@ -65,7 +66,7 @@ install: $(PROGS) $(MANPAGES) installdirs
done
install-strip: install
- @for i in $(PROGS); do \
+ $(Q) for i in $(PROGS); do \
echo " STRIP $(root_sbindir)/$$i"; \
$(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
done
@@ -95,65 +96,74 @@ debug_cmds.o: debug_cmds.c $(top_srcdir)/lib/ss/ss.h \
$(top_builddir)/lib/ss/ss_err.h $(top_srcdir)/lib/et/com_err.h
debugfs.o: $(srcdir)/debugfs.c $(top_srcdir)/lib/et/com_err.h \
$(top_srcdir)/lib/ss/ss.h $(top_builddir)/lib/ss/ss_err.h \
- $(top_srcdir)/lib/et/com_err.h $(srcdir)/debugfs.h \
- $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
- $(top_srcdir)/lib/ext2fs/bitops.h $(top_srcdir)/lib/uuid/uuid.h \
- $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h \
- $(top_srcdir)/version.h
+ $(srcdir)/debugfs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
+ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/version.h $(srcdir)/jfs_user.h \
+ $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \
+ $(top_srcdir)/lib/ext2fs/kernel-list.h
util.o: $(srcdir)/util.c $(srcdir)/debugfs.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
$(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h
ls.o: $(srcdir)/ls.c $(srcdir)/debugfs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
$(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
- $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
$(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
- $(top_srcdir)/lib/ext2fs/bitops.h
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h
ncheck.o: $(srcdir)/ncheck.c $(srcdir)/debugfs.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
$(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h
icheck.o: $(srcdir)/icheck.c $(srcdir)/debugfs.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
$(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h
lsdel.o: $(srcdir)/lsdel.c $(srcdir)/debugfs.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
$(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h
dump.o: $(srcdir)/dump.c $(srcdir)/debugfs.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
$(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h
set_fields.o: $(srcdir)/set_fields.c $(srcdir)/debugfs.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
$(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/uuid/uuid.h $(top_srcdir)/lib/e2p/e2p.h
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(top_srcdir)/lib/e2p/e2p.h
logdump.o: $(srcdir)/logdump.c $(srcdir)/debugfs.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
$(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
$(srcdir)/jfs_user.h $(top_srcdir)/lib/ext2fs/kernel-jbd.h \
- $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h \
- $(top_srcdir)/lib/uuid/uuid.h
+ $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h
htree.o: $(srcdir)/htree.c $(srcdir)/debugfs.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
$(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(top_srcdir)/lib/e2p/e2p.h
unused.o: $(srcdir)/unused.c $(srcdir)/debugfs.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
$(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h
diff --git a/debugfs/debug_cmds.ct b/debugfs/debug_cmds.ct
index 5355764..95dea0d 100644
--- a/debugfs/debug_cmds.ct
+++ b/debugfs/debug_cmds.ct
@@ -43,6 +43,9 @@ request do_list_dir, "List directory",
request do_stat, "Show inode information ",
show_inode_info, stat;
+request do_dump_extents, "Dump extents information ",
+ dump_extents, extents, ex;
+
request do_link, "Create directory link",
link, ln;
diff --git a/debugfs/debugfs.8.in b/debugfs/debugfs.8.in
index 4dcc48b..9012a56 100644
--- a/debugfs/debugfs.8.in
+++ b/debugfs/debugfs.8.in
@@ -192,6 +192,25 @@ option is given set the owner, group and permissions information on
to match
.IR filespec .
.TP
+.I dump_extents [-n] [-l] filespec
+Dump the the extent tree of the inode
+.IR filespec .
+The
+.I -n
+flag will cause
+.I dump_extents
+to only display the interior nodes in the extent tree. The
+.I -l
+flag cause
+.I dump_extents
+to only display the leaf nodes in the extent tree.
+.IP
+(Please note that the length and range of blocks for the last extent in
+an interior node is an estimate by the extents library functions, and is
+not stored in file esystem data structures. Hence, the values displayed
+may not necessarily by accurate and does not indicate a problem or
+corruption in the file system.)
+.TP
.I expand_dir filespec
Expand the directory
.IR filespec .
diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index cf4b71f..be95e20 100644
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -551,6 +551,139 @@ static void dump_blocks(FILE *f, const char *prefix, ext2_ino_t inode)
fprintf(f,"\n");
}
+static int int_log10(unsigned long long arg)
+{
+ int l = 0;
+
+ arg = arg / 10;
+ while (arg) {
+ l++;
+ arg = arg / 10;
+ }
+ return l;
+}
+
+#define DUMP_LEAF_EXTENTS 0x01
+#define DUMP_NODE_EXTENTS 0x02
+#define DUMP_EXTENT_TABLE 0x04
+
+static void dump_extents(FILE *f, const char *prefix, ext2_ino_t ino,
+ int flags, int logical_width, int physical_width)
+{
+ ext2_extent_handle_t handle;
+ struct ext2fs_extent extent;
+ struct ext2_extent_info info;
+ int op = EXT2_EXTENT_ROOT;
+ unsigned int printed = 0;
+ errcode_t errcode;
+
+ errcode = ext2fs_extent_open(current_fs, ino, &handle);
+ if (errcode)
+ return;
+
+ if (flags & DUMP_EXTENT_TABLE)
+ fprintf(f, "Level Entries %*s %*s Length Flags\n",
+ (logical_width*2)+3, "Logical",
+ (physical_width*2)+3, "Physical");
+ else
+ fprintf(f, "%sEXTENTS:\n%s", prefix, prefix);
+
+ while (1) {
+ errcode = ext2fs_extent_get(handle, op, &extent);
+
+ if (errcode)
+ break;
+
+ op = EXT2_EXTENT_NEXT;
+
+ if (extent.e_flags & EXT2_EXTENT_FLAGS_SECOND_VISIT)
+ continue;
+
+ if (extent.e_flags & EXT2_EXTENT_FLAGS_LEAF) {
+ if ((flags & DUMP_LEAF_EXTENTS) == 0)
+ continue;
+ } else {
+ if ((flags & DUMP_NODE_EXTENTS) == 0)
+ continue;
+ }
+
+ errcode = ext2fs_extent_get_info(handle, &info);
+ if (errcode)
+ continue;
+
+ if (!(extent.e_flags & EXT2_EXTENT_FLAGS_LEAF)) {
+ if (extent.e_flags & EXT2_EXTENT_FLAGS_SECOND_VISIT)
+ continue;
+
+ if (flags & DUMP_EXTENT_TABLE) {
+ fprintf(f, "%2d/%2d %3d/%3d %*llu - %*llu "
+ "%*llu%*s %6u\n",
+ info.curr_level, info.max_depth,
+ info.curr_entry, info.num_entries,
+ logical_width,
+ extent.e_lblk,
+ logical_width,
+ extent.e_lblk + (extent.e_len - 1),
+ physical_width,
+ extent.e_pblk,
+ physical_width+3, "", extent.e_len);
+ continue;
+ }
+
+ fprintf(f, "%s(NODE #%d, %lld-%lld, blk %lld)",
+ printed ? ", " : "",
+ info.curr_entry,
+ extent.e_lblk,
+ extent.e_lblk + (extent.e_len - 1),
+ extent.e_pblk);
+ printed = 1;
+ continue;
+ }
+
+ if (flags & DUMP_EXTENT_TABLE) {
+ fprintf(f, "%2d/%2d %3d/%3d %*llu - %*llu "
+ "%*llu - %*llu %6u %s\n",
+ info.curr_level, info.max_depth,
+ info.curr_entry, info.num_entries,
+ logical_width,
+ extent.e_lblk,
+ logical_width,
+ extent.e_lblk + (extent.e_len - 1),
+ physical_width,
+ extent.e_pblk,
+ physical_width,
+ extent.e_pblk + (extent.e_len - 1),
+ extent.e_len,
+ extent.e_flags & EXT2_EXTENT_FLAGS_UNINIT ?
+ "Uninit" : "");
+ continue;
+ }
+
+ if (extent.e_len == 0)
+ continue;
+ else if (extent.e_len == 1)
+ fprintf(f,
+ "%s(%lld%s): %lld",
+ printed ? ", " : "",
+ extent.e_lblk,
+ extent.e_flags & EXT2_EXTENT_FLAGS_UNINIT ?
+ " [uninit]" : "",
+ extent.e_pblk);
+ else
+ fprintf(f,
+ "%s(%lld-%lld%s): %lld-%lld",
+ printed ? ", " : "",
+ extent.e_lblk,
+ extent.e_lblk + (extent.e_len - 1),
+ extent.e_flags & EXT2_EXTENT_FLAGS_UNINIT ?
+ " [uninit]" : "",
+ extent.e_pblk,
+ extent.e_pblk + (extent.e_len - 1));
+ printed = 1;
+ }
+ if (printed)
+ fprintf(f, "\n");
+}
void internal_dump_inode(FILE *out, const char *prefix,
ext2_ino_t inode_num, struct ext2_inode *inode,
@@ -671,9 +804,13 @@ void internal_dump_inode(FILE *out, const char *prefix,
}
fprintf(out, "%sDevice major/minor number: %02d:%02d (hex %02x:%02x)\n",
devnote, major, minor, major, minor);
+ } else if (do_dump_blocks) {
+ if (inode->i_flags & EXT4_EXTENTS_FL)
+ dump_extents(out, prefix, inode_num,
+ DUMP_LEAF_EXTENTS, 0, 0);
+ else
+ dump_blocks(out, prefix, inode_num);
}
- else if (do_dump_blocks)
- dump_blocks(out, prefix, inode_num);
}
static void dump_inode(ext2_ino_t inode_num, struct ext2_inode *inode)
@@ -716,6 +853,69 @@ void do_stat(int argc, char *argv[])
return;
}
+void do_dump_extents(int argc, char *argv[])
+{
+ struct ext2_inode inode;
+ ext2_ino_t ino;
+ FILE *out;
+ int c, flags = 0;
+ int logical_width;
+ int physical_width;
+
+ reset_getopt();
+ while ((c = getopt(argc, argv, "nl")) != EOF) {
+ switch (c) {
+ case 'n':
+ flags |= DUMP_NODE_EXTENTS;
+ break;
+ case 'l':
+ flags |= DUMP_LEAF_EXTENTS;
+ break;
+ }
+ }
+
+ if (argc != optind+1) {
+ print_usage:
+ com_err(0, 0, "Usage: dump_extents [-n] [-l] file");
+ return;
+ }
+
+ if (flags == 0)
+ flags = DUMP_NODE_EXTENTS | DUMP_LEAF_EXTENTS;
+ flags |= DUMP_EXTENT_TABLE;
+
+ if (check_fs_open(argv[0]))
+ return;
+
+ ino = string_to_inode(argv[optind]);
+ if (ino == 0)
+ return;
+
+ if (debugfs_read_inode(ino, &inode, argv[0]))
+ return;
+
+ if ((inode.i_flags & EXT4_EXTENTS_FL) == 0) {
+ fprintf(stderr, "%s: does not uses extent block maps\n",
+ argv[optind]);
+ return;
+ }
+
+ logical_width = int_log10(((inode.i_size |
+ (__u64) inode.i_size_high << 32) +
+ current_fs->blocksize - 1) /
+ current_fs->blocksize) + 1;
+ if (logical_width < 5)
+ logical_width = 5;
+ physical_width = int_log10(current_fs->super->s_blocks_count) + 1;
+ if (physical_width < 5)
+ physical_width = 5;
+
+ out = open_pager();
+ dump_extents(out, "", ino, flags, logical_width, physical_width);
+ close_pager(out);
+ return;
+}
+
void do_chroot(int argc, char *argv[])
{
ext2_ino_t inode;
@@ -1871,7 +2071,7 @@ static int find_supp_feature(__u32 *supp, int feature_type, char *name)
void do_supported_features(int argc, char *argv[])
{
- int i, j, ret;
+ int ret;
__u32 supp[3] = { EXT2_LIB_FEATURE_COMPAT_SUPP,
EXT2_LIB_FEATURE_INCOMPAT_SUPP,
EXT2_LIB_FEATURE_RO_COMPAT_SUPP };
@@ -1933,6 +2133,8 @@ static int source_file(const char *cmd_file, int sci_idx)
exit_status++;
}
}
+ if (f != stdin)
+ fclose(f);
return exit_status;
}
@@ -2033,6 +2235,8 @@ int main(int argc, char **argv)
ss_listen(sci_idx);
}
+ ss_delete_invocation(sci_idx);
+
if (current_fs)
close_filesystem();
diff --git a/debugfs/debugfs.h b/debugfs/debugfs.h
index 3c0f016..bbfa760 100644
--- a/debugfs/debugfs.h
+++ b/debugfs/debugfs.h
@@ -124,4 +124,5 @@ extern void do_features(int argc, char **argv);
extern void do_bmap(int argc, char **argv);
extern void do_imap(int argc, char **argv);
extern void do_set_current_time(int argc, char **argv);
+extern void do_supported_features(int argc, char **argv);
diff --git a/debugfs/htree.c b/debugfs/htree.c
index afb7605..77dc88b 100644
--- a/debugfs/htree.c
+++ b/debugfs/htree.c
@@ -23,6 +23,8 @@ extern char *optarg;
#endif
#include "debugfs.h"
+#include "uuid/uuid.h"
+#include "e2p/e2p.h"
static FILE *pager;
@@ -39,7 +41,8 @@ static void htree_dump_leaf_node(ext2_filsys fs, ext2_ino_t ino,
char tmp[EXT2_NAME_LEN + 16];
blk_t pblk;
ext2_dirhash_t hash, minor_hash;
- int rec_len, hash_alg;
+ unsigned int rec_len;
+ int hash_alg;
errcode = ext2fs_bmap(fs, ino, inode, buf, 0, blk, &pblk);
if (errcode) {
@@ -64,12 +67,17 @@ static void htree_dump_leaf_node(ext2_filsys fs, ext2_ino_t ino,
while (offset < fs->blocksize) {
dirent = (struct ext2_dir_entry *) (buf + offset);
- rec_len = (dirent->rec_len || fs->blocksize < 65536) ?
- dirent->rec_len : 65536;
+ errcode = ext2fs_get_rec_len(fs, dirent, &rec_len);
+ if (errcode) {
+ com_err("htree_dump_leaf_inode", errcode,
+ "while getting rec_len for block %lu",
+ (unsigned long) blk);
+ return;
+ }
if (((offset + rec_len) > fs->blocksize) ||
(rec_len < 8) ||
((rec_len % 4) != 0) ||
- (((dirent->name_len & 0xFF)+8) > rec_len)) {
+ ((((unsigned) dirent->name_len & 0xFF)+8) > rec_len)) {
fprintf(pager, "Corrupted directory block (%u)!\n", blk);
break;
}
@@ -303,7 +311,7 @@ void do_dx_hash(int argc, char *argv[])
hash_version = atoi(optarg);
break;
case 's':
- if (uuid_parse(optarg, hash_seed)) {
+ if (uuid_parse(optarg, (unsigned char *) hash_seed)) {
fprintf(stderr, "Invalid UUID format: %s\n",
optarg);
return;
@@ -386,7 +394,7 @@ static int search_dir_block(ext2_filsys fs, blk_t *blocknr,
struct ext2_dir_entry *dirent;
errcode_t errcode;
unsigned int offset = 0;
- int rec_len;
+ unsigned int rec_len;
if (blockcnt < 0)
return 0;
@@ -402,8 +410,13 @@ static int search_dir_block(ext2_filsys fs, blk_t *blocknr,
while (offset < fs->blocksize) {
dirent = (struct ext2_dir_entry *) (p->buf + offset);
- rec_len = (dirent->rec_len || fs->blocksize < 65536) ?
- dirent->rec_len : 65536;
+ errcode = ext2fs_get_rec_len(fs, dirent, &rec_len);
+ if (errcode) {
+ com_err("htree_dump_leaf_inode", errcode,
+ "while getting rec_len for block %lu",
+ (unsigned long) *blocknr);
+ return BLOCK_ABORT;
+ }
if (dirent->inode &&
p->len == (dirent->name_len & 0xFF) &&
strncmp(p->search_name, dirent->name,
diff --git a/debugfs/logdump.c b/debugfs/logdump.c
index 4818bc6..9a7108a 100644
--- a/debugfs/logdump.c
+++ b/debugfs/logdump.c
@@ -259,7 +259,7 @@ void do_logdump(int argc, char **argv)
close(journal_fd);
errout:
- if (out_file != stdout)
+ if (out_file && (out_file != stdout))
fclose(out_file);
return;
diff --git a/debugfs/ncheck.c b/debugfs/ncheck.c
index 166be6b..a366281 100644
--- a/debugfs/ncheck.c
+++ b/debugfs/ncheck.c
@@ -34,8 +34,6 @@ static int ncheck_proc(struct ext2_dir_entry *dirent,
{
struct inode_walk_struct *iw = (struct inode_walk_struct *) private;
int i;
- char *pathname;
- errcode_t retval;
iw->position++;
if (iw->position <= 2)
diff --git a/debugfs/set_fields.c b/debugfs/set_fields.c
index b31377d..5f02472 100644
--- a/debugfs/set_fields.c
+++ b/debugfs/set_fields.c
@@ -240,9 +240,10 @@ static struct field_set_info *find_field(struct field_set_info *fields,
if (strcmp(ss->name, field) != 0)
continue;
}
+ free(arg);
return ss;
}
-
+ free(arg);
return NULL;
}
diff --git a/depfix.sed b/depfix.sed
index 11c83e9..c73a893 100644
--- a/depfix.sed
+++ b/depfix.sed
@@ -25,6 +25,8 @@ s/ */ /g
s;/usr/include/[^ ]* *;;g
s;/usr/lib/[^ ]* *;;g
s;/mit/cygnus[^ ]* *;;g
+s;../[^ ]*lib/blkid/blkid[^ ]* *;;g
+s;../[^ ]*lib/uuid/uuid.h[^ ]* *;;g
#
# Now insert a trailing newline...
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 9c961f3..3398d5f 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -14,31 +14,38 @@ INSTALL = @INSTALL@
DVI=texi2dvi
DVIPS=dvips -o "$@"
INFO=@MAKEINFO@
-HTML=texi2html
+HTML=texi2html -split_chapter
all:: libext2fs.info libext2fs.dvi
install-doc-libs: libext2fs.info libext2fs.dvi
- @$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
- @echo " MKINSTALLDIRS $(infodir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
- - at for i in libext2fs.info* ; do \
+ $(Q) $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
+ $(E) " MKINSTALLDIRS $(infodir)"
+ $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(infodir)
+ -$(Q) for i in libext2fs.info* ; do \
echo " INSTALL_DATA $(infodir)/$$i" ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
done
- @echo " GZIP $(infodir)/libext2fs.info*"
- - at gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
+ $(E) " GZIP $(infodir)/libext2fs.info*"
+ -$(Q) gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
uninstall-doc-libs:
$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
libext2fs.info: $(srcdir)/libext2fs.texinfo
- @echo " MAKEINFO $@"
- -@$(INFO) $(srcdir)/libext2fs.texinfo
+ $(E) " MAKEINFO $@"
+ -$(Q) $(INFO) $(srcdir)/libext2fs.texinfo
libext2fs.dvi: $(srcdir)/libext2fs.texinfo
- @echo " TEXI2DVI $@"
- -@$(DVI) $(srcdir)/libext2fs.texinfo
+ $(E) " TEXI2DVI $@"
+ -$(Q) $(DVI) $(srcdir)/libext2fs.texinfo
+
+libext2fs_abt.html: $(srcdir)/libext2fs.texinfo
+ $(E) " TEXI2HTML $@"
+ -$(Q) $(HTML) $(srcdir)/libext2fs.texinfo
+ -$(Q) if test -d libext2fs ; then \
+ mv libext2fs/* . ; rmdir libext2fs ; \
+ fi
.PHONY: distclean
distclean:: clean
@@ -48,7 +55,7 @@ distclean:: clean
clean:: clean-all
.PHONY: clean-all
-clean-all:: clean-tex clean-backup clean-final clean-tarfiles
+clean-all:: clean-tex clean-backup clean-final clean-tarfiles clean-html
.PHONY: clean-final
clean-final::
@@ -65,3 +72,7 @@ clean-backup::
.PHONY: clean-tarfiles
clean-tarfiles::
$(RM) -f *.tar *.tar.gz *.tgz
+
+clean-html::
+ $(RM) -f *.html
+
diff --git a/doc/libext2fs.texinfo b/doc/libext2fs.texinfo
index f9451aa..2a483b0 100644
--- a/doc/libext2fs.texinfo
+++ b/doc/libext2fs.texinfo
@@ -1,7 +1,7 @@
\input texinfo @c -*-texinfo-*-
@c %**start of header
@setfilename libext2fs.info
- at settitle The EXT2FS Library (version 1.41.6)
+ at settitle The EXT2FS Library (version 1.41.10)
@synindex tp fn
@comment %**end of header
@@ -60,8 +60,8 @@ by the author.
@title The EXT2FS Library
@subtitle The EXT2FS Library
- at subtitle Version 1.41.6
- at subtitle May 2009
+ at subtitle Version 1.41.10
+ at subtitle February 2010
@author by Theodore Ts'o
@@ -102,7 +102,7 @@ by the Foundation.
@top The EXT2FS Library
-This manual documents the EXT2FS Library, version 1.41.6
+This manual documents the EXT2FS Library, version 1.41.10
@end ifinfo
diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
index 360013e..8296e72 100644
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@ -17,24 +17,25 @@ FMANPAGES= e2fsck.conf.5
XTRA_CFLAGS= -DRESOURCE_TRACK -I.
LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) $(LIBINTL) $(LIBE2P)
-DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) $(DEPLIBE2P)
+DEPLIBS= $(LIBEXT2FS) $(DEPLIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) \
+ $(DEPLIBE2P)
STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \
$(STATIC_LIBUUID) $(LIBINTL) $(STATIC_LIBE2P)
-STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(DEPSTATIC_LIBBLKID) \
- $(DEPSTATIC_LIBUUID) $(DEPSTATIC_LIBE2P)
+STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR) \
+ $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID) $(DEPSTATIC_LIBE2P)
PROFILED_LIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) \
$(PROFILED_LIBBLKID) $(PROFILED_LIBUUID) $(PROFILED_LIBE2P) $(LIBINTL)
-PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) \
+PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(DEPPROFILED_LIBCOM_ERR) \
$(DEPPROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID) $(DEPPROFILED_LIBE2P)
COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
.c.o:
- @echo " CC $<"
- @$(CC) -c $(ALL_CFLAGS) $< -o $@
- at PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
+ $(E) " CC $<"
+ $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
+ at PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
#
# Flags for using Checker
@@ -109,47 +110,48 @@ all:: profiled $(PROGS) e2fsck $(MANPAGES) $(FMANPAGES)
@PROFILE_CMT at all:: e2fsck.profiled
prof_err.c prof_err.h: prof_err.et
- @echo " COMPILE_ET prof_err.et"
- @$(COMPILE_ET) $(srcdir)/prof_err.et
+ $(E) " COMPILE_ET prof_err.et"
+ $(Q) $(COMPILE_ET) $(srcdir)/prof_err.et
e2fsck: $(OBJS) $(DEPLIBS)
- @echo " LD $@"
- @$(LD) $(ALL_LDFLAGS) -o e2fsck $(OBJS) $(LIBS)
+ $(E) " LD $@"
+ $(Q) $(LD) $(ALL_LDFLAGS) -o e2fsck $(OBJS) $(LIBS)
e2fsck.static: $(OBJS) $(STATIC_DEPLIBS)
- @echo " LD $@"
- @$(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS)
+ $(E) " LD $@"
+ $(Q) $(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS)
e2fsck.profiled: $(PROFILED_OBJS) $(PROFILED_DEPLIBS)
- @echo " LD $@"
- @$(LD) $(ALL_LDFLAGS) -g -pg -o e2fsck.profiled $(PROFILED_OBJS) \
+ $(E) " LD $@"
+ $(Q) $(LD) $(ALL_LDFLAGS) -g -pg -o e2fsck.profiled $(PROFILED_OBJS) \
$(PROFILED_LIBS)
gen_crc32table: $(srcdir)/gen_crc32table.c
- @echo " CC $@"
- @$(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table \
+ $(E) " CC $@"
+ $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table \
$(srcdir)/gen_crc32table.c
crc32table.h: gen_crc32table
- @echo " GEN32TABLE $@"
- @./gen_crc32table > crc32table.h
+ $(E) " GEN32TABLE $@"
+ $(Q) ./gen_crc32table > crc32table.h
-tst_problem: $(srcdir)/problem.c $(srcdir)/problem.h $(LIBEXT2FS)
- @$(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_problem \
+tst_problem: $(srcdir)/problem.c $(srcdir)/problem.h $(LIBEXT2FS) \
+ $(DEPLIBCOM_ERR)
+ $(Q) $(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_problem \
$(srcdir)/problem.c -DUNITTEST $(LIBEXT2FS) $(LIBCOM_ERR)
-tst_crc32: $(srcdir)/crc32.c $(LIBEXT2FS)
- @$(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_crc32 $(srcdir)/crc32.c \
+tst_crc32: $(srcdir)/crc32.c $(LIBEXT2FS) $(DEPLIBCOM_ERR)
+ $(Q) $(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_crc32 $(srcdir)/crc32.c \
-DUNITTEST $(LIBEXT2FS) $(LIBCOM_ERR)
-tst_refcount: ea_refcount.c
- @echo " LD $@"
- @$(CC) -o tst_refcount $(srcdir)/ea_refcount.c \
+tst_refcount: ea_refcount.c $(DEPLIBCOM_ERR)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_refcount $(srcdir)/ea_refcount.c \
$(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR) $(LIBEXT2FS)
-tst_region: region.c
- @echo " LD $@"
- @$(CC) -o tst_region $(srcdir)/region.c \
+tst_region: region.c $(DEPLIBCOM_ERR)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_region $(srcdir)/region.c \
$(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR)
check:: tst_refcount tst_region tst_crc32 tst_problem
@@ -159,87 +161,87 @@ check:: tst_refcount tst_region tst_crc32 tst_problem
LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_problem
extend: extend.o
- @echo " LD $@"
- @$(LD) $(ALL_LDFLAGS) -o extend extend.o $(CHECKLIB)
+ $(E) " LD $@"
+ $(Q) $(LD) $(ALL_LDFLAGS) -o extend extend.o $(CHECKLIB)
flushb: flushb.o
- @echo " LD $@"
- @$(LD) $(ALL_LDFLAGS) -o flushb flushb.o $(CHECKLIB)
+ $(E) " LD $@"
+ $(Q) $(LD) $(ALL_LDFLAGS) -o flushb flushb.o $(CHECKLIB)
iscan: iscan.o util.o ehandler.o $(DEPLIBS)
- @echo " LD $@"
- @$(LD) $(ALL_LDFLAGS) -o iscan iscan.o util.o ehandler.o $(LIBS)
+ $(E) " LD $@"
+ $(Q) $(LD) $(ALL_LDFLAGS) -o iscan iscan.o util.o ehandler.o $(LIBS)
test_profile: $(srcdir)/profile.c profile_helpers.o argv_parse.o \
- prof_err.o profile.h $(STATIC_LIBCOM_ERR)
- @echo " LD $@"
- @$(CC) -o test_profile -DDEBUG_PROGRAM $(srcdir)/profile.c prof_err.o \
+ prof_err.o profile.h $(DEPSTATIC_LIBCOM_ERR)
+ $(E) " LD $@"
+ $(Q) $(CC) -o test_profile -DDEBUG_PROGRAM $(srcdir)/profile.c prof_err.o \
profile_helpers.o argv_parse.o $(STATIC_LIBCOM_ERR) \
$(ALL_CFLAGS)
profiled:
- at PROFILE_CMT@ @echo " MKDIR $@"
- at PROFILE_CMT@ @mkdir profiled
+ at PROFILE_CMT@ $(E) " MKDIR $@"
+ at PROFILE_CMT@ $(Q) mkdir profiled
e2fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8
e2fsck.conf.5: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.conf.5.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5
installdirs:
- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
+ $(E) " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
+ $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
$(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir)
install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs
- @for i in $(PROGS); do \
+ $(Q) for i in $(PROGS); do \
echo " INSTALL $(root_sbindir)/$$i"; \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
done
- @echo " LINK $(root_sbindir)/fsck.ext2"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+ $(E) " LINK $(root_sbindir)/fsck.ext2"
+ $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
$(DESTDIR)$(root_sbindir)/fsck.ext2
- @echo " LINK $(root_sbindir)/fsck.ext3"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+ $(E) " LINK $(root_sbindir)/fsck.ext3"
+ $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
$(DESTDIR)$(root_sbindir)/fsck.ext3
- @echo " LINK $(root_sbindir)/fsck.ext4"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+ $(E) " LINK $(root_sbindir)/fsck.ext4"
+ $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
$(DESTDIR)$(root_sbindir)/fsck.ext4
- @echo " LINK $(root_sbindir)/fsck.ext4dev"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+ $(E) " LINK $(root_sbindir)/fsck.ext4dev"
+ $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
$(DESTDIR)$(root_sbindir)/fsck.ext4dev
- @for i in $(MANPAGES); do \
+ $(Q) for i in $(MANPAGES); do \
for j in $(COMPRESS_EXT); do \
$(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
done; \
echo " INSTALL_DATA $(man8dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
done
- @for i in $(FMANPAGES); do \
+ $(Q) for i in $(FMANPAGES); do \
for j in $(COMPRESS_EXT); do \
$(RM) -f $(DESTDIR)$(man5dir)/$$i.$$j; \
done; \
echo " INSTALL_DATA $(man5dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
done
- @echo " LINK $(man8dir)/fsck.ext2.8"
- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+ $(E) " LINK $(man8dir)/fsck.ext2.8"
+ $(Q) $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
$(DESTDIR)$(man8dir)/fsck.ext2.8
- @echo " LINK $(man8dir)/fsck.ext3.8"
- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+ $(E) " LINK $(man8dir)/fsck.ext3.8"
+ $(Q) $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
$(DESTDIR)$(man8dir)/fsck.ext3.8
- @echo " LINK $(man8dir)/fsck.ext4.8"
- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+ $(E) " LINK $(man8dir)/fsck.ext4.8"
+ $(Q) $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
$(DESTDIR)$(man8dir)/fsck.ext4.8
- @echo " LINK $(man8dir)/fsck.ext4.8"
- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+ $(E) " LINK $(man8dir)/fsck.ext4.8"
+ $(Q) $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
$(DESTDIR)$(man8dir)/fsck.ext4dev.8
install-strip: install
- @for i in $(PROGS); do \
+ $(Q) for i in $(PROGS); do \
echo " STRIP $(root_sbindir)/$$i"; \
$(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
done
@@ -282,195 +284,170 @@ distclean: clean
#
e2fsck.o: $(srcdir)/e2fsck.c $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h $(srcdir)/problem.h
crc32.o: $(srcdir)/crc32.c $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h $(srcdir)/crc32defs.h crc32table.h
gen_crc32table.o: $(srcdir)/gen_crc32table.c $(srcdir)/crc32defs.h
dict.o: $(srcdir)/dict.c $(srcdir)/dict.h
-super.o: $(srcdir)/super.c $(top_srcdir)/lib/uuid/uuid.h $(srcdir)/e2fsck.h \
+super.o: $(srcdir)/super.c $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h $(srcdir)/problem.h
pass1.o: $(srcdir)/pass1.c $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h $(srcdir)/problem.h
pass1b.o: $(srcdir)/pass1b.c $(top_srcdir)/lib/et/com_err.h \
$(srcdir)/e2fsck.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
$(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
- $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h $(srcdir)/problem.h $(srcdir)/dict.h
pass2.o: $(srcdir)/pass2.c $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h $(srcdir)/problem.h $(srcdir)/dict.h
pass3.o: $(srcdir)/pass3.c $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h $(srcdir)/problem.h
pass4.o: $(srcdir)/pass4.c $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h $(srcdir)/problem.h
pass5.o: $(srcdir)/pass5.c $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h $(srcdir)/problem.h
journal.o: $(srcdir)/journal.c $(srcdir)/jfs_user.h $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/ext2fs/kernel-jbd.h \
$(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h \
- $(srcdir)/problem.h $(top_srcdir)/lib/uuid/uuid.h
+ $(srcdir)/problem.h
recovery.o: $(srcdir)/recovery.c $(srcdir)/jfs_user.h $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/ext2fs/kernel-jbd.h \
$(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h
revoke.o: $(srcdir)/revoke.c $(srcdir)/jfs_user.h $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/ext2fs/kernel-jbd.h \
$(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h
badblocks.o: $(srcdir)/badblocks.c $(top_srcdir)/lib/et/com_err.h \
$(srcdir)/e2fsck.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
$(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
- $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h
util.o: $(srcdir)/util.c $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
- $(srcdir)/profile.h prof_err.h
-unix.o: $(srcdir)/unix.c $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
$(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
$(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
+ $(srcdir)/profile.h prof_err.h
+unix.o: $(srcdir)/unix.c $(top_srcdir)/lib/e2p/e2p.h \
+ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/e2fsck.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
$(srcdir)/profile.h prof_err.h $(srcdir)/problem.h $(top_srcdir)/version.h
dirinfo.o: $(srcdir)/dirinfo.c $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
- $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/uuid/uuid.h \
- $(top_srcdir)/lib/ext2fs/tdb.h
+ $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/ext2fs/tdb.h
dx_dirinfo.o: $(srcdir)/dx_dirinfo.c $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h
ehandler.o: $(srcdir)/ehandler.c $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h
problem.o: $(srcdir)/problem.c $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h $(srcdir)/problem.h $(srcdir)/problemP.h
message.o: $(srcdir)/message.c $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h $(srcdir)/problem.h
ea_refcount.o: $(srcdir)/ea_refcount.c $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h
rehash.o: $(srcdir)/rehash.c $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h $(srcdir)/problem.h
region.o: $(srcdir)/region.c $(srcdir)/e2fsck.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
$(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
$(srcdir)/profile.h prof_err.h
profile.o: $(srcdir)/profile.c $(top_srcdir)/lib/et/com_err.h \
$(srcdir)/profile.h prof_err.h
diff --git a/e2fsck/dirinfo.c b/e2fsck/dirinfo.c
index fb2887b..901235c 100644
--- a/e2fsck/dirinfo.c
+++ b/e2fsck/dirinfo.c
@@ -293,6 +293,9 @@ void e2fsck_free_dir_info(e2fsck_t ctx)
unlink(ctx->dir_info->tdb_fn);
free(ctx->dir_info->tdb_fn);
}
+ if (ctx->dir_info->array)
+ ext2fs_free_mem(&ctx->dir_info->array);
+ ctx->dir_info->array = 0;
ctx->dir_info->size = 0;
ctx->dir_info->count = 0;
ext2fs_free_mem(&ctx->dir_info);
diff --git a/e2fsck/dx_dirinfo.c b/e2fsck/dx_dirinfo.c
index eba6add..5c48d32 100644
--- a/e2fsck/dx_dirinfo.c
+++ b/e2fsck/dx_dirinfo.c
@@ -115,7 +115,7 @@ void e2fsck_free_dx_dir_info(e2fsck_t ctx)
if (ctx->dx_dir_info) {
dir = ctx->dx_dir_info;
- for (i=0; i < ctx->dx_dir_info_count; i++) {
+ for (i=0; i < ctx->dx_dir_info_count; i++,dir++) {
if (dir->dx_block) {
ext2fs_free_mem(&dir->dx_block);
dir->dx_block = 0;
diff --git a/e2fsck/e2fsck.conf.5.in b/e2fsck/e2fsck.conf.5.in
index 6638a39..64aafd7 100644
--- a/e2fsck/e2fsck.conf.5.in
+++ b/e2fsck/e2fsck.conf.5.in
@@ -87,19 +87,40 @@ interrupts e2fsck using ^C, and the filesystem is not explicitly flagged
as containing errors, e2fsck will exit with an exit status of 0 instead
of 32. This setting defaults to false.
.TP
-.I buggy_init_scripts
-Some buggy distributions (such as Ubuntu) have init scripts and/or
-installers which fail to correctly set the system clock before running
-e2fsck and/or formatting the filesystem initially. Normally this
-happens because the hardware clock is ticking localtime, instead of the
-more proper and less error-prone UTC time. So while the kernel is
-booting, the system time (which in Linux systems always ticks in UTC
-time) is set from the hardware clock, but since the hardware clock is
-ticking localtime, the system time is incorrect. Unfortunately, some
-buggy distributions do not correct this before running e2fsck. If this
-option is set to a boolean value of true, we attempt to work around this
-situation by allowing the superblock last write time, last mount time,
-and last check time to be in the future by up to 24 hours.
+.I accept_time_fudge
+Unfortunately, due to Windows' unfortunate design decision
+to configure the hardware clock to tick localtime, instead
+of the more proper and less error-prone UTC time, many
+users end up in the situation where the system clock is
+incorrectly set at the time when e2fsck is run.
+.IP
+Historically this was usually due to some distributions
+having buggy init scripts and/or installers that didn't
+correctly detect this case and take appropriate
+countermeasures. However, it's still possible, despite the
+best efforts of init script and installer authors to not be
+able to detect this misconfiguration, usually due to a
+buggy or misconfigured virtualization manager or the
+installer not having access to a network time server
+during the installation process. So by default, we allow
+the superblock times to be fudged by up to 24 hours.
+This can be disabled by setting
+.I accept_time_fudge
+to the
+boolean value of false. This setting defaults to true.
+.TP
+.I broken_system_clock
+The
+.BR e2fsck (8)
+program has some hueristics that assume that the system clock is
+correct. In addition, many system programs make similar assumptions.
+For example, the UUID library depends on time not going backwards in
+order for it to be able to make its guarantees about issuing universally
+unique ID's. Systems with broken system clocks, are well, broken.
+However, broken system clocks, particularly in embedded systems, do
+exist. If true, e2fsck will not abort a preen check if it detects a
+last mounted or last write time in the superblock in the future. This
+setting defaults to false.
.TP
.I clear_test_fs_flag
This boolean relation controls whether or not
@@ -111,7 +132,7 @@ defaults to true.
.I defer_check_on_battery
This boolean relation controls whether or not the interval between
filesystem checks (either based on time or number of mounts) should
-be doubled if the system is running on battery. It defaults to
+be doubled if the system is running on battery. This setting defaults to
true.
.TP
.I indexed_dir_slack_percentage
diff --git a/e2fsck/e2fsck.conf.ubuntu b/e2fsck/e2fsck.conf.ubuntu
deleted file mode 100644
index 49d6d19..0000000
--- a/e2fsck/e2fsck.conf.ubuntu
+++ /dev/null
@@ -1,2 +0,0 @@
-[options]
- buggy_init_scripts = 1
diff --git a/e2fsck/message.c b/e2fsck/message.c
index 5158ed6..9aaedc5 100644
--- a/e2fsck/message.c
+++ b/e2fsck/message.c
@@ -14,7 +14,7 @@
* The following % expansions are supported:
*
* %b <blk> block number
- * %B <blkcount> integer
+ * %B <blkcount> interpret blkcount as blkcount
* %c <blk2> block number
* %Di <dirent>->ino inode number
* %Dn <dirent>->name string
@@ -46,6 +46,7 @@
* %q ext2fs_get_pathname of directory <dir>
* %Q ext2fs_get_pathname of directory <ino> with <dir> as
* the containing directory.
+ * %r <blkcount> interpret blkcount as refcount
* %s <str> miscellaneous string
* %S backup superblock
* %X <num> hexadecimal format
@@ -209,6 +210,24 @@ static void print_pathname(ext2_filsys fs, ext2_ino_t dir, ext2_ino_t ino)
}
}
+static void print_time(time_t t)
+{
+ const char * time_str;
+ static int do_gmt = -1;
+
+#ifdef __dietlibc__
+ /* The diet libc doesn't respect the TZ environemnt variable */
+ if (do_gmt == -1) {
+ time_str = getenv("TZ");
+ if (!time_str)
+ time_str = "";
+ do_gmt = !strcmp(time_str, "GMT0");
+ }
+#endif
+ time_str = asctime((do_gmt > 0) ? gmtime(&t) : localtime(&t));
+ printf("%.24s", time_str);
+}
+
/*
* This function handles the '@' expansion. We allow recursive
* expansion; an @ expression can contain further '@' and '%'
@@ -239,14 +258,12 @@ static _INLINE_ void expand_at_expression(e2fsck_t ctx, char ch,
/*
* This function expands '%IX' expressions
*/
-static _INLINE_ void expand_inode_expression(char ch,
+static _INLINE_ void expand_inode_expression(ext2_filsys fs, char ch,
struct problem_context *ctx)
{
struct ext2_inode *inode;
struct ext2_inode_large *large_inode;
- const char * time_str;
time_t t;
- static int do_gmt = -1;
if (!ctx || !ctx->inode)
goto no_inode;
@@ -275,7 +292,8 @@ static _INLINE_ void expand_inode_expression(char ch,
printf("%u", large_inode->i_extra_isize);
break;
case 'b':
- if (inode->i_flags & EXT4_HUGE_FILE_FL)
+ if (fs->super->s_feature_ro_compat &
+ EXT4_FEATURE_RO_COMPAT_HUGE_FILE)
printf("%llu", inode->i_blocks +
(((long long) inode->osd2.linux2.l_i_blocks_hi)
<< 32));
@@ -289,18 +307,7 @@ static _INLINE_ void expand_inode_expression(char ch,
printf("0%o", inode->i_mode);
break;
case 'M':
-#ifdef __dietlibc__
- /* The diet libc doesn't respect the TZ environemnt variable */
- if (do_gmt == -1) {
- time_str = getenv("TZ");
- if (!time_str)
- time_str = "";
- do_gmt = !strcmp(time_str, "GMT0");
- }
-#endif
- t = inode->i_mtime;
- time_str = asctime((do_gmt > 0) ? gmtime(&t) : localtime(&t));
- printf("%.24s", time_str);
+ print_time(inode->i_mtime);
break;
case 'F':
printf("%u", inode->i_faddr);
@@ -347,10 +354,11 @@ static _INLINE_ void expand_inode_expression(char ch,
/*
* This function expands '%dX' expressions
*/
-static _INLINE_ void expand_dirent_expression(char ch,
+static _INLINE_ void expand_dirent_expression(ext2_filsys fs, char ch,
struct problem_context *ctx)
{
struct ext2_dir_entry *dirent;
+ unsigned int rec_len;
int len;
if (!ctx || !ctx->dirent)
@@ -366,12 +374,14 @@ static _INLINE_ void expand_dirent_expression(char ch,
len = dirent->name_len & 0xFF;
if (len > EXT2_NAME_LEN)
len = EXT2_NAME_LEN;
- if (len > dirent->rec_len)
- len = dirent->rec_len;
+ if ((ext2fs_get_rec_len(fs, dirent, &rec_len) == 0) &&
+ (len > rec_len))
+ len = rec_len;
safe_print(dirent->name, len);
break;
case 'r':
- printf("%u", dirent->rec_len);
+ (void) ext2fs_get_rec_len(fs, dirent, &rec_len);
+ printf("%u", rec_len);
break;
case 'l':
printf("%u", dirent->name_len & 0xFF);
@@ -387,8 +397,12 @@ static _INLINE_ void expand_dirent_expression(char ch,
}
static _INLINE_ void expand_percent_expression(ext2_filsys fs, char ch,
+ int *first,
struct problem_context *ctx)
{
+ e2fsck_t e2fsck_ctx = fs ? (e2fsck_t) fs->priv_data : NULL;
+ const char *m;
+
if (!ctx)
goto no_context;
@@ -404,11 +418,26 @@ static _INLINE_ void expand_percent_expression(ext2_filsys fs, char ch,
#endif
break;
case 'B':
+ if (ctx->blkcount == BLOCK_COUNT_IND)
+ m = _("indirect block");
+ else if (ctx->blkcount == BLOCK_COUNT_DIND)
+ m = _("double indirect block");
+ else if (ctx->blkcount == BLOCK_COUNT_TIND)
+ m = _("triple indirect block");
+ else if (ctx->blkcount == BLOCK_COUNT_TRANSLATOR)
+ m = _("translator block");
+ else
+ m = _("block #");
+ if (*first && islower(m[0]))
+ fputc(toupper(*m++), stdout);
+ fputs(m, stdout);
+ if (ctx->blkcount >= 0) {
#ifdef EXT2_NO_64_TYPE
- printf("%d", ctx->blkcount);
+ printf("%d", ctx->blkcount);
#else
- printf("%lld", (long long)ctx->blkcount);
+ printf("%lld", (long long) ctx->blkcount);
#endif
+ }
break;
case 'c':
#ifdef EXT2_NO_64_TYPE
@@ -452,12 +481,25 @@ static _INLINE_ void expand_percent_expression(ext2_filsys fs, char ch,
case 'Q':
print_pathname(fs, ctx->dir, ctx->ino);
break;
+ case 'r':
+#ifdef EXT2_NO_64_TYPE
+ printf("%d", ctx->blkcount);
+#else
+ printf("%lld", (long long) ctx->blkcount);
+#endif
+ break;
case 'S':
printf("%u", get_backup_sb(NULL, fs, NULL, NULL));
break;
case 's':
printf("%s", ctx->str ? ctx->str : "NULL");
break;
+ case 't':
+ print_time((time_t) ctx->num);
+ break;
+ case 'T':
+ print_time(e2fsck_ctx ? e2fsck_ctx->now : time(0));
+ break;
case 'X':
#ifdef EXT2_NO_64_TYPE
printf("0x%x", ctx->num);
@@ -487,13 +529,13 @@ void print_e2fsck_message(e2fsck_t ctx, const char *msg,
expand_at_expression(ctx, *cp, pctx, &first, recurse);
} else if (cp[0] == '%' && cp[1] == 'I') {
cp += 2;
- expand_inode_expression(*cp, pctx);
+ expand_inode_expression(fs, *cp, pctx);
} else if (cp[0] == '%' && cp[1] == 'D') {
cp += 2;
- expand_dirent_expression(*cp, pctx);
+ expand_dirent_expression(fs, *cp, pctx);
} else if ((cp[0] == '%')) {
cp++;
- expand_percent_expression(fs, *cp, pctx);
+ expand_percent_expression(fs, *cp, &first, pctx);
} else {
for (i=0; cp[i]; i++)
if ((cp[i] == '@') || cp[i] == '%')
diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index 46189c0..695abe4 100644
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -83,6 +83,7 @@ struct process_block_struct {
blk_t num_blocks;
blk_t max_blocks;
e2_blkcnt_t last_block;
+ e2_blkcnt_t last_db_block;
int num_illegal_blocks;
blk_t previous_block;
struct ext2_inode *inode;
@@ -404,38 +405,83 @@ static void check_is_really_dir(e2fsck_t ctx, struct problem_context *pctx,
const char *old_op;
errcode_t retval;
blk_t blk;
+ blk64_t first_dir_blk;
unsigned int i, rec_len, not_device = 0;
+ int extent_fs;
+ /*
+ * If the mode looks OK, we believe it. If the first block in
+ * the i_block array is 0, this cannot be a directory. If the
+ * inode is extent-mapped, it is still the case that the latter
+ * cannot be 0 - the magic number in the extent header would make
+ * it nonzero.
+ */
if (LINUX_S_ISDIR(inode->i_mode) || LINUX_S_ISREG(inode->i_mode) ||
LINUX_S_ISLNK(inode->i_mode) || inode->i_block[0] == 0)
return;
- for (i=0; i < EXT2_N_BLOCKS; i++) {
- blk = inode->i_block[i];
- if (!blk)
- continue;
- if (i >= 4)
- not_device++;
+ /*
+ * Check the block numbers in the i_block array for validity:
+ * zero blocks are skipped (but the first one cannot be zero -
+ * see above), other blocks are checked against the first and
+ * max data blocks (from the the superblock) and against the
+ * block bitmap. Any invalid block found means this cannot be
+ * a directory.
+ *
+ * If there are non-zero blocks past the fourth entry, then
+ * this cannot be a device file: we remember that for the next
+ * check.
+ *
+ * For extent mapped files, we don't do any sanity checking:
+ * just try to get the phys block of logical block 0 and run
+ * with it.
+ */
- if (blk < ctx->fs->super->s_first_data_block ||
- blk >= ctx->fs->super->s_blocks_count ||
- ext2fs_fast_test_block_bitmap(ctx->block_found_map, blk))
- return; /* Invalid block, can't be dir */
+ extent_fs = (ctx->fs->super->s_feature_incompat & EXT3_FEATURE_INCOMPAT_EXTENTS);
+ if (extent_fs && (inode->i_flags & EXT4_EXTENTS_FL)) {
+ /* extent mapped */
+ if (ext2fs_bmap(ctx->fs, pctx->ino, inode, 0, 0, 0,
+ &blk))
+ return;
+ /* device files are never extent mapped */
+ not_device++;
+ } else {
+ for (i=0; i < EXT2_N_BLOCKS; i++) {
+ blk = inode->i_block[i];
+ if (!blk)
+ continue;
+ if (i >= 4)
+ not_device++;
+
+ if (blk < ctx->fs->super->s_first_data_block ||
+ blk >= ctx->fs->super->s_blocks_count ||
+ ext2fs_fast_test_block_bitmap(ctx->block_found_map,
+ blk))
+ return; /* Invalid block, can't be dir */
+ }
+ blk = inode->i_block[0];
}
+ /*
+ * If the mode says this is a device file and the i_links_count field
+ * is sane and we have not ruled it out as a device file previously,
+ * we declare it a device file, not a directory.
+ */
if ((LINUX_S_ISCHR(inode->i_mode) || LINUX_S_ISBLK(inode->i_mode)) &&
(inode->i_links_count == 1) && !not_device)
return;
+ /* read the first block */
old_op = ehandler_operation(_("reading directory block"));
- retval = ext2fs_read_dir_block(ctx->fs, inode->i_block[0], buf);
+ retval = ext2fs_read_dir_block(ctx->fs, blk, buf);
ehandler_operation(0);
if (retval)
return;
dirent = (struct ext2_dir_entry *) buf;
- rec_len = (dirent->rec_len || ctx->fs->blocksize < 65536) ?
- dirent->rec_len : 65536;
+ retval = ext2fs_get_rec_len(ctx->fs, dirent, &rec_len);
+ if (retval)
+ return;
if (((dirent->name_len & 0xFF) != 1) ||
(dirent->name[0] != '.') ||
(dirent->inode != pctx->ino) ||
@@ -445,8 +491,9 @@ static void check_is_really_dir(e2fsck_t ctx, struct problem_context *pctx,
return;
dirent = (struct ext2_dir_entry *) (buf + rec_len);
- rec_len = (dirent->rec_len || ctx->fs->blocksize < 65536) ?
- dirent->rec_len : 65536;
+ retval = ext2fs_get_rec_len(ctx->fs, dirent, &rec_len);
+ if (retval)
+ return;
if (((dirent->name_len & 0xFF) != 2) ||
(dirent->name[0] != '.') ||
(dirent->name[1] != '.') ||
@@ -765,6 +812,7 @@ void e2fsck_pass1(e2fsck_t ctx)
}
pb.ino = EXT2_BAD_INO;
pb.num_blocks = pb.last_block = 0;
+ pb.last_db_block = -1;
pb.num_illegal_blocks = 0;
pb.suppress = 0; pb.clear = 0; pb.is_dir = 0;
pb.is_reg = 0; pb.fragmented = 0; pb.bbcheck = 0;
@@ -1721,6 +1769,16 @@ static void scan_extent_node(e2fsck_t ctx, struct problem_context *pctx,
}
pb->fragmented = 1;
}
+ while (is_dir && ++pb->last_db_block < extent.e_lblk) {
+ pctx->errcode = ext2fs_add_dir_block(ctx->fs->dblist,
+ pb->ino, 0,
+ pb->last_db_block);
+ if (pctx->errcode) {
+ pctx->blk = 0;
+ pctx->num = pb->last_db_block;
+ goto failed_add_dir_block;
+ }
+ }
for (blk = extent.e_pblk, blockcnt = extent.e_lblk, i = 0;
i < extent.e_len;
blk++, blockcnt++, i++) {
@@ -1731,6 +1789,7 @@ static void scan_extent_node(e2fsck_t ctx, struct problem_context *pctx,
if (pctx->errcode) {
pctx->blk = blk;
pctx->num = blockcnt;
+ failed_add_dir_block:
fix_problem(ctx, PR_1_ADD_DBLOCK, pctx);
/* Should never get here */
ctx->flags |= E2F_FLAG_ABORT;
@@ -1738,6 +1797,8 @@ static void scan_extent_node(e2fsck_t ctx, struct problem_context *pctx,
}
}
}
+ if (is_dir && extent.e_len > 0)
+ pb->last_db_block = blockcnt - 1;
pb->num_blocks += extent.e_len;
pb->previous_block = extent.e_pblk + extent.e_len - 1;
start_block = extent.e_lblk + extent.e_len - 1;
@@ -1790,6 +1851,15 @@ static void check_blocks_extents(e2fsck_t ctx, struct problem_context *pctx,
ext2fs_extent_free(ehandle);
}
+static blk64_t ext2fs_inode_i_blocks(ext2_filsys fs,
+ struct ext2_inode *inode)
+{
+ return (inode->i_blocks |
+ (fs->super->s_feature_ro_compat &
+ EXT4_FEATURE_RO_COMPAT_HUGE_FILE ?
+ (__u64)inode->osd2.linux2.l_i_blocks_hi << 32 : 0));
+}
+
/*
* This subroutine is called on each inode to account for all of the
* blocks used by that inode.
@@ -1809,6 +1879,7 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx,
pb.ino = ino;
pb.num_blocks = 0;
pb.last_block = -1;
+ pb.last_db_block = -1;
pb.num_illegal_blocks = 0;
pb.suppress = 0; pb.clear = 0;
pb.fragmented = 0;
@@ -1872,26 +1943,6 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx,
return;
}
- if (pb.is_dir) {
- while (1) {
- struct ext2_db_entry *entry;
-
- if (ext2fs_dblist_get_last(fs->dblist, &entry) ||
- (entry->ino != ino) ||
- (entry->blk != 0) ||
- (entry->blockcnt == 0))
- break;
- /* printf("Dropping ino %lu blk %lu blockcnt %d\n",
- entry->ino, entry->blk, entry->blockcnt); */
- ext2fs_dblist_drop_last(fs->dblist);
- if (ext2fs_dblist_get_last(fs->dblist, &entry) ||
- (entry->ino != ino))
- pb.last_block--;
- else
- pb.last_block = entry->blockcnt;
- }
- }
-
if (inode->i_flags & EXT2_INDEX_FL) {
if (handle_htree(ctx, pctx, ino, inode, block_buf)) {
inode->i_flags &= ~EXT2_INDEX_FL;
@@ -1902,10 +1953,6 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx,
#endif
}
}
- if (ctx->dirs_to_hash && pb.is_dir &&
- !(inode->i_flags & EXT2_INDEX_FL) &&
- ((inode->i_size / fs->blocksize) >= 3))
- ext2fs_u32_list_add(ctx->dirs_to_hash, ino);
if (!pb.num_blocks && pb.is_dir) {
if (fix_problem(ctx, PR_1_ZERO_LENGTH_DIR, pctx)) {
@@ -1970,7 +2017,7 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx,
if (LINUX_S_ISREG(inode->i_mode) &&
(inode->i_size_high || inode->i_size & 0x80000000UL))
ctx->large_files++;
- if ((pb.num_blocks != inode->i_blocks) ||
+ if ((pb.num_blocks != ext2fs_inode_i_blocks(fs, inode)) ||
((fs->super->s_feature_ro_compat &
EXT4_FEATURE_RO_COMPAT_HUGE_FILE) &&
(inode->i_flags & EXT4_HUGE_FILE_FL) &&
@@ -1983,6 +2030,12 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx,
}
pctx->num = 0;
}
+
+ if (ctx->dirs_to_hash && pb.is_dir &&
+ !(inode->i_flags & EXT2_INDEX_FL) &&
+ ((inode->i_size / fs->blocksize) >= 3))
+ ext2fs_u32_list_add(ctx->dirs_to_hash, ino);
+
out:
if (dirty_inode)
e2fsck_write_inode(ctx, ino, inode, "check_blocks");
@@ -2083,31 +2136,8 @@ static int process_block(ext2_filsys fs,
return 0;
}
- if (blk == 0) {
- if (p->is_dir == 0) {
- /*
- * Should never happen, since only directories
- * get called with BLOCK_FLAG_HOLE
- */
-#if DEBUG_E2FSCK
- printf("process_block() called with blk == 0, "
- "blockcnt=%d, inode %lu???\n",
- blockcnt, p->ino);
-#endif
- return 0;
- }
- if (blockcnt < 0)
- return 0;
- if (blockcnt * fs->blocksize < p->inode->i_size) {
-#if 0
- printf("Missing block (#%d) in directory inode %lu!\n",
- blockcnt, p->ino);
-#endif
- p->last_block = blockcnt;
- goto mark_dir;
- }
+ if (blk == 0)
return 0;
- }
#if 0
printf("Process_block, inode %lu, block %u, #%d\n", p->ino, blk,
@@ -2192,11 +2222,22 @@ static int process_block(ext2_filsys fs,
p->last_block = blockcnt;
mark_dir:
if (p->is_dir && (blockcnt >= 0)) {
+ while (++p->last_db_block < blockcnt) {
+ pctx->errcode = ext2fs_add_dir_block(fs->dblist,
+ p->ino, 0,
+ p->last_db_block);
+ if (pctx->errcode) {
+ pctx->blk = 0;
+ pctx->num = p->last_db_block;
+ goto failed_add_dir_block;
+ }
+ }
pctx->errcode = ext2fs_add_dir_block(fs->dblist, p->ino,
blk, blockcnt);
if (pctx->errcode) {
pctx->blk = blk;
pctx->num = blockcnt;
+ failed_add_dir_block:
fix_problem(ctx, PR_1_ADD_DBLOCK, pctx);
/* Should never get here */
ctx->flags |= E2F_FLAG_ABORT;
@@ -2374,9 +2415,10 @@ static void new_table_block(e2fsck_t ctx, blk_t first_block, int group,
const char *name, int num, blk_t *new_block)
{
ext2_filsys fs = ctx->fs;
+ dgrp_t last_grp;
blk_t old_block = *new_block;
blk_t last_block;
- int i;
+ int i, is_flexbg, flexbg, flexbg_size;
char *buf;
struct problem_context pctx;
@@ -2386,19 +2428,44 @@ static void new_table_block(e2fsck_t ctx, blk_t first_block, int group,
pctx.blk = old_block;
pctx.str = name;
- last_block = ext2fs_group_last_block(fs, group);
+ /*
+ * For flex_bg filesystems, first try to allocate the metadata
+ * within the flex_bg, and if that fails then try finding the
+ * space anywhere in the filesystem.
+ */
+ is_flexbg = EXT2_HAS_INCOMPAT_FEATURE(fs->super,
+ EXT4_FEATURE_INCOMPAT_FLEX_BG);
+ if (is_flexbg) {
+ flexbg_size = 1 << fs->super->s_log_groups_per_flex;
+ flexbg = group / flexbg_size;
+ first_block = ext2fs_group_first_block(fs,
+ flexbg_size * flexbg);
+ last_grp = group | (flexbg_size - 1);
+ if (last_grp > fs->group_desc_count)
+ last_grp = fs->group_desc_count;
+ last_block = ext2fs_group_last_block(fs, last_grp);
+ } else
+ last_block = ext2fs_group_last_block(fs, group);
pctx.errcode = ext2fs_get_free_blocks(fs, first_block, last_block,
- num, ctx->block_found_map, new_block);
+ num, ctx->block_found_map,
+ new_block);
+ if (is_flexbg && (pctx.errcode == EXT2_ET_BLOCK_ALLOC_FAIL))
+ pctx.errcode = ext2fs_get_free_blocks(fs,
+ fs->super->s_first_data_block,
+ fs->super->s_blocks_count,
+ num, ctx->block_found_map, new_block);
if (pctx.errcode) {
pctx.num = num;
fix_problem(ctx, PR_1_RELOC_BLOCK_ALLOCATE, &pctx);
ext2fs_unmark_valid(fs);
+ ctx->flags |= E2F_FLAG_ABORT;
return;
}
pctx.errcode = ext2fs_get_mem(fs->blocksize, &buf);
if (pctx.errcode) {
fix_problem(ctx, PR_1_RELOC_MEMORY_ALLOCATE, &pctx);
ext2fs_unmark_valid(fs);
+ ctx->flags |= E2F_FLAG_ABORT;
return;
}
ext2fs_mark_super_dirty(fs);
@@ -2490,7 +2557,8 @@ static void mark_table_blocks(e2fsck_t ctx)
if (ext2fs_test_block_bitmap(ctx->block_found_map,
b)) {
pctx.blk = b;
- if (fix_problem(ctx,
+ if (!ctx->invalid_inode_table_flag[i] &&
+ fix_problem(ctx,
PR_1_ITABLE_CONFLICT, &pctx)) {
ctx->invalid_inode_table_flag[i]++;
ctx->invalid_bitmaps++;
@@ -2604,6 +2672,10 @@ static errcode_t e2fsck_get_alloc_block(ext2_filsys fs, blk64_t goal,
ctx->block_found_map, &new_block);
if (retval)
return retval;
+ if (fs->block_map) {
+ ext2fs_mark_block_bitmap(fs->block_map, new_block);
+ ext2fs_mark_bb_dirty(fs);
+ }
} else {
if (!fs->block_map) {
retval = ext2fs_read_block_bitmap(fs);
diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c
index d08ece4..99f0a3c 100644
--- a/e2fsck/pass1b.c
+++ b/e2fsck/pass1b.c
@@ -180,6 +180,7 @@ static void inode_dnode_free(dnode_t *node,
next = p->next;
free(p);
}
+ free(di);
free(node);
}
@@ -197,6 +198,7 @@ static void block_dnode_free(dnode_t *node,
next = p->next;
free(p);
}
+ free(db);
free(node);
}
@@ -245,6 +247,7 @@ void e2fsck_pass1_dupblocks(e2fsck_t ctx, char *block_buf)
*/
dict_free_nodes(&ino_dict);
dict_free_nodes(&blk_dict);
+ ext2fs_free_inode_bitmap(inode_dup_map);
}
/*
diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c
index c8a3ddb..761c2f1 100644
--- a/e2fsck/pass2.c
+++ b/e2fsck/pass2.c
@@ -66,12 +66,6 @@ static int check_dir_block(ext2_filsys fs,
static int allocate_dir_block(e2fsck_t ctx,
struct ext2_db_entry *dir_blocks_info,
char *buf, struct problem_context *pctx);
-static int update_dir_block(ext2_filsys fs,
- blk_t *block_nr,
- e2_blkcnt_t blockcnt,
- blk_t ref_block,
- int ref_offset,
- void *priv_data);
static void clear_htree(e2fsck_t ctx, ext2_ino_t ino);
static int htree_depth(struct dx_dir_info *dx_dir,
struct dx_dirblock_info *dx_db);
@@ -243,14 +237,13 @@ void e2fsck_pass2(e2fsck_t ctx)
fix_problem(ctx, code, &pctx);
bad_dir++;
}
- if (code == 0)
- continue;
}
if (bad_dir && fix_problem(ctx, PR_2_HTREE_CLEAR, &pctx)) {
clear_htree(ctx, dx_dir->ino);
dx_dir->numblocks = 0;
}
}
+ e2fsck_free_dx_dir_info(ctx);
#endif
ext2fs_free_mem(&buf);
ext2fs_free_dblist(fs->dblist);
@@ -351,9 +344,9 @@ static int check_dot(e2fsck_t ctx,
ext2_ino_t ino, struct problem_context *pctx)
{
struct ext2_dir_entry *nextdir;
+ unsigned int rec_len, new_len;
int status = 0;
int created = 0;
- int rec_len, new_len;
int problem = 0;
if (!dirent->inode)
@@ -364,8 +357,7 @@ static int check_dot(e2fsck_t ctx,
else if (dirent->name[1] != '\0')
problem = PR_2_DOT_NULL_TERM;
- rec_len = (dirent->rec_len || ctx->fs->blocksize < 65536) ?
- dirent->rec_len : 65536;
+ (void) ext2fs_get_rec_len(ctx->fs, dirent, &rec_len);
if (problem) {
if (fix_problem(ctx, problem, pctx)) {
if (rec_len < 12)
@@ -392,7 +384,8 @@ static int check_dot(e2fsck_t ctx,
nextdir = (struct ext2_dir_entry *)
((char *) dirent + 12);
dirent->rec_len = 12;
- nextdir->rec_len = new_len;
+ (void) ext2fs_set_rec_len(ctx->fs, new_len,
+ nextdir);
nextdir->inode = 0;
nextdir->name_len = 0;
status = 1;
@@ -422,8 +415,7 @@ static int check_dotdot(e2fsck_t ctx,
else if (dirent->name[2] != '\0')
problem = PR_2_DOT_DOT_NULL_TERM;
- rec_len = (dirent->rec_len || ctx->fs->blocksize < 65536) ?
- dirent->rec_len : 65536;
+ (void) ext2fs_get_rec_len(ctx->fs, dirent, &rec_len);
if (problem) {
if (fix_problem(ctx, problem, pctx)) {
if (rec_len < 12)
@@ -646,11 +638,11 @@ static void salvage_directory(ext2_filsys fs,
unsigned int *offset)
{
char *cp = (char *) dirent;
- int left, rec_len;
+ int left;
+ unsigned int rec_len, prev_rec_len;
unsigned int name_len = dirent->name_len & 0xFF;
- rec_len = (dirent->rec_len || fs->blocksize < 65536) ?
- dirent->rec_len : 65536;
+ (void) ext2fs_get_rec_len(fs, dirent, &rec_len);
left = fs->blocksize - *offset - rec_len;
/*
@@ -668,10 +660,11 @@ static void salvage_directory(ext2_filsys fs,
* record length.
*/
if ((left < 0) &&
- (name_len + 8 <= rec_len + (unsigned) left) &&
+ ((int) rec_len + left > 8) &&
+ (name_len + 8 <= (int) rec_len + left) &&
dirent->inode <= fs->super->s_inodes_count &&
strnlen(dirent->name, name_len) == name_len) {
- dirent->rec_len += left;
+ (void) ext2fs_set_rec_len(fs, (int) rec_len + left, dirent);
return;
}
/*
@@ -681,7 +674,9 @@ static void salvage_directory(ext2_filsys fs,
*/
if (prev && rec_len && (rec_len % 4) == 0 &&
(*offset + rec_len <= fs->blocksize)) {
- prev->rec_len += rec_len;
+ (void) ext2fs_get_rec_len(fs, prev, &prev_rec_len);
+ prev_rec_len += rec_len;
+ (void) ext2fs_set_rec_len(fs, prev_rec_len, prev);
*offset += rec_len;
return;
}
@@ -692,10 +687,13 @@ static void salvage_directory(ext2_filsys fs,
* new empty directory entry the rest of the directory block.
*/
if (prev) {
- prev->rec_len += fs->blocksize - *offset;
+ (void) ext2fs_get_rec_len(fs, prev, &prev_rec_len);
+ prev_rec_len += fs->blocksize - *offset;
+ (void) ext2fs_set_rec_len(fs, prev_rec_len, prev);
*offset = fs->blocksize;
} else {
- dirent->rec_len = fs->blocksize - *offset;
+ rec_len = fs->blocksize - *offset;
+ (void) ext2fs_set_rec_len(fs, rec_len, dirent);
dirent->name_len = 0;
dirent->inode = 0;
}
@@ -807,8 +805,7 @@ static int check_dir_block(ext2_filsys fs,
dx_db->max_hash = 0;
dirent = (struct ext2_dir_entry *) buf;
- rec_len = (dirent->rec_len || fs->blocksize < 65536) ?
- dirent->rec_len : 65536;
+ (void) ext2fs_get_rec_len(fs, dirent, &rec_len);
limit = (struct ext2_dx_countlimit *) (buf+8);
if (db->blockcnt == 0) {
root = (struct ext2_dx_root_info *) (buf + 24);
@@ -846,8 +843,7 @@ out_htree:
problem = 0;
dirent = (struct ext2_dir_entry *) (buf + offset);
- rec_len = (dirent->rec_len || fs->blocksize < 65536) ?
- dirent->rec_len : 65536;
+ (void) ext2fs_get_rec_len(fs, dirent, &rec_len);
cd->pctx.dirent = dirent;
cd->pctx.num = offset;
if (((offset + rec_len) > fs->blocksize) ||
@@ -1103,8 +1099,7 @@ out_htree:
next:
prev = dirent;
if (dir_modified)
- rec_len = (dirent->rec_len || fs->blocksize < 65536) ?
- dirent->rec_len : 65536;
+ (void) ext2fs_get_rec_len(fs, dirent, &rec_len);
offset += rec_len;
dot_state++;
} while (offset < fs->blocksize);
@@ -1462,8 +1457,8 @@ static int allocate_dir_block(e2fsck_t ctx,
* Finally, update the block pointers for the inode
*/
db->blk = blk;
- pctx->errcode = ext2fs_block_iterate2(fs, db->ino, BLOCK_FLAG_HOLE,
- 0, update_dir_block, db);
+ pctx->errcode = ext2fs_bmap(fs, db->ino, &inode, 0, BMAP_SET,
+ db->blockcnt, &blk);
if (pctx->errcode) {
pctx->str = "ext2fs_block_iterate";
fix_problem(ctx, PR_2_ALLOC_DIRBOCK, pctx);
@@ -1472,23 +1467,3 @@ static int allocate_dir_block(e2fsck_t ctx,
return 0;
}
-
-/*
- * This is a helper function for allocate_dir_block().
- */
-static int update_dir_block(ext2_filsys fs EXT2FS_ATTR((unused)),
- blk_t *block_nr,
- e2_blkcnt_t blockcnt,
- blk_t ref_block EXT2FS_ATTR((unused)),
- int ref_offset EXT2FS_ATTR((unused)),
- void *priv_data)
-{
- struct ext2_db_entry *db;
-
- db = (struct ext2_db_entry *) priv_data;
- if (db->blockcnt == (int) blockcnt) {
- *block_nr = db->blk;
- return BLOCK_CHANGED;
- }
- return 0;
-}
diff --git a/e2fsck/pass5.c b/e2fsck/pass5.c
index e660386..bc3bf02 100644
--- a/e2fsck/pass5.c
+++ b/e2fsck/pass5.c
@@ -103,7 +103,7 @@ static void print_bitmap_problem(e2fsck_t ctx, int problem,
static void check_block_bitmaps(e2fsck_t ctx)
{
ext2_filsys fs = ctx->fs;
- blk_t i, super;
+ blk_t i;
int *free_array;
int group = 0;
blk_t blocks = 0;
@@ -159,7 +159,6 @@ redo_counts:
if (csum_flag &&
(fs->group_desc[group].bg_flags & EXT2_BG_BLOCK_UNINIT))
skip_group++;
- super = fs->super->s_first_data_block;
for (i = fs->super->s_first_data_block;
i < fs->super->s_blocks_count;
i++) {
@@ -255,7 +254,6 @@ redo_counts:
blocks = 0;
group_free = 0;
skip_group = 0;
- super += fs->super->s_blocks_per_group;
if (ctx->progress)
if ((ctx->progress)(ctx, 5, group,
fs->group_desc_count*2))
@@ -567,7 +565,7 @@ static void check_inode_end(e2fsck_t ctx)
for (i = save_inodes_count + 1; i <= end && i > save_inodes_count; i++) {
if (!ext2fs_test_inode_bitmap(fs->inode_map, i)) {
if (fix_problem(ctx, PR_5_INODE_BMAP_PADDING, &pctx)) {
- for (i = save_inodes_count + 1; i <= end; i++)
+ for (; i <= end; i++)
ext2fs_mark_inode_bitmap(fs->inode_map,
i);
ext2fs_mark_ib_dirty(fs);
@@ -612,7 +610,7 @@ static void check_block_end(e2fsck_t ctx)
for (i = save_blocks_count + 1; i <= end && i > save_blocks_count; i++) {
if (!ext2fs_test_block_bitmap(fs->block_map, i)) {
if (fix_problem(ctx, PR_5_BLOCK_BMAP_PADDING, &pctx)) {
- for (i = save_blocks_count + 1; i <= end; i++)
+ for (; i <= end; i++)
ext2fs_mark_block_bitmap(fs->block_map,
i);
ext2fs_mark_bb_dirty(fs);
diff --git a/e2fsck/problem.c b/e2fsck/problem.c
index 43a0aa6..9043281 100644
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@ -252,12 +252,12 @@ static struct e2fsck_problem problem_table[] = {
/* Illegal block found in orphaned inode */
{ PR_0_ORPHAN_ILLEGAL_BLOCK_NUM,
- N_("@I @b #%B (%b) found in @o @i %i.\n"),
+ N_("@I %B (%b) found in @o @i %i.\n"),
PROMPT_NONE, 0 },
/* Already cleared block found in orphaned inode */
{ PR_0_ORPHAN_ALREADY_CLEARED_BLOCK,
- N_("Already cleared @b #%B (%b) found in @o @i %i.\n"),
+ N_("Already cleared %B (%b) found in @o @i %i.\n"),
PROMPT_NONE, 0 },
/* Illegal orphan inode in superblock */
@@ -334,13 +334,13 @@ static struct e2fsck_problem problem_table[] = {
/* Last mount time is in the future */
{ PR_0_FUTURE_SB_LAST_MOUNT,
- N_("@S last mount time is in the future. "),
- PROMPT_FIX, PR_PREEN_OK | PR_NO_OK },
+ N_("@S last mount time (%t,\n\tnow = %T) is in the future.\n"),
+ PROMPT_FIX, PR_NO_OK },
/* Last write time is in the future */
{ PR_0_FUTURE_SB_LAST_WRITE,
- N_("@S last write time is in the future. "),
- PROMPT_FIX, PR_PREEN_OK | PR_NO_OK },
+ N_("@S last write time (%t,\n\tnow = %T) is in the future.\n"),
+ PROMPT_FIX, PR_NO_OK },
{ PR_0_EXTERNAL_JOURNAL_HINT,
N_("@S hint for external superblock @s %X. "),
@@ -354,7 +354,7 @@ static struct e2fsck_problem problem_table[] = {
/* group descriptor N checksum is invalid. */
{ PR_0_GDT_CSUM,
N_("@g descriptor %g checksum is invalid. "),
- PROMPT_FIX, PR_PREEN_OK },
+ PROMPT_FIX, PR_LATCH_BG_CHECKSUM },
/* group descriptor N marked uninitialized without feature set. */
{ PR_0_GDT_UNINIT,
@@ -385,6 +385,23 @@ static struct e2fsck_problem problem_table[] = {
N_("The test_fs flag is set (and ext4 is available). "),
PROMPT_CLEAR, PR_PREEN_OK },
+ /* Last mount time is in the future (fudged) */
+ { PR_0_FUTURE_SB_LAST_MOUNT_FUDGED,
+ N_("@S last mount time is in the future.\n\t(by less than a day, "
+ "probably due to the hardware clock being incorrectly set) "),
+ PROMPT_FIX, PR_PREEN_OK | PR_NO_OK },
+
+ /* Last write time is in the future (fudged) */
+ { PR_0_FUTURE_SB_LAST_WRITE_FUDGED,
+ N_("@S last write time is in the future.\n\t(by less than a day, "
+ "probably due to the hardware clock being incorrectly set). "),
+ PROMPT_FIX, PR_PREEN_OK | PR_NO_OK },
+
+ /* Block group checksum (latch question) is invalid. */
+ { PR_0_GDT_CSUM_LATCH,
+ N_("One or more @b @g descriptor checksums are invalid. "),
+ PROMPT_FIX, PR_PREEN_OK },
+
/* Pass 1 errors */
/* Pass 1: Checking inodes, blocks, and sizes */
@@ -458,12 +475,12 @@ static struct e2fsck_problem problem_table[] = {
/* Illegal blocknumber in inode */
{ PR_1_ILLEGAL_BLOCK_NUM,
- N_("@I @b #%B (%b) in @i %i. "),
+ N_("@I %B (%b) in @i %i. "),
PROMPT_CLEAR, PR_LATCH_BLOCK },
/* Block number overlaps fs metadata */
{ PR_1_BLOCK_OVERLAPS_METADATA,
- N_("@b #%B (%b) overlaps @f metadata in @i %i. "),
+ N_("%B (%b) overlaps @f metadata in @i %i. "),
PROMPT_CLEAR, PR_LATCH_BLOCK },
/* Inode has illegal blocks (latch question) */
@@ -478,7 +495,7 @@ static struct e2fsck_problem problem_table[] = {
/* Illegal block number in bad block inode */
{ PR_1_BB_ILLEGAL_BLOCK_NUM,
- N_("@I @b #%B (%b) in bad @b @i. "),
+ N_("@I %B (%b) in bad @b @i. "),
PROMPT_CLEAR, PR_LATCH_BBLOCK },
/* Bad block inode has illegal blocks (latch question) */
@@ -690,7 +707,7 @@ static struct e2fsck_problem problem_table[] = {
/* Extended attribute reference count incorrect */
{ PR_1_EXTATTR_REFCOUNT,
- N_("@a @b %b has reference count %B, @s %N. "),
+ N_("@a @b %b has reference count %r, @s %N. "),
PROMPT_FIX, 0 },
/* Error writing Extended Attribute block while fixing refcount */
@@ -729,17 +746,17 @@ static struct e2fsck_problem problem_table[] = {
/* Directory too big */
{ PR_1_TOOBIG_DIR,
- N_("@b #%B (%b) causes @d to be too big. "),
+ N_("%B (%b) causes @d to be too big. "),
PROMPT_CLEAR, PR_LATCH_TOOBIG },
/* Regular file too big */
{ PR_1_TOOBIG_REG,
- N_("@b #%B (%b) causes file to be too big. "),
+ N_("%B (%b) causes file to be too big. "),
PROMPT_CLEAR, PR_LATCH_TOOBIG },
/* Symlink too big */
{ PR_1_TOOBIG_SYMLINK,
- N_("@b #%B (%b) causes symlink to be too big. "),
+ N_("%B (%b) causes symlink to be too big. "),
PROMPT_CLEAR, PR_LATCH_TOOBIG },
/* INDEX_FL flag set on a non-HTREE filesystem */
@@ -926,7 +943,7 @@ static struct e2fsck_problem problem_table[] = {
/* File has duplicate blocks */
{ PR_1D_DUP_FILE,
N_("File %Q (@i #%i, mod time %IM) \n"
- " has %B @m @b(s), shared with %N file(s):\n"),
+ " has %r @m @b(s), shared with %N file(s):\n"),
PROMPT_NONE, 0 },
/* List of files sharing duplicate blocks */
@@ -1060,17 +1077,17 @@ static struct e2fsck_problem problem_table[] = {
/* directory corrupted */
{ PR_2_DIR_CORRUPTED,
- N_("@d @i %i, @b %B, offset %N: @d corrupted\n"),
+ N_("@d @i %i, %B, offset %N: @d corrupted\n"),
PROMPT_SALVAGE, 0 },
/* filename too long */
{ PR_2_FILENAME_LONG,
- N_("@d @i %i, @b %B, offset %N: filename too long\n"),
+ N_("@d @i %i, %B, offset %N: filename too long\n"),
PROMPT_TRUNCATE, 0 },
/* Directory inode has a missing block (hole) */
{ PR_2_DIRECTORY_HOLE,
- N_("@d @i %i has an unallocated @b #%B. "),
+ N_("@d @i %i has an unallocated %B. "),
PROMPT_ALLOCATE, 0 },
/* '.' is not NULL terminated */
@@ -1195,22 +1212,22 @@ static struct e2fsck_problem problem_table[] = {
/* Node in HTREE directory not referenced */
{ PR_2_HTREE_NOTREF,
- N_("@p @h %d: node (%B) not referenced\n"),
+ N_("@p @h %d: %B not referenced\n"),
PROMPT_NONE, 0 },
/* Node in HTREE directory referenced twice */
{ PR_2_HTREE_DUPREF,
- N_("@p @h %d: node (%B) referenced twice\n"),
+ N_("@p @h %d: %B referenced twice\n"),
PROMPT_NONE, 0 },
/* Node in HTREE directory has bad min hash */
{ PR_2_HTREE_MIN_HASH,
- N_("@p @h %d: node (%B) has bad min hash\n"),
+ N_("@p @h %d: %B has bad min hash\n"),
PROMPT_NONE, 0 },
/* Node in HTREE directory has bad max hash */
{ PR_2_HTREE_MAX_HASH,
- N_("@p @h %d: node (%B) has bad max hash\n"),
+ N_("@p @h %d: %B has bad max hash\n"),
PROMPT_NONE, 0 },
/* Clear invalid HTREE directory */
@@ -1234,22 +1251,22 @@ static struct e2fsck_problem problem_table[] = {
/* Invalid HTREE limit */
{ PR_2_HTREE_BAD_LIMIT,
- N_("@p @h %d: node (%B) has @n limit (%N)\n"),
+ N_("@p @h %d: %B has @n limit (%N)\n"),
PROMPT_CLEAR_HTREE, PR_PREEN_OK },
/* Invalid HTREE count */
{ PR_2_HTREE_BAD_COUNT,
- N_("@p @h %d: node (%B) has @n count (%N)\n"),
+ N_("@p @h %d: %B has @n count (%N)\n"),
PROMPT_CLEAR_HTREE, PR_PREEN_OK },
/* HTREE interior node has out-of-order hashes in table */
{ PR_2_HTREE_HASH_ORDER,
- N_("@p @h %d: node (%B) has an unordered hash table\n"),
+ N_("@p @h %d: %B has an unordered hash table\n"),
PROMPT_CLEAR_HTREE, PR_PREEN_OK },
/* Node in HTREE directory has invalid depth */
{ PR_2_HTREE_BAD_DEPTH,
- N_("@p @h %d: node (%B) has @n depth (%N)\n"),
+ N_("@p @h %d: %B has @n depth (%N)\n"),
PROMPT_NONE, 0 },
/* Duplicate directory entry found */
@@ -1633,6 +1650,7 @@ static struct latch_descr pr_latch_info[] = {
{ PR_LATCH_LOW_DTIME, PR_1_ORPHAN_LIST_REFUGEES, 0 },
{ PR_LATCH_TOOBIG, PR_1_INODE_TOOBIG, 0 },
{ PR_LATCH_OPTIMIZE_DIR, PR_3A_OPTIMIZE_DIR_HEADER, PR_3A_OPTIMIZE_DIR_END },
+ { PR_LATCH_BG_CHECKSUM, PR_0_GDT_CSUM_LATCH, 0 },
{ -1, 0, 0 },
};
@@ -1723,7 +1741,7 @@ int fix_problem(e2fsck_t ctx, problem_t code, struct problem_context *pctx)
struct e2fsck_problem *ptr;
struct latch_descr *ldesc = 0;
const char *message;
- int def_yn, answer, ans;
+ int def_yn, answer, ans, broken_system_clock;
int print_answer = 0;
int suppress = 0;
@@ -1735,6 +1753,15 @@ int fix_problem(e2fsck_t ctx, problem_t code, struct problem_context *pctx)
if (!(ptr->flags & PR_CONFIG)) {
char key[9], *new_desc;
+ if ((code == PR_0_FUTURE_SB_LAST_MOUNT) ||
+ (code == PR_0_FUTURE_SB_LAST_WRITE)) {
+ profile_get_boolean(ctx->profile, "options",
+ "broken_system_clock", 0, 0,
+ &broken_system_clock);
+ if (broken_system_clock)
+ ptr->flags |= PR_PREEN_OK;
+ }
+
sprintf(key, "0x%06x", code);
profile_get_string(ctx->profile, "problems", key,
diff --git a/e2fsck/problem.h b/e2fsck/problem.h
index 1d2c233..f3969e0 100644
--- a/e2fsck/problem.h
+++ b/e2fsck/problem.h
@@ -38,6 +38,7 @@ struct problem_context {
#define PR_LATCH_LOW_DTIME 0x0070 /* Latch for pass1 orphaned list refugees */
#define PR_LATCH_TOOBIG 0x0080 /* Latch for file to big errors */
#define PR_LATCH_OPTIMIZE_DIR 0x0090 /* Latch for optimize directories */
+#define PR_LATCH_BG_CHECKSUM 0x00A0 /* Latch for block group checksums */
#define PR_LATCH(x) ((((x) & PR_LATCH_MASK) >> 4) - 1)
@@ -217,6 +218,16 @@ struct problem_context {
/* The test_fs filesystem flag is set and ext4 is available */
#define PR_0_CLEAR_TESTFS_FLAG 0x00003B
+/* Last mount time is in the future (fudged) */
+#define PR_0_FUTURE_SB_LAST_MOUNT_FUDGED 0x00003C
+
+/* Last write time is in the future (fudged) */
+#define PR_0_FUTURE_SB_LAST_WRITE_FUDGED 0x00003D
+
+/* Block group checksum (latch question) */
+#define PR_0_GDT_CSUM_LATCH 0x00003E
+
+
/*
* Pass 1 errors
*/
diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c
index d2dbcce..780742e 100644
--- a/e2fsck/rehash.c
+++ b/e2fsck/rehash.c
@@ -88,8 +88,8 @@ static int fill_dir_block(ext2_filsys fs,
struct hash_entry *new_array, *ent;
struct ext2_dir_entry *dirent;
char *dir;
- unsigned int offset, dir_offset;
- int rec_len, hash_alg;
+ unsigned int offset, dir_offset, rec_len;
+ int hash_alg;
if (blockcnt < 0)
return 0;
@@ -103,7 +103,7 @@ static int fill_dir_block(ext2_filsys fs,
if (HOLE_BLKADDR(*block_nr)) {
memset(dir, 0, fs->blocksize);
dirent = (struct ext2_dir_entry *) dir;
- dirent->rec_len = fs->blocksize;
+ (void) ext2fs_set_rec_len(fs, fs->blocksize, dirent);
} else {
fd->err = ext2fs_read_dir_block(fs, *block_nr, dir);
if (fd->err)
@@ -117,8 +117,7 @@ static int fill_dir_block(ext2_filsys fs,
dir_offset = 0;
while (dir_offset < fs->blocksize) {
dirent = (struct ext2_dir_entry *) (dir + dir_offset);
- rec_len = (dirent->rec_len || fs->blocksize < 65536) ?
- dirent->rec_len : 65536;
+ (void) ext2fs_get_rec_len(fs, dirent, &rec_len);
if (((dir_offset + rec_len) > fs->blocksize) ||
(rec_len < 8) ||
((rec_len % 4) != 0) ||
@@ -404,7 +403,8 @@ static errcode_t copy_dir_entries(e2fsck_t ctx,
char *block_start;
struct hash_entry *ent;
struct ext2_dir_entry *dirent;
- int i, rec_len, left;
+ unsigned int rec_len, prev_rec_len;
+ int i, left;
ext2_dirhash_t prev_hash;
int offset, slack;
@@ -429,6 +429,7 @@ static errcode_t copy_dir_entries(e2fsck_t ctx,
if ((retval = get_next_block(fs, outdir, &block_start)))
return retval;
dirent = (struct ext2_dir_entry *) block_start;
+ prev_rec_len = 0;
left = fs->blocksize;
slack = fd->compress ? 12 :
(fs->blocksize * ctx->htree_slack_percentage)/100;
@@ -440,8 +441,12 @@ static errcode_t copy_dir_entries(e2fsck_t ctx,
continue;
rec_len = EXT2_DIR_REC_LEN(ent->dir->name_len & 0xFF);
if (rec_len > left) {
- if (left)
- dirent->rec_len += left;
+ if (left) {
+ left += prev_rec_len;
+ retval = ext2fs_set_rec_len(fs, left, dirent);
+ if (retval)
+ return retval;
+ }
if ((retval = get_next_block(fs, outdir,
&block_start)))
return retval;
@@ -457,21 +462,27 @@ static errcode_t copy_dir_entries(e2fsck_t ctx,
}
dirent->inode = ent->dir->inode;
dirent->name_len = ent->dir->name_len;
- dirent->rec_len = rec_len;
+ retval = ext2fs_set_rec_len(fs, rec_len, dirent);
+ if (retval)
+ return retval;
+ prev_rec_len = rec_len;
memcpy(dirent->name, ent->dir->name, dirent->name_len & 0xFF);
offset += rec_len;
left -= rec_len;
if (left < slack) {
- dirent->rec_len += left;
+ prev_rec_len += left;
+ retval = ext2fs_set_rec_len(fs, prev_rec_len, dirent);
+ if (retval)
+ return retval;
offset += left;
left = 0;
}
prev_hash = ent->hash;
}
if (left)
- dirent->rec_len += left;
+ retval = ext2fs_set_rec_len(fs, rec_len + left, dirent);
- return 0;
+ return retval;
}
@@ -522,7 +533,7 @@ static struct ext2_dx_entry *set_int_node(ext2_filsys fs, char *buf)
memset(buf, 0, fs->blocksize);
dir = (struct ext2_dir_entry *) buf;
dir->inode = 0;
- dir->rec_len = fs->blocksize;
+ (void) ext2fs_set_rec_len(fs, fs->blocksize, dir);
limits = (struct ext2_dx_countlimit *) (buf+8);
limits->limit = (fs->blocksize - 8) / sizeof(struct ext2_dx_entry);
@@ -725,6 +736,7 @@ errcode_t e2fsck_rehash_dir(e2fsck_t ctx, ext2_ino_t ino)
fd.compress = 1;
fd.parent = 0;
+retry_nohash:
/* Read in the entire directory into memory */
retval = ext2fs_block_iterate2(fs, ino, 0, 0,
fill_dir_block, &fd);
@@ -733,6 +745,17 @@ errcode_t e2fsck_rehash_dir(e2fsck_t ctx, ext2_ino_t ino)
goto errout;
}
+ /*
+ * If the entries read are less than a block, then don't index
+ * the directory
+ */
+ if (!fd.compress && (fd.dir_size < (fs->blocksize - 24))) {
+ fd.compress = 1;
+ fd.dir_size = 0;
+ fd.num_array = 0;
+ goto retry_nohash;
+ }
+
#if 0
printf("%d entries (%d bytes) found in inode %d\n",
fd.num_array, fd.dir_size, ino);
@@ -740,12 +763,7 @@ errcode_t e2fsck_rehash_dir(e2fsck_t ctx, ext2_ino_t ino)
/* Sort the list */
resort:
- if (fd.compress)
- qsort(fd.harray+2, fd.num_array-2,
- sizeof(struct hash_entry), ino_cmp);
- else
- qsort(fd.harray, fd.num_array,
- sizeof(struct hash_entry), hash_cmp);
+ qsort(fd.harray, fd.num_array, sizeof(struct hash_entry), hash_cmp);
/*
* Look for duplicates
@@ -758,6 +776,11 @@ resort:
goto errout;
}
+ /* Sort non-hashed directories by inode number */
+ if (fd.compress)
+ qsort(fd.harray+2, fd.num_array-2,
+ sizeof(struct hash_entry), ino_cmp);
+
/*
* Copy the directory entries. In a htree directory these
* will become the leaf nodes.
diff --git a/e2fsck/super.c b/e2fsck/super.c
index 344777d..951f6db 100644
--- a/e2fsck/super.c
+++ b/e2fsck/super.c
@@ -457,12 +457,13 @@ void check_super_block(e2fsck_t ctx)
blk_t first_block, last_block;
struct ext2_super_block *sb = fs->super;
struct ext2_group_desc *gd;
+ problem_t problem;
blk_t blocks_per_group = fs->super->s_blocks_per_group;
blk_t bpg_max;
int inodes_per_block;
int ipg_max;
int inode_size;
- int buggy_init_scripts;
+ int accept_time_fudge;
dgrp_t i;
blk_t should_be;
struct problem_context pctx;
@@ -794,40 +795,52 @@ void check_super_block(e2fsck_t ctx)
}
/*
- * Some buggy distributions (such as Ubuntu) have init scripts
- * and/or installers which fail to correctly set the system
- * clock before running e2fsck and/or formatting the
- * filesystem initially. Normally this happens because the
- * hardware clock is ticking localtime, instead of the more
- * proper and less error-prone UTC time. So while the kernel
- * is booting, the system time (which in Linux systems always
- * ticks in UTC time) is set from the hardware clock, but
- * since the hardware clock is ticking localtime, the system
- * time is incorrect. Unfortunately, some buggy distributions
- * do not correct this before running e2fsck. If this option
- * is set to a boolean value of true, we attempt to work
- * around this situation by allowing the superblock last write
- * time, last mount time, and last check time to be in the
- * future by up to 24 hours.
+ * Unfortunately, due to Windows' unfortunate design decision
+ * to configure the hardware clock to tick localtime, instead
+ * of the more proper and less error-prone UTC time, many
+ * users end up in the situation where the system clock is
+ * incorrectly set at the time when e2fsck is run.
+ *
+ * Historically this was usually due to some distributions
+ * having buggy init scripts and/or installers that didn't
+ * correctly detect this case and take appropriate
+ * countermeasures. However, it's still possible, despite the
+ * best efforts of init script and installer authors to not be
+ * able to detect this misconfiguration, usually due to a
+ * buggy or misconfigured virtualization manager or the
+ * installer not having access to a network time server during
+ * the installation process. So by default, we allow the
+ * superblock times to be fudged by up to 24 hours. This can
+ * be disabled by setting options.accept_time_fudge to the
+ * boolean value of false in e2fsck.conf. We also support
+ * options.buggy_init_scripts for backwards compatibility.
*/
+ profile_get_boolean(ctx->profile, "options", "accept_time_fudge",
+ 0, 1, &accept_time_fudge);
profile_get_boolean(ctx->profile, "options", "buggy_init_scripts",
- 0, 0, &buggy_init_scripts);
- ctx->time_fudge = buggy_init_scripts ? 86400 : 0;
+ 0, accept_time_fudge, &accept_time_fudge);
+ ctx->time_fudge = accept_time_fudge ? 86400 : 0;
/*
* Check to see if the superblock last mount time or last
* write time is in the future.
*/
- if (fs->super->s_mtime > (__u32) ctx->now + ctx->time_fudge) {
+ if (fs->super->s_mtime > (__u32) ctx->now) {
pctx.num = fs->super->s_mtime;
- if (fix_problem(ctx, PR_0_FUTURE_SB_LAST_MOUNT, &pctx)) {
+ problem = PR_0_FUTURE_SB_LAST_MOUNT;
+ if (fs->super->s_mtime <= (__u32) ctx->now + ctx->time_fudge)
+ problem = PR_0_FUTURE_SB_LAST_MOUNT_FUDGED;
+ if (fix_problem(ctx, problem, &pctx)) {
fs->super->s_mtime = ctx->now;
ext2fs_mark_super_dirty(fs);
}
}
- if (fs->super->s_wtime > (__u32) ctx->now + ctx->time_fudge) {
+ if (fs->super->s_wtime > (__u32) ctx->now) {
pctx.num = fs->super->s_wtime;
- if (fix_problem(ctx, PR_0_FUTURE_SB_LAST_WRITE, &pctx)) {
+ problem = PR_0_FUTURE_SB_LAST_WRITE;
+ if (fs->super->s_wtime <= (__u32) ctx->now + ctx->time_fudge)
+ problem = PR_0_FUTURE_SB_LAST_WRITE_FUDGED;
+ if (fix_problem(ctx, problem, &pctx)) {
fs->super->s_wtime = ctx->now;
ext2fs_mark_super_dirty(fs);
}
diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index ffcdcc6..6248958 100644
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -802,7 +802,6 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
argv[optind]);
fatal_error(ctx, 0);
}
- ctx->filesystem_name = string_copy(ctx, ctx->filesystem_name, 0);
if (extended_opts)
parse_extended_opts(ctx, extended_opts);
@@ -927,7 +926,7 @@ static const char *my_ver_date = E2FSPROGS_DATE;
int main (int argc, char *argv[])
{
- errcode_t retval = 0, orig_retval = 0;
+ errcode_t retval = 0, retval2 = 0, orig_retval = 0;
int exit_value = FSCK_OK;
ext2_filsys fs = 0;
io_manager io_ptr;
@@ -1013,7 +1012,11 @@ restart:
!(ctx->flags & E2F_FLAG_SB_SPECIFIED) &&
((retval == EXT2_ET_BAD_MAGIC) ||
(retval == EXT2_ET_CORRUPT_SUPERBLOCK) ||
- ((retval == 0) && ext2fs_check_desc(fs)))) {
+ ((retval == 0) && (retval2 = ext2fs_check_desc(fs))))) {
+ if (retval2 == ENOMEM) {
+ retval = retval2;
+ goto failure;
+ }
if (fs->flags & EXT2_FLAG_NOFREE_ON_ERROR) {
ext2fs_free(fs);
fs = NULL;
@@ -1052,6 +1055,7 @@ restart:
if (features[0] || features[1] || features[2])
goto print_unsupp_features;
}
+failure:
if (retval) {
if (orig_retval)
retval = orig_retval;
diff --git a/e2fsprogs.lsm b/e2fsprogs.lsm
index 6418899..1dc289a 100644
--- a/e2fsprogs.lsm
+++ b/e2fsprogs.lsm
@@ -1,16 +1,16 @@
Begin3
Title: EXT2 Filesystem utilities
-Version: 1.41.6
-Entered-date: 30May2009
+Version: 1.41.10
+Entered-date: 10Feb2010
Description: The filesystem utilities for the EXT2 filesystem, including
e2fsck, mke2fs, dumpe2fs, fsck, and others.
Keywords: utilities, fsck, filesystem, Ext2fs
Author: tytso at mit.edu (Theodore Tso)
Maintained-by: tytso at mit.edu (Theodore Tso)
Primary-site: download.sourceforge.net /pub/sourceforge/e2fsprogs
- 4320kB e2fsprogs-1.41.6.tar.gz
- 484kB e2fsprogs-libs-1.41.6.tar.gz
- 1kB e2fsprogs-1.41.6.lsm
+ 4364kB e2fsprogs-1.41.10.tar.gz
+ 480kB e2fsprogs-libs-1.41.10.tar.gz
+ 1kB e2fsprogs-1.41.10.lsm
Alternate-site:
Platforms: linux 1.2.x/1.3.x/2.0.x/2.1.x/2.2.x/2.3.x/2.4.x/2.5.x/2.6.x
Copying-policy: GPL-2/LGPL-2
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 7e48827..9740e8d 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -3,9 +3,9 @@
%define _root_localedir /usr/share/locale
%define _root_etcdir /etc
-Summary: Utilities for managing the second extended (ext2) filesystem.
+Summary: Utilities for managing ext2/ext3/ext4 filesystems
Name: e2fsprogs
-Version: 1.41.6
+Version: 1.41.9
Release: 0
License: GPLv2
Group: System Environment/Base
@@ -16,21 +16,21 @@ BuildRoot: %{_tmppath}/%{name}-root
%description
The e2fsprogs package contains a number of utilities for creating,
-checking, modifying, and correcting any inconsistencies in second
-extended (ext2) filesystems. E2fsprogs contains e2fsck (used to
-repair filesystem inconsistencies after an unclean shutdown), mke2fs
-(used to initialize a partition to contain an empty ext2 filesystem),
-debugfs (used to examine the internal structure of a filesystem, to
-manually repair a corrupted filesystem or to create test cases for
-e2fsck), tune2fs (used to modify filesystem parameters), resize2fs to
-grow and shrink unmounted ext2 filesystems, and most of the other core
-ext2fs filesystem utilities.
-
-You should install the e2fsprogs package if you are using any ext2
-filesystems (if you're not sure, you probably should install this
-package). You may also need to install it (even if you don't use
-ext2) for the libuuid and libblkid libraries and fsck tool that are
-included here.
+checking, modifying, and correcting any inconsistencies in ext2, ext3,
+and ext4 filesystems. E2fsprogs contains e2fsck (used to repair
+filesystem inconsistencies after an unclean shutdown), mke2fs (used to
+initialize a partition to contain an empty ext2 filesystem), debugfs
+(used to examine the internal structure of a filesystem, to manually
+repair a corrupted filesystem or to create test cases for e2fsck),
+tune2fs (used to modify filesystem parameters), resize2fs to grow and
+shrink unmounted ext2 filesystems, and most of the other core ext2fs
+filesystem utilities.
+
+You should install the e2fsprogs package if you are using any ext2,
+ext3, or ext4 filesystems (if you're not sure, you probably should
+install this package). You may also need to install it (even if you
+don't use ext2/ext3/ext4) for the libuuid and libblkid libraries and
+fsck tool that are included here.
%package devel
Summary: Ext2 filesystem-specific static libraries and headers.
@@ -40,11 +40,11 @@ Prereq: /sbin/install-info
%description devel
E2fsprogs-devel contains the libraries and header files needed to
-develop second extended (ext2) filesystem-specific programs.
+develop ext2, ext3, or ext4 filesystem-specific programs.
-You should install e2fsprogs-devel if you want to develop ext2
-filesystem-specific programs. If you install e2fsprogs-devel, you'll
-also want to install e2fsprogs.
+You should install e2fsprogs-devel if you want to develop
+ext2. ext3. or ext4 filesystem-specific programs. If you install
+e2fsprogs-devel, you'll also want to install e2fsprogs.
%package -n uuidd
Summary: helper daemon to guarantee uniqueness of time-based UUIDs
@@ -134,6 +134,7 @@ exit 0
%{_root_sbindir}/tune2fs
%{_sbindir}/filefrag
%{_sbindir}/mklost+found
+%{_sbindir}/e2freefrag
%{_root_libdir}/libblkid.so.*
%{_root_libdir}/libcom_err.so.*
@@ -178,6 +179,7 @@ exit 0
%{_mandir}/man8/resize2fs.8*
%{_mandir}/man8/tune2fs.8*
%{_mandir}/man8/filefrag.8*
+%{_mandir}/man8/e2freefrag.8*
%files devel
%defattr(-,root,root)
diff --git a/e2fsprogs.spec.in b/e2fsprogs.spec.in
index 51c9b64..6fc23a7 100644
--- a/e2fsprogs.spec.in
+++ b/e2fsprogs.spec.in
@@ -3,7 +3,7 @@
%define _root_localedir /usr/share/locale
%define _root_etcdir /etc
-Summary: Utilities for managing the second extended (ext2) filesystem.
+Summary: Utilities for managing ext2/ext3/ext4 filesystems
Name: e2fsprogs
Version: @E2FSPROGS_PKGVER@
Release: 0
@@ -16,21 +16,21 @@ BuildRoot: %{_tmppath}/%{name}-root
%description
The e2fsprogs package contains a number of utilities for creating,
-checking, modifying, and correcting any inconsistencies in second
-extended (ext2) filesystems. E2fsprogs contains e2fsck (used to
-repair filesystem inconsistencies after an unclean shutdown), mke2fs
-(used to initialize a partition to contain an empty ext2 filesystem),
-debugfs (used to examine the internal structure of a filesystem, to
-manually repair a corrupted filesystem or to create test cases for
-e2fsck), tune2fs (used to modify filesystem parameters), resize2fs to
-grow and shrink unmounted ext2 filesystems, and most of the other core
-ext2fs filesystem utilities.
-
-You should install the e2fsprogs package if you are using any ext2
-filesystems (if you're not sure, you probably should install this
-package). You may also need to install it (even if you don't use
-ext2) for the libuuid and libblkid libraries and fsck tool that are
-included here.
+checking, modifying, and correcting any inconsistencies in ext2, ext3,
+and ext4 filesystems. E2fsprogs contains e2fsck (used to repair
+filesystem inconsistencies after an unclean shutdown), mke2fs (used to
+initialize a partition to contain an empty ext2 filesystem), debugfs
+(used to examine the internal structure of a filesystem, to manually
+repair a corrupted filesystem or to create test cases for e2fsck),
+tune2fs (used to modify filesystem parameters), resize2fs to grow and
+shrink unmounted ext2 filesystems, and most of the other core ext2fs
+filesystem utilities.
+
+You should install the e2fsprogs package if you are using any ext2,
+ext3, or ext4 filesystems (if you're not sure, you probably should
+install this package). You may also need to install it (even if you
+don't use ext2/ext3/ext4) for the libuuid and libblkid libraries and
+fsck tool that are included here.
%package devel
Summary: Ext2 filesystem-specific static libraries and headers.
@@ -40,11 +40,11 @@ Prereq: /sbin/install-info
%description devel
E2fsprogs-devel contains the libraries and header files needed to
-develop second extended (ext2) filesystem-specific programs.
+develop ext2, ext3, or ext4 filesystem-specific programs.
-You should install e2fsprogs-devel if you want to develop ext2
-filesystem-specific programs. If you install e2fsprogs-devel, you'll
-also want to install e2fsprogs.
+You should install e2fsprogs-devel if you want to develop
+ext2. ext3. or ext4 filesystem-specific programs. If you install
+e2fsprogs-devel, you'll also want to install e2fsprogs.
%package -n uuidd
Summary: helper daemon to guarantee uniqueness of time-based UUIDs
@@ -134,6 +134,7 @@ exit 0
%{_root_sbindir}/tune2fs
%{_sbindir}/filefrag
%{_sbindir}/mklost+found
+%{_sbindir}/e2freefrag
%{_root_libdir}/libblkid.so.*
%{_root_libdir}/libcom_err.so.*
@@ -178,6 +179,7 @@ exit 0
%{_mandir}/man8/resize2fs.8*
%{_mandir}/man8/tune2fs.8*
%{_mandir}/man8/filefrag.8*
+%{_mandir}/man8/e2freefrag.8*
%files devel
%defattr(-,root,root)
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 40a56a5..47f6f62 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -43,6 +43,22 @@ INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = @MKINSTALLDIRS@
mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+ at SET_MAKE@
+
+ at ifGNUmake@ V =
+ at ifGNUmake@ ifeq ($(strip $(V)),)
+ at ifGNUmake@ # E = @echo
+ at ifGNUmake@ # Q = @
+ at ifGNUmake@ E = @E@
+ at ifGNUmake@ Q = @Q@
+ at ifGNUmake@ else
+ at ifGNUmake@ E = @\#
+ at ifGNUmake@ Q =
+ at ifGNUmake@ endif
+
+ at ifNotGNUmake@ E = @E@
+ at ifNotGNUmake@ Q = @Q@
+
l = @INTL_LIBTOOL_SUFFIX_PREFIX@
AR = ar
@@ -146,11 +162,11 @@ all-no-yes: libgnuintl.$la
all-no-no:
libintl.a libgnuintl.a: $(OBJECTS)
- @rm -f $@
- @echo " AR $@"
- @$(AR) cru $@ $(OBJECTS)
- @echo " RANLIB $@"
- @$(RANLIB) $@
+ $(Q) rm -f $@
+ $(E) " AR $@"
+ $(Q) $(AR) cru $@ $(OBJECTS)
+ $(E) " RANLIB $@"
+ $(Q) $(RANLIB) $@
libintl.la libgnuintl.la: $(OBJECTS)
$(LIBTOOL) --mode=link \
@@ -173,8 +189,8 @@ LTV_AGE=4
.SUFFIXES: .c .y .o .lo .sin .sed
.c.o:
- @echo " CC $<"
- @$(COMPILE) $<
+ $(E) " CC $<"
+ $(Q) $(COMPILE) $<
.y.c:
$(YACC) $(YFLAGS) --output $@ $<
@@ -228,32 +244,32 @@ intl-compat.lo: $(srcdir)/intl-compat.c
$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c
ref-add.sed: $(srcdir)/ref-add.sin
- @echo " SED ref-add.sed"
- @sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed
- @mv t-ref-add.sed ref-add.sed
+ $(E) " SED ref-add.sed"
+ $(Q) sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed
+ $(Q) mv t-ref-add.sed ref-add.sed
ref-del.sed: $(srcdir)/ref-del.sin
- @echo " SED ref-del.sed"
- @sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
- @mv t-ref-del.sed ref-del.sed
+ $(E) " SED ref-del.sed"
+ $(Q) sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
+ $(Q) mv t-ref-del.sed ref-del.sed
INCLUDES = -I. -I$(srcdir) -I..
libgnuintl.h: $(srcdir)/libgnuintl.h.in
- @echo " SED libgnuintl.h "
- @sed -e 's,@''HAVE_POSIX_PRINTF''@, at HAVE_POSIX_PRINTF@,g' \
+ $(E) " SED libgnuintl.h "
+ $(Q) sed -e 's,@''HAVE_POSIX_PRINTF''@, at HAVE_POSIX_PRINTF@,g' \
-e 's,@''HAVE_ASPRINTF''@, at HAVE_ASPRINTF@,g' \
-e 's,@''HAVE_SNPRINTF''@, at HAVE_SNPRINTF@,g' \
-e 's,@''HAVE_WPRINTF''@, at HAVE_WPRINTF@,g' \
< $(srcdir)/libgnuintl.h.in > libgnuintl.h
libintl.h: libgnuintl.h
- @echo " CP libintl.h"
- @cp libgnuintl.h libintl.h
+ $(E) " CP libintl.h"
+ $(Q) cp libgnuintl.h libintl.h
charset.alias: $(srcdir)/config.charset
- @echo " CONFIG.CHARSET $@"
- @$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
- @mv t-$@ $@
+ $(E) " CONFIG.CHARSET $@"
+ $(Q) $(SHELL) $(srcdir)/config.charset '@host@' > t-$@
+ $(Q) mv t-$@ $@
check: all
@@ -264,7 +280,7 @@ check: all
# package, you have to use `configure --with-included-gettext'.
install: install-exec install-data
install-exec: all
- @if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
+ $(Q) if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
&& test '@USE_INCLUDED_LIBINTL@' = yes; then \
$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
$(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
@@ -279,7 +295,7 @@ install-exec: all
else \
: ; \
fi
- @if test "$(PACKAGE)" = "gettext-tools" \
+ $(Q) if test "$(PACKAGE)" = "gettext-tools" \
&& test '@USE_INCLUDED_LIBINTL@' = no; then \
$(mkinstalldirs) $(DESTDIR)$(libdir); \
$(LIBTOOL) --mode=install \
@@ -321,7 +337,7 @@ install-exec: all
: ; \
fi
install-data: all
- @if test "$(PACKAGE)" = "gettext-tools"; then \
+ $(Q) if test "$(PACKAGE)" = "gettext-tools"; then \
$(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
$(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
$(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
@@ -474,8 +490,8 @@ distclean: clean
fi
maintainer-clean: distclean
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
+ $(E) "This command is intended for maintainers to use;"
+ $(E) "it deletes files that may require special tools to rebuild."
# GNU gettext needs not contain the file `VERSION' but contains some
diff --git a/lib/Makefile.checker b/lib/Makefile.checker
index 8382a51..cdc1d7b 100644
--- a/lib/Makefile.checker
+++ b/lib/Makefile.checker
@@ -1,16 +1,16 @@
all:: $(LIBRARY)_chk.a
real-subdirs:: Makefile
- @echo " MKDIR checker"
- @mkdir -p checker
+ $(E) " MKDIR checker"
+ $(Q) mkdir -p checker
clean::
$(RM) -rf checker
$(LIBRARY)_chk.a: $(OBJS)
- @echo " GEN_CHECKER_LIB $@"
- @(test -r $@ && $(RM) -f $@.bak && $(MV) $@ $@.bak)
- (cd checker; $(ARGEN) $@ $(OBJS))
- -@$(RANLIB) $@
- @$(RM) -f ../$@
- @$(LN) $@ ../$@
+ $(E) " GEN_CHECKER_LIB $@"
+ $(Q) (test -r $@ && $(RM) -f $@.bak && $(MV) $@ $@.bak)
+ $(Q) (cd checker; $(ARGEN) $@ $(OBJS))
+ -$(Q) $(RANLIB) $@
+ $(Q) $(RM) -f ../$@
+ $(Q) $(LN) $@ ../$@
diff --git a/lib/Makefile.darwin-lib b/lib/Makefile.darwin-lib
index 3052b2e..a26200b 100644
--- a/lib/Makefile.darwin-lib
+++ b/lib/Makefile.darwin-lib
@@ -13,8 +13,8 @@
all:: image
real-subdirs:: Makefile
- @echo " MKDIR pic"
- @mkdir -p pic
+ $(E) " MKDIR pic"
+ $(Q) mkdir -p pic
BSD_LIB = $(BSDLIB_IMAGE).$(BSDLIB_VERSION).dylib
BSDLIB_PIC_FLAG = -fPIC
@@ -22,19 +22,19 @@ BSDLIB_PIC_FLAG = -fPIC
image: $(BSD_LIB)
$(BSD_LIB): $(OBJS)
- @echo " GEN_BSD_SOLIB $(BSD_LIB)"
- @(cd pic; $(CC) -dynamiclib -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) \
+ $(E) " GEN_BSD_SOLIB $(BSD_LIB)"
+ $(Q) (cd pic; $(CC) -dynamiclib -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) \
-flat_namespace -undefined warning -o $(BSD_LIB) $(OBJS))
- @$(MV) pic/$(BSD_LIB) .
- @$(RM) -f ../$(BSD_LIB)
- @$(LN) $(BSD_LIB) ../$(BSD_LIB)
- @$(LN) ../$(BSD_LIB) ../$(BSDLIB_IMAGE).dylib
+ $(Q) $(MV) pic/$(BSD_LIB) .
+ $(Q) $(RM) -f ../$(BSD_LIB)
+ $(Q) $(LN) $(BSD_LIB) ../$(BSD_LIB)
+ $(Q) $(LN) ../$(BSD_LIB) ../$(BSDLIB_IMAGE).dylib
install-shlibs install:: $(BSD_LIB)
- @echo " INSTALL_PROGRAM $(BSDLIB_INSTALL_DIR)/$(BSD_LIB)"
- @$(INSTALL_PROGRAM) $(BSD_LIB) \
+ $(E) " INSTALL_PROGRAM $(BSDLIB_INSTALL_DIR)/$(BSD_LIB)"
+ $(Q) $(INSTALL_PROGRAM) $(BSD_LIB) \
$(DESTDIR)$(BSDLIB_INSTALL_DIR)/$(BSD_LIB)
- @-$(LDCONFIG)
+ -$(Q) $(LDCONFIG)
install-strip: install
diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
index 4c778b9..c0202f4 100644
--- a/lib/Makefile.elf-lib
+++ b/lib/Makefile.elf-lib
@@ -14,8 +14,8 @@
all:: image
real-subdirs:: Makefile
- @echo " MKDIR elfshared"
- @mkdir -p elfshared
+ $(E) " MKDIR elfshared"
+ $(Q) mkdir -p elfshared
ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION)
ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
@@ -23,45 +23,45 @@ ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
image: $(ELF_LIB)
$(ELF_LIB): $(OBJS)
- @echo " GEN_ELF_SOLIB $(ELF_LIB)"
- @(cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
+ $(E) " GEN_ELF_SOLIB $(ELF_LIB)"
+ $(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
-Wl,-soname,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
- @$(MV) elfshared/$(ELF_LIB) .
- @$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
- @$(LN) $(ELF_LIB) ../$(ELF_LIB)
- @$(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so
- @$(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
+ $(Q) $(MV) elfshared/$(ELF_LIB) .
+ $(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
+ $(Q) $(LN) $(ELF_LIB) ../$(ELF_LIB)
+ $(Q) $(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so
+ $(Q) $(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
installdirs-elf-lib::
- @echo " MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
+ $(E) " MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
+ $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
$(DESTDIR)$(libdir)
installdirs:: installdirs-elf-lib
install-shlibs install:: $(ELF_LIB) installdirs-elf-lib
- @echo " INSTALL-ELF-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
- @$(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
- @echo " SYMLINK $(ELF_INSTALL_DIR)/$(ELF_SONAME)"
- @$(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
- @echo " SYMLINK $(libdir)/$(ELF_IMAGE).so"
- @if test "$(ELF_INSTALL_DIR)" = "$(libdir)"; then \
+ $(E) " INSTALL-ELF-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
+ $(Q) $(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
+ $(E) " SYMLINK $(ELF_INSTALL_DIR)/$(ELF_SONAME)"
+ $(Q) $(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
+ $(E) " SYMLINK $(libdir)/$(ELF_IMAGE).so"
+ $(Q) if test "$(ELF_INSTALL_DIR)" = "$(libdir)"; then \
$(LN_S) -f $(ELF_SONAME) $(DESTDIR)$(libdir)/$(ELF_IMAGE).so ; \
else \
$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
$(DESTDIR)$(libdir)/$(ELF_IMAGE).so; \
fi
- @echo " LDCONFIG"
- @-$(LDCONFIG)
+ $(E) " LDCONFIG"
+ $(Q) -$(LDCONFIG)
install-strip: install
- @echo " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
- @$(STRIP) --strip-unneeded --remove-section=.comment \
+ $(E) " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
+ $(Q) $(STRIP) --strip-unneeded --remove-section=.comment \
--remove-section=.note $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
install-shlibs-strip: install-shlibs
- @echo " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
- @$(STRIP) --strip-unneeded --remove-section=.comment \
+ $(E) " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
+ $(Q) $(STRIP) --strip-unneeded --remove-section=.comment \
--remove-section=.note $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
uninstall-shlibs uninstall::
diff --git a/lib/Makefile.library b/lib/Makefile.library
index 7d9e99f..f3b12f7 100644
--- a/lib/Makefile.library
+++ b/lib/Makefile.library
@@ -7,18 +7,18 @@ uninstall-shlibs::
real-subdirs::
subdirs:: Makefile
- @$(MAKE) -s real-subdirs
- @touch subdirs
+ $(Q) $(MAKE) -s real-subdirs
+ $(Q) touch subdirs
clean::
- @$(RM) -f subdirs
+ $(Q) $(RM) -f subdirs
$(LIBRARY).a: $(OBJS)
- @echo " GEN_LIB $@"
- @(if test -r $@; then $(RM) -f $@.bak && $(MV) $@ $@.bak; fi)
- @$(ARGEN) $@ $(OBJS)
+ $(E) " GEN_LIB $@"
+ $(Q) (if test -r $@; then $(RM) -f $@.bak && $(MV) $@ $@.bak; fi)
+ $(Q) $(ARGEN) $@ $(OBJS)
-@$(RANLIB) $@
- @$(RM) -f ../$@
- @$(LN) $@ ../$@
+ $(Q) $(RM) -f ../$@
+ $(Q) $(LN) $@ ../$@
$(LIB)/$(LIBRARY).a: $(LIBRARY).a
diff --git a/lib/Makefile.profile b/lib/Makefile.profile
index a2e77c6..1e07b35 100644
--- a/lib/Makefile.profile
+++ b/lib/Makefile.profile
@@ -1,26 +1,26 @@
all:: $(LIBRARY)_p.a
real-subdirs:: Makefile
- @echo " MKDIR profiled"
- @mkdir -p profiled
+ $(E) " MKDIR profiled"
+ $(Q) mkdir -p profiled
clean::
$(RM) -rf profiled
$(RM) -f $(LIBRARY)_p.a ../$(LIBRARY)_p.a
$(LIBRARY)_p.a: $(OBJS)
- @echo " GEN_PROFILED_LIB $(ELF_LIB)"
- @(if test -r $@; then $(RM) -f $@.bak && $(MV) $@ $@.bak; fi)
- @(cd profiled; $(ARUPD) ../$@ $(OBJS))
- -@$(RANLIB) $@
- @$(RM) -f ../$@
- @$(LN) $@ ../$@
+ $(E) " GEN_PROFILED_LIB $(ELF_LIB)"
+ $(Q) (if test -r $@; then $(RM) -f $@.bak && $(MV) $@ $@.bak; fi)
+ $(Q) (cd profiled; $(ARUPD) ../$@ $(OBJS))
+ -$(Q) $(RANLIB) $@
+ $(Q) $(RM) -f ../$@
+ $(Q) $(LN) $@ ../$@
install:: $(LIBRARY)_p.a installdirs
- @echo " INSTALL_DATA $(libdir)/$(LIBRARY)_p.a"
- @$(INSTALL_DATA) $(LIBRARY)_p.a $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
- @-$(RANLIB) $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
+ $(E) " INSTALL_DATA $(libdir)/$(LIBRARY)_p.a"
+ $(Q) $(INSTALL_DATA) $(LIBRARY)_p.a $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
+ -$(Q) $(RANLIB) $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
+ $(Q) $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
uninstall::
$(RM) -f $(DESTDIR)$(libdir)/$(LIBRARY)_p.a
diff --git a/lib/Makefile.solaris-lib b/lib/Makefile.solaris-lib
index fcadfa3..f90d714 100644
--- a/lib/Makefile.solaris-lib
+++ b/lib/Makefile.solaris-lib
@@ -14,8 +14,8 @@
all:: image
real-subdirs:: Makefile
- @echo " MKDIR elfshared"
- @mkdir -p elfshared
+ $(E) " MKDIR elfshared"
+ $(Q) mkdir -p elfshared
ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION)
ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
@@ -23,14 +23,14 @@ ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
image: $(ELF_LIB)
$(ELF_LIB): $(OBJS)
- @echo " GEN_ELF_SOLIB $(ELF_LIB)"
- @(cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
+ $(E) " GEN_ELF_SOLIB $(ELF_LIB)"
+ $(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
-Wl,-h,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
- @$(MV) elfshared/$(ELF_LIB) .
- @$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
- @$(LN) $(ELF_LIB) ../$(ELF_LIB)
- @$(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so
- @$(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
+ $(Q) $(MV) elfshared/$(ELF_LIB) .
+ $(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
+ $(Q) $(LN) $(ELF_LIB) ../$(ELF_LIB)
+ $(Q) $(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so
+ $(Q) $(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
installdirs-elf-lib::
$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in
index 51d0c2a..e89318e 100644
--- a/lib/blkid/Makefile.in
+++ b/lib/blkid/Makefile.in
@@ -26,8 +26,7 @@ SRCS= $(srcdir)/cache.c $(srcdir)/dev.c $(srcdir)/devname.c $(srcdir)/devno.c \
$(srcdir)/read.c $(srcdir)/resolve.c $(srcdir)/save.c $(srcdir)/tag.c \
$(srcdir)/version.c
-HFILES= blkid.h
-HFILES_IN= blkid_types.h
+HFILES_IN= blkid.h blkid_types.h
LIBRARY= libblkid
LIBDIR= blkid
@@ -54,83 +53,87 @@ LIBS_BLKID= $(STATIC_LIBBLKID) $(STATIC_LIBUUID)
DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID)
.c.o:
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
- at PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
- at CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
- at ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
- at BSDLIB_CMT@ @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
+ $(E) " CC $<"
+ $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
+ at PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
+ at CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
+ at ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
+ at BSDLIB_CMT@ $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
all:: $(SMANPAGES) blkid.pc
-$(top_builddir)/lib/blkid/blkid_types.h: $(srcdir)/blkid_types.h.in $(top_builddir)/config.status
- @echo " CONFIG.STATUS $@"
- @cd $(top_builddir); \
+blkid_types.h: $(srcdir)/blkid_types.h.in $(top_builddir)/config.status
+ $(E) " CONFIG.STATUS $@"
+ $(Q) cd $(top_builddir); \
CONFIG_FILES=$(my_dir)/blkid_types.h ./config.status
+blkid.h: $(srcdir)/blkid.h.in
+ $(E) " CP $@"
+ $(Q) cp $(srcdir)/blkid.h.in blkid.h
+
libblkid.3: $(DEP_SUBSTITUTE) $(srcdir)/libblkid.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/libblkid.3.in libblkid.3
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/libblkid.3.in libblkid.3
tst_cache: $(srcdir)/cache.c $(DEPLIBS_BLKID)
- @echo " LD $@"
- @$(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS)
tst_dev: $(srcdir)/dev.c $(DEPLIBS_BLKID)
- @echo " LD $@"
- @$(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS)
tst_devname: $(srcdir)/devname.c $(DEPLIBS_BLKID)
- @echo " LD $@"
- @$(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS)
tst_devno: $(srcdir)/devno.c $(DEPLIBS_BLKID)
- @echo " LD $@"
- @$(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS)
tst_getsize: $(srcdir)/getsize.c $(DEPLIBS_BLKID)
- @echo " LD $@"
- @$(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS)
tst_probe: $(srcdir)/probe.c $(DEPLIBS_BLKID)
- @echo " LD $@"
- @$(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS)
tst_read: $(srcdir)/read.c $(DEPLIBS_BLKID)
- @echo " LD $@"
- @$(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS)
tst_resolve: $(srcdir)/resolve.c $(DEPLIBS_BLKID)
- @echo " LD $@"
- @$(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS)
tst_save: $(srcdir)/save.c $(DEPLIBS_BLKID)
- @echo " LD $@"
- @$(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS)
tst_tag: $(srcdir)/tag.c $(DEPLIBS_BLKID)
- @echo " LD $@"
- @$(CC) -o tst_tag -DTEST_PROGRAM $(srcdir)/tag.c $(LIBS_BLKID) $(ALL_CFLAGS)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_tag -DTEST_PROGRAM $(srcdir)/tag.c $(LIBS_BLKID) $(ALL_CFLAGS)
tst_types: tst_types.o blkid_types.h
- @echo " LD $@"
- @$(CC) -o tst_types tst_types.o
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_types tst_types.o
../../misc/blkid.o: $(top_srcdir)/misc/blkid.c blkid.h
- @echo " CC $@"
- @$(CC) $(ALL_CFLAGS) -c $(top_srcdir)/misc/blkid.c \
+ $(E) " CC $@"
+ $(Q) $(CC) $(ALL_CFLAGS) -c $(top_srcdir)/misc/blkid.c \
-o ../../misc/blkid.o
blkid: ../../misc/blkid.o libblkid.a $(DEPLIBUUID)
- @echo " LD $@"
- @$(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID)
+ $(E) " LD $@"
+ $(Q) $(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID)
test_probe: test_probe.in Makefile
- @echo "Creating test_probe..."
- @echo "#!/bin/sh" > test_probe
- @echo "SRCDIR=@srcdir@" >> test_probe
- @cat $(srcdir)/test_probe.in >> test_probe
- @chmod +x test_probe
+ $(E) "Creating test_probe..."
+ $(E) "#!/bin/sh" > test_probe
+ $(E) "SRCDIR=@srcdir@" >> test_probe
+ $(Q) cat $(srcdir)/test_probe.in >> test_probe
+ $(Q) chmod +x test_probe
check:: all tst_cache tst_dev tst_devname tst_devno tst_getsize tst_probe \
tst_read tst_resolve tst_save tst_tag test_probe tst_types
@@ -138,33 +141,29 @@ check:: all tst_cache tst_dev tst_devname tst_devno tst_getsize tst_probe \
./tst_types
blkid.pc: $(srcdir)/blkid.pc.in $(top_builddir)/config.status
- @echo " CONFIG.STATUS $@"
- @cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
+ $(E) " CONFIG.STATUS $@"
+ $(Q) cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
installdirs::
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/blkid"
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(E) " MKINSTALLDIRS $(libdir) $(includedir)/blkid"
+ $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig
install:: all installdirs
- @echo " INSTALL_DATA $(libdir)/libblkid.a"
- @$(INSTALL_DATA) libblkid.a $(DESTDIR)$(libdir)/libblkid.a
- @-$(RANLIB) $(DESTDIR)$(libdir)/libblkid.a
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libblkid.a
- @set -e; for i in $(HFILES); do \
- echo " INSTALL_DATA $(includedir)/blkid/$$i"; \
- $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/blkid/$$i; \
- done
- @set -e; for i in $(HFILES_IN); do \
+ $(E) " INSTALL_DATA $(libdir)/libblkid.a"
+ $(Q) $(INSTALL_DATA) libblkid.a $(DESTDIR)$(libdir)/libblkid.a
+ -$(Q) $(RANLIB) $(DESTDIR)$(libdir)/libblkid.a
+ $(Q) $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libblkid.a
+ $(Q) set -e; for i in $(HFILES_IN); do \
echo " INSTALL_DATA $(includedir)/blkid/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/blkid/$$i; \
done
- @for i in $(SMANPAGES); do \
+ $(Q) for i in $(SMANPAGES); do \
echo " INSTALL_DATA $(man3dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$i; \
done
- @echo " INSTALL_DATA $(libdir)/pkgconfig/blkid.pc"
- @$(INSTALL_DATA) blkid.pc $(DESTDIR)$(libdir)/pkgconfig/blkid.pc
+ $(E) " INSTALL_DATA $(libdir)/pkgconfig/blkid.pc"
+ $(Q) $(INSTALL_DATA) blkid.pc $(DESTDIR)$(libdir)/pkgconfig/blkid.pc
uninstall::
$(RM) -f $(DESTDIR)$(libdir)/libblkid.a \
@@ -179,45 +178,32 @@ clean::
tst_devno tst_getsize tst_probe tst_read tst_resolve tst_save \
tst_tag tst_types tests/*.out tests/*.ok \
tests/*.img results test_probe core profiled/* \
- checker/* blkid_types.h ../libblkid.a ../libblkid_p.a \
+ checker/* blkid.h blkid_types.h ../libblkid.a ../libblkid_p.a \
$(SMANPAGES) blkid
- -rmdir tests
+ @echo rmdir tests/tmp tests
+ @(rmdir tests/tmp tests 2> /dev/null ; exit 0)
mostlyclean:: clean
distclean:: clean
$(RM) -f .depend Makefile blkid.pc \
$(srcdir)/TAGS $(srcdir)/Makefile.in.old
-$(OBJS): subdirs
+$(OBJS): subdirs $(HFILES_IN)
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
# the Makefile.in file
#
-cache.o: $(srcdir)/cache.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \
- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h
-dev.o: $(srcdir)/dev.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \
- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h
-devname.o: $(srcdir)/devname.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \
- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h
-devno.o: $(srcdir)/devno.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \
- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h
-getsize.o: $(srcdir)/getsize.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \
- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h
-llseek.o: $(srcdir)/llseek.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \
- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h
-probe.o: $(srcdir)/probe.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \
- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h \
- $(top_srcdir)/lib/uuid/uuid.h $(srcdir)/probe.h
-read.o: $(srcdir)/read.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \
- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h \
- $(top_srcdir)/lib/uuid/uuid.h
-resolve.o: $(srcdir)/resolve.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \
- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h
-save.o: $(srcdir)/save.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \
- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h
-tag.o: $(srcdir)/tag.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \
- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h
-version.o: $(srcdir)/version.c $(srcdir)/blkid.h \
- $(top_builddir)/lib/blkid/blkid_types.h $(top_srcdir)/version.h
+cache.o: $(srcdir)/cache.c $(srcdir)/list.h
+dev.o: $(srcdir)/dev.c $(srcdir)/list.h
+devname.o: $(srcdir)/devname.c $(srcdir)/list.h
+devno.o: $(srcdir)/devno.c $(srcdir)/list.h
+getsize.o: $(srcdir)/getsize.c $(srcdir)/list.h
+llseek.o: $(srcdir)/llseek.c $(srcdir)/list.h
+probe.o: $(srcdir)/probe.c $(srcdir)/list.h $(srcdir)/probe.h
+read.o: $(srcdir)/read.c $(srcdir)/list.h
+resolve.o: $(srcdir)/resolve.c $(srcdir)/list.h
+save.o: $(srcdir)/save.c $(srcdir)/list.h
+tag.o: $(srcdir)/tag.c $(srcdir)/list.h
+version.o: $(srcdir)/version.c $(top_srcdir)/version.h
diff --git a/lib/blkid/blkid.h b/lib/blkid/blkid.h.in
similarity index 100%
rename from lib/blkid/blkid.h
rename to lib/blkid/blkid.h.in
diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c
index 8f6cfa6..6b75732 100644
--- a/lib/blkid/probe.c
+++ b/lib/blkid/probe.c
@@ -208,8 +208,8 @@ static int check_for_modules(const char *fs_name)
#ifdef __linux__
struct utsname uts;
FILE *f;
- char buf[1024], *cp, *t;
- int i;
+ char buf[1024], *cp;
+ int namesz;
if (uname(&uts))
return (0);
@@ -218,6 +218,9 @@ static int check_for_modules(const char *fs_name)
f = fopen(buf, "r");
if (!f)
return (0);
+
+ namesz = strlen(fs_name);
+
while (!feof(f)) {
if (!fgets(buf, sizeof(buf), f))
break;
@@ -229,13 +232,9 @@ static int check_for_modules(const char *fs_name)
cp++;
else
cp = buf;
- i = strlen(cp);
- if (i > 3) {
- t = cp + i - 3;
- if (!strcmp(t, ".ko"))
- *t = 0;
- }
- if (!strcmp(cp, fs_name)) {
+ if (!strncmp(cp, fs_name, namesz) &&
+ (!strcmp(cp + namesz, ".ko") ||
+ !strcmp(cp + namesz, ".ko.gz"))) {
fclose(f);
return (1);
}
diff --git a/lib/blkid/version.c b/lib/blkid/version.c
index 7722916..c9754fa 100644
--- a/lib/blkid/version.c
+++ b/lib/blkid/version.c
@@ -16,7 +16,7 @@
#include <stdio.h>
#include <ctype.h>
-#include "blkid.h"
+#include <blkid/blkid.h>
#include "../../version.h"
static const char *lib_version = E2FSPROGS_VERSION;
diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in
index c1a45f5..9775a98 100644
--- a/lib/e2p/Makefile.in
+++ b/lib/e2p/Makefile.in
@@ -53,25 +53,25 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
@MAKEFILE_CHECKER@
.c.o:
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
- at PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
- at CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
- at ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
- at BSDLIB_CMT@ @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
+ $(E) " CC $<"
+ $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
+ at PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
+ at CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
+ at ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
+ at BSDLIB_CMT@ $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
e2p.pc: $(srcdir)/e2p.pc.in $(top_builddir)/config.status
- @echo " CONFIG.STATUS $@"
- @cd $(top_builddir); CONFIG_FILES=lib/e2p/e2p.pc ./config.status
+ $(E) " CONFIG.STATUS $@"
+ $(Q) cd $(top_builddir); CONFIG_FILES=lib/e2p/e2p.pc ./config.status
tst_ostype: $(srcdir)/ostype.c
- @echo " LD $@"
- @$(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_ostype \
+ $(E) " LD $@"
+ $(Q) $(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_ostype \
$(srcdir)/ostype.c $(ALL_CFLAGS)
tst_feature: $(srcdir)/feature.c
- @echo " LD $@"
- @$(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_feature \
+ $(E) " LD $@"
+ $(Q) $(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_feature \
$(srcdir)/feature.c $(ALL_CFLAGS)
check:: tst_ostype tst_feature
@@ -79,21 +79,21 @@ check:: tst_ostype tst_feature
./tst_feature
installdirs::
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/e2p"
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(E) " MKINSTALLDIRS $(libdir) $(includedir)/e2p"
+ $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/e2p $(DESTDIR)$(libdir)/pkgconfig
install:: all installdirs
- @echo " INSTALL_DATA $(libdir)/libe2p.a"
- @$(INSTALL_DATA) libe2p.a $(DESTDIR)$(libdir)/libe2p.a
- @-$(RANLIB) $(DESTDIR)$(libdir)/libe2p.a
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libe2p.a
- @set -e; for i in $(HFILES); do \
+ $(E) " INSTALL_DATA $(libdir)/libe2p.a"
+ $(Q) $(INSTALL_DATA) libe2p.a $(DESTDIR)$(libdir)/libe2p.a
+ -$(Q) $(RANLIB) $(DESTDIR)$(libdir)/libe2p.a
+ $(Q) $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libe2p.a
+ $(Q) set -e; for i in $(HFILES); do \
echo " INSTALL_DATA $(includedir)/e2p/$$i"; \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/e2p/$$i; \
done
- @echo " INSTALL_DATA $(libdir)/pkgconfig/e2p.pc"
- @$(INSTALL_DATA) e2p.pc $(DESTDIR)$(libdir)/pkgconfig/e2p.pc
+ $(E) " INSTALL_DATA $(libdir)/pkgconfig/e2p.pc"
+ $(Q) $(INSTALL_DATA) e2p.pc $(DESTDIR)$(libdir)/pkgconfig/e2p.pc
uninstall::
$(RM) -f $(DESTDIR)$(libdir)/libe2p.a \
diff --git a/lib/et/Makefile.in b/lib/et/Makefile.in
index 2a5f780..a7e273c 100644
--- a/lib/et/Makefile.in
+++ b/lib/et/Makefile.in
@@ -41,12 +41,12 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
# what to build...
#
.c.o:
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
- at PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
- at CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
- at ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
- at BSDLIB_CMT@ @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
+ $(E) " CC $<"
+ $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
+ at PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
+ at CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
+ at ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
+ at BSDLIB_CMT@ $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
@MAKEFILE_LIBRARY@
@MAKEFILE_ELF@
@@ -55,16 +55,23 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
@MAKEFILE_CHECKER@
compile_et: $(DEP_SUBSTITUTE) $(srcdir)/compile_et.sh.in
- @echo " SUBST $@"
- @$(SUBSTITUTE) $(srcdir)/compile_et.sh.in compile_et
- @$(CHMOD) +x compile_et
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE) $(srcdir)/compile_et.sh.in compile_et
+ $(Q) $(CHMOD) +x compile_et
com_err.ps : com_err.dvi
com_err.dvi: com_err.texinfo
+com_err_abt.html: $(srcdir)/com_err.texinfo
+ $(E) " TEXI2HTML $@"
+ -$(Q) texi2html -split_chapter $(srcdir)/com_err.texinfo
+ -$(Q) if test -d com_err ; then \
+ mv com_err/* . ; rmdir com_err ; \
+ fi
+
com_err.pc: $(srcdir)/com_err.pc.in $(top_builddir)/config.status
- @echo " CONFIG.STATUS $@"
- @cd $(top_builddir); CONFIG_FILES=lib/et/com_err.pc ./config.status
+ $(E) " CONFIG.STATUS $@"
+ $(Q) cd $(top_builddir); CONFIG_FILES=lib/et/com_err.pc ./config.status
#libcom_err.o: $(LIBOBJS)
# $(LD) -r -s -o libcom_err.o $(LIBOBJS)
@@ -74,34 +81,34 @@ TAGS: $(SRCS)
$(TAGS) $(SRCS)
installdirs::
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(E) " MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
+ $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \
$(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \
$(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig
install:: compile_et libcom_err.a $(HFILES) installdirs com_err.pc
- @echo " INSTALL_DATA $(libdir)/libcom_err.a"
- @$(INSTALL_DATA) libcom_err.a $(DESTDIR)$(libdir)/libcom_err.a
- @-$(RANLIB) $(DESTDIR)$(libdir)/libcom_err.a
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libcom_err.a
- @for i in $(HFILES); do \
+ $(E) " INSTALL_DATA $(libdir)/libcom_err.a"
+ $(Q) $(INSTALL_DATA) libcom_err.a $(DESTDIR)$(libdir)/libcom_err.a
+ -$(Q) $(RANLIB) $(DESTDIR)$(libdir)/libcom_err.a
+ $(Q) $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libcom_err.a
+ $(Q) for i in $(HFILES); do \
echo " INSTALL_DATA $(includedir)/et/$$i"; \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/et/$$i; \
done
- @for i in $(SHARE_FILES); do \
+ $(Q) for i in $(SHARE_FILES); do \
echo " INSTALL_DATA $(datadir)/et/$$i"; \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/et/$$i; \
done
- @echo " INSTALL_SCRIPT $(bindir)/compile_et"
- @$(INSTALL_SCRIPT) compile_et $(DESTDIR)$(bindir)/compile_et
- @echo " INSTALL_DATA $(man3dir)/com_err.3"
- @$(INSTALL_DATA) $(srcdir)/com_err.3 $(DESTDIR)$(man3dir)/com_err.3
- @echo " INSTALL_DATA $(man1dir)/compile_et.1"
- @$(INSTALL_DATA) $(srcdir)/compile_et.1 \
+ $(E) " INSTALL_SCRIPT $(bindir)/compile_et"
+ $(Q) $(INSTALL_SCRIPT) compile_et $(DESTDIR)$(bindir)/compile_et
+ $(E) " INSTALL_DATA $(man3dir)/com_err.3"
+ $(Q) $(INSTALL_DATA) $(srcdir)/com_err.3 $(DESTDIR)$(man3dir)/com_err.3
+ $(E) " INSTALL_DATA $(man1dir)/compile_et.1"
+ $(Q) $(INSTALL_DATA) $(srcdir)/compile_et.1 \
$(DESTDIR)$(man1dir)/compile_et.1
- @echo " INSTALL_DATA $(libdir)/pkgconfig/com_err.pc"
- @$(INSTALL_DATA) com_err.pc $(DESTDIR)$(libdir)/pkgconfig/com_err.pc
+ $(E) " INSTALL_DATA $(libdir)/pkgconfig/com_err.pc"
+ $(Q) $(INSTALL_DATA) com_err.pc $(DESTDIR)$(libdir)/pkgconfig/com_err.pc
uninstall::
$(RM) -f $(DESTDIR)$(libdir)/libcom_err.a \
@@ -124,7 +131,7 @@ check:: compile_et
clean::
$(RM) -f compile_et libcom_err.a libcom_err_p.a com_err.info
$(RM) -f $(OBJS) profiled/*
- $(RM) -f *~ \#* *.bak *.otl *.aux *.toc *.PS *.dvi *.ps TAGS *.ln
+ $(RM) -f *~ \#* *.bak *.otl *.aux *.toc *.PS *.dvi *.ps TAGS *.ln *.html
$(RM) -f ../libcom_err.a ../libcom_err_p.a
mostlyclean:: clean
diff --git a/lib/et/com_err.texinfo b/lib/et/com_err.texinfo
index 7a00ffe..7e6a494 100644
--- a/lib/et/com_err.texinfo
+++ b/lib/et/com_err.texinfo
@@ -537,4 +537,5 @@ for getting us started with ``discuss,'' for which this package was
originally written; and everyone I've talked into --- I mean, asked to read
this document and the ``man'' pages.
+ at contents
@bye
diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index f5df392..a350181 100644
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -7,8 +7,7 @@ INSTALL = @INSTALL@
@MCONFIG@
- at DEBUGFS_CMT@DEBUGFS_LIB_OBJS = bb_compat.o fileio.o \
- at DEBUGFS_CMT@ inode_io.o namei.o write_bb_file.o
+ at DEBUGFS_CMT@DEBUGFS_LIB_OBJS = bb_compat.o inode_io.o namei.o write_bb_file.o
MK_CMDS= _SS_DIR_OVERRIDE=../ss ../ss/mk_cmds
@@ -41,6 +40,7 @@ OBJS= $(DEBUGFS_LIB_OBJS) $(RESIZE_LIB_OBJS) $(E2IMAGE_LIB_OBJS) \
expanddir.o \
ext_attr.o \
extent.o \
+ fileio.o \
finddev.o \
flushb.o \
freefs.o \
@@ -138,7 +138,6 @@ SRCS= ext2_err.c \
$(srcdir)/tst_badblocks.c \
$(srcdir)/tst_bitops.c \
$(srcdir)/tst_byteswap.c \
- $(srcdir)/tst_csum.c \
$(srcdir)/tst_getsize.c \
$(srcdir)/tst_iscan.c \
$(srcdir)/undo_io.c \
@@ -176,149 +175,152 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
all:: ext2fs.pc
.c.o:
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
- at PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
- at CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
- at ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
- at BSDLIB_CMT@ @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
+ $(E) " CC $<"
+ $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
+ at PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
+ at CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
+ at ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
+ at BSDLIB_CMT@ $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
COMPILE_ET=../et/compile_et --build-tree
DISTFILES= Makefile *.c *.h image
ext2_err.et: $(DEP_SUBSTITUTE) $(srcdir)/ext2_err.et.in
- @echo " SUBST $@"
- @$(SUBSTITUTE) $(srcdir)/ext2_err.et.in ext2_err.et
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE) $(srcdir)/ext2_err.et.in ext2_err.et
ext2_err.c ext2_err.h: ext2_err.et
- @echo " COMPILE_ET ext2_err.et"
- @$(COMPILE_ET) ext2_err.et
+ $(E) " COMPILE_ET ext2_err.et"
+ $(Q) $(COMPILE_ET) ext2_err.et
ext2fs.pc: $(srcdir)/ext2fs.pc.in $(top_builddir)/config.status
- @echo " CONFIG.STATUS $@"
- @cd $(top_builddir); CONFIG_FILES=lib/ext2fs/ext2fs.pc ./config.status
+ $(E) " CONFIG.STATUS $@"
+ $(Q) cd $(top_builddir); CONFIG_FILES=lib/ext2fs/ext2fs.pc ./config.status
-tst_badblocks: tst_badblocks.o $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) -o tst_badblocks tst_badblocks.o $(STATIC_LIBEXT2FS) \
+tst_badblocks: tst_badblocks.o $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_badblocks tst_badblocks.o $(STATIC_LIBEXT2FS) \
$(LIBCOM_ERR)
-tst_icount: $(srcdir)/icount.c $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) -o tst_icount $(srcdir)/icount.c -DDEBUG $(ALL_CFLAGS) \
+tst_icount: $(srcdir)/icount.c $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_icount $(srcdir)/icount.c -DDEBUG $(ALL_CFLAGS) \
$(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
-tst_iscan: tst_iscan.o $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) -o tst_iscan tst_iscan.o $(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
+tst_iscan: tst_iscan.o $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_iscan tst_iscan.o $(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
-tst_getsize: tst_getsize.o $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) -o tst_getsize tst_getsize.o $(STATIC_LIBEXT2FS) \
+tst_getsize: tst_getsize.o $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_getsize tst_getsize.o $(STATIC_LIBEXT2FS) \
$(LIBCOM_ERR)
-tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR)
+tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_ismounted $(srcdir)/ismounted.c \
+ $(STATIC_LIBEXT2FS) -DDEBUG $(ALL_CFLAGS) \
+ $(LIBCOM_ERR)
-tst_byteswap: tst_byteswap.o $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) -o tst_byteswap tst_byteswap.o $(STATIC_LIBEXT2FS) \
+tst_byteswap: tst_byteswap.o $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_byteswap tst_byteswap.o $(STATIC_LIBEXT2FS) \
$(LIBCOM_ERR)
-tst_bitops: tst_bitops.o $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) -o tst_bitops tst_bitops.o $(ALL_CFLAGS) \
+tst_bitops: tst_bitops.o $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_bitops tst_bitops.o $(ALL_CFLAGS) \
$(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
-tst_getsectsize: tst_getsectsize.o $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) -o tst_sectgetsize tst_getsectsize.o \
+tst_getsectsize: tst_getsectsize.o $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_sectgetsize tst_getsectsize.o \
$(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
tst_types: tst_types.o ext2_types.h
- @echo " LD $@"
- @$(CC) -o tst_types tst_types.o
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_types tst_types.o
tst_super_size: tst_super_size.o ext2_fs.h
- @echo " LD $@"
- @$(CC) -o tst_super_size tst_super_size.o
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_super_size tst_super_size.o
ext2_tdbtool: tdbtool.o
- @echo " LD $@"
- @$(CC) -o ext2_tdbtool tdbtool.o tdb.o
+ $(E) " LD $@"
+ $(Q) $(CC) -o ext2_tdbtool tdbtool.o tdb.o
extent_dbg.c: $(srcdir)/extent_dbg.ct
- @echo " MK_CMDS $<"
- @$(MK_CMDS) $(srcdir)/extent_dbg.ct
+ $(E) " MK_CMDS $<"
+ $(Q) $(MK_CMDS) $(srcdir)/extent_dbg.ct
debug_cmds.c debug_cmds.h: $(top_srcdir)/debugfs/debug_cmds.ct
- @echo " MK_CMDS $<@"
- @$(MK_CMDS) $(top_srcdir)/debugfs/debug_cmds.ct
+ $(E) " MK_CMDS $<@"
+ $(Q) $(MK_CMDS) $(top_srcdir)/debugfs/debug_cmds.ct
DEBUG_OBJS= debug_cmds.o debugfs.o util.o ncheck.o icheck.o ls.o \
lsdel.o dump.o set_fields.o logdump.o htree.o unused.o
debugfs.o: $(top_srcdir)/debugfs/debugfs.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(E) " CC $<"
+ $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
util.o: $(top_srcdir)/debugfs/util.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(E) " CC $<"
+ $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
ncheck.o: $(top_srcdir)/debugfs/ncheck.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(E) " CC $<"
+ $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
icheck.o: $(top_srcdir)/debugfs/icheck.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(E) " CC $<"
+ $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
ls.o: $(top_srcdir)/debugfs/ls.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(E) " CC $<"
+ $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
lsdel.o: $(top_srcdir)/debugfs/lsdel.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(E) " CC $<"
+ $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
dump.o: $(top_srcdir)/debugfs/dump.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(E) " CC $<"
+ $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
set_fields.o: $(top_srcdir)/debugfs/set_fields.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(E) " CC $<"
+ $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
logdump.o: $(top_srcdir)/debugfs/logdump.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(E) " CC $<"
+ $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
htree.o: $(top_srcdir)/debugfs/htree.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(E) " CC $<"
+ $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
unused.o: $(top_srcdir)/debugfs/unused.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(E) " CC $<"
+ $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
-tst_extents: $(srcdir)/extent.c extent_dbg.c $(DEBUG_OBJS) $(DEPLIBSS) $(LIBE2P) $(DEPLIBUUID) $(DEPLIBBLKID)
- @echo " LD $@"
- @$(CC) -o tst_extents $(srcdir)/extent.c extent_dbg.c \
+tst_extents: $(srcdir)/extent.c extent_dbg.c $(DEBUG_OBJS) $(DEPLIBSS) \
+ $(LIBE2P) $(DEPLIBUUID) $(DEPLIBBLKID) $(DEPLIBCOM_ERR)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_extents $(srcdir)/extent.c extent_dbg.c \
$(ALL_CFLAGS) -DDEBUG $(DEBUG_OBJS) $(LIBSS) $(LIBE2P) \
$(STATIC_LIBEXT2FS) $(LIBBLKID) $(LIBUUID) $(LIBCOM_ERR) \
-I $(top_srcdir)/debugfs
-tst_csum: csum.c $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) -o tst_csum $(srcdir)/csum.c -DDEBUG \
+tst_csum: csum.c $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
+ $(E) " LD $@"
+ $(Q) $(CC) -o tst_csum $(srcdir)/csum.c -DDEBUG \
$(ALL_CFLAGS) $(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
-mkjournal: mkjournal.c $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS)
+mkjournal: mkjournal.c $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
+ $(E) " LD $@"
+ $(Q) $(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS)
check:: tst_bitops tst_badblocks tst_iscan tst_types tst_icount tst_super_size tst_types tst_csum
LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_bitops
@@ -330,25 +332,25 @@ check:: tst_bitops tst_badblocks tst_iscan tst_types tst_icount tst_super_size t
LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_csum
installdirs::
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/ext2fs"
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(E) " MKINSTALLDIRS $(libdir) $(includedir)/ext2fs"
+ $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/ext2fs $(DESTDIR)$(libdir)/pkgconfig
install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc
- @echo " INSTALL_DATA $(libdir)/libext2fs.a"
- @$(INSTALL_DATA) libext2fs.a $(DESTDIR)$(libdir)/libext2fs.a
- @-$(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libext2fs.a
- @for i in $(HFILES); do \
+ $(E) " INSTALL_DATA $(libdir)/libext2fs.a"
+ $(Q) $(INSTALL_DATA) libext2fs.a $(DESTDIR)$(libdir)/libext2fs.a
+ -$(Q) $(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a
+ $(Q) $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libext2fs.a
+ $(Q) for i in $(HFILES); do \
echo " INSTALL_DATA $(includedir)/ext2fs/$$i"; \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/ext2fs/$$i; \
done
- @for i in $(HFILES_IN); do \
+ $(Q) for i in $(HFILES_IN); do \
echo " INSTALL_DATA $(includedir)/ext2fs/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/ext2fs/$$i; \
done
- @echo " INSTALL_DATA $(libdir)/pkgconfig/ext2fs.pc"
- @$(INSTALL_DATA) ext2fs.pc $(DESTDIR)$(libdir)/pkgconfig/ext2fs.pc
+ $(E) " INSTALL_DATA $(libdir)/pkgconfig/ext2fs.pc"
+ $(Q) $(INSTALL_DATA) ext2fs.pc $(DESTDIR)$(libdir)/pkgconfig/ext2fs.pc
uninstall::
$(RM) -f $(DESTDIR)$(libdir)/libext2fs.a \
diff --git a/lib/ext2fs/alloc_tables.c b/lib/ext2fs/alloc_tables.c
index 9b4c057..55e6174 100644
--- a/lib/ext2fs/alloc_tables.c
+++ b/lib/ext2fs/alloc_tables.c
@@ -178,9 +178,11 @@ errcode_t ext2fs_allocate_group_table(ext2_filsys fs, dgrp_t group,
* Allocate the inode table
*/
if (flexbg_size) {
- int prev_block = 0;
+ blk_t prev_block = 0;
if (group && fs->group_desc[group-1].bg_inode_table)
prev_block = fs->group_desc[group-1].bg_inode_table;
+ if (last_grp == fs->group_desc_count)
+ rem_grps = last_grp - group;
group_blk = flexbg_offset(fs, group, prev_block, bmap,
flexbg_size * 2,
fs->inode_blocks_per_group *
diff --git a/lib/ext2fs/bitops.h b/lib/ext2fs/bitops.h
index 1d825bb..32111ba 100644
--- a/lib/ext2fs/bitops.h
+++ b/lib/ext2fs/bitops.h
@@ -96,6 +96,8 @@ extern void ext2fs_unmark_block_bitmap_range(ext2fs_block_bitmap bitmap,
blk_t block, int num);
extern int ext2fs_test_block_bitmap_range(ext2fs_block_bitmap bitmap,
blk_t block, int num);
+extern int ext2fs_test_inode_bitmap_range(ext2fs_inode_bitmap bitmap,
+ ino_t inode, int num);
extern void ext2fs_fast_mark_block_bitmap_range(ext2fs_block_bitmap bitmap,
blk_t block, int num);
extern void ext2fs_fast_unmark_block_bitmap_range(ext2fs_block_bitmap bitmap,
diff --git a/lib/ext2fs/block.c b/lib/ext2fs/block.c
index de5342d..490116d 100644
--- a/lib/ext2fs/block.c
+++ b/lib/ext2fs/block.c
@@ -488,8 +488,10 @@ errcode_t ext2fs_block_iterate2(ext2_filsys fs,
abort_exit:
if (ret & BLOCK_CHANGED) {
retval = ext2fs_write_inode(fs, ino, &inode);
- if (retval)
- return retval;
+ if (retval) {
+ ret |= BLOCK_ERROR;
+ ctx.errcode = retval;
+ }
}
errout:
if (!block_buf)
diff --git a/lib/ext2fs/bmap.c b/lib/ext2fs/bmap.c
index 2a86439..933036b 100644
--- a/lib/ext2fs/bmap.c
+++ b/lib/ext2fs/bmap.c
@@ -214,9 +214,6 @@ errcode_t ext2fs_bmap2(ext2_filsys fs, ext2_ino_t ino, struct ext2_inode *inode,
if (block < EXT2_NDIR_BLOCKS) {
if (bmap_flags & BMAP_SET) {
b = *phys_blk;
-#ifdef WORDS_BIGENDIAN
- b = ext2fs_swab32(b);
-#endif
inode_bmap(inode, block) = b;
inode_dirty++;
goto done;
@@ -325,7 +322,7 @@ errcode_t ext2fs_bmap(ext2_filsys fs, ext2_ino_t ino, struct ext2_inode *inode,
blk_t *phys_blk)
{
errcode_t ret;
- blk64_t ret_blk;
+ blk64_t ret_blk = *phys_blk;
ret = ext2fs_bmap2(fs, ino, inode, block_buf, bmap_flags, block,
0, &ret_blk);
diff --git a/lib/ext2fs/dir_iterate.c b/lib/ext2fs/dir_iterate.c
index 1f8cf8f..0087d58 100644
--- a/lib/ext2fs/dir_iterate.c
+++ b/lib/ext2fs/dir_iterate.c
@@ -21,6 +21,41 @@
#include "ext2_fs.h"
#include "ext2fsP.h"
+#define EXT4_MAX_REC_LEN ((1<<16)-1)
+
+errcode_t ext2fs_get_rec_len(ext2_filsys fs,
+ struct ext2_dir_entry *dirent,
+ unsigned int *rec_len)
+{
+ unsigned int len = dirent->rec_len;
+
+ if (len == EXT4_MAX_REC_LEN || len == 0)
+ *rec_len = fs->blocksize;
+ else
+ *rec_len = (len & 65532) | ((len & 3) << 16);
+ return 0;
+}
+
+errcode_t ext2fs_set_rec_len(ext2_filsys fs,
+ unsigned int len,
+ struct ext2_dir_entry *dirent)
+{
+ if ((len > fs->blocksize) || (fs->blocksize > (1 << 18)) || (len & 3))
+ return EINVAL;
+ if (len < 65536) {
+ dirent->rec_len = len;
+ return 0;
+ }
+ if (len == fs->blocksize) {
+ if (fs->blocksize == 65536)
+ dirent->rec_len = EXT4_MAX_REC_LEN;
+ else
+ dirent->rec_len = 0;
+ } else
+ dirent->rec_len = (len & 65532) | ((len >> 16) & 3);
+ return 0;
+}
+
/*
* This function checks to see whether or not a potential deleted
* directory entry looks valid. What we do is check the deleted entry
@@ -29,20 +64,23 @@
* undeleted entry. Returns 1 if the deleted entry looks valid, zero
* if not valid.
*/
-static int ext2fs_validate_entry(ext2_filsys fs, char *buf, int offset,
- int final_offset)
+static int ext2fs_validate_entry(ext2_filsys fs, char *buf,
+ unsigned int offset,
+ unsigned int final_offset)
{
struct ext2_dir_entry *dirent;
- int rec_len;
+ unsigned int rec_len;
+#define DIRENT_MIN_LENGTH 12
- while (offset < final_offset) {
+ while ((offset < final_offset) &&
+ (offset <= fs->blocksize - DIRENT_MIN_LENGTH)) {
dirent = (struct ext2_dir_entry *)(buf + offset);
- rec_len = (dirent->rec_len || fs->blocksize < 65536) ?
- dirent->rec_len : 65536;
+ if (ext2fs_get_rec_len(fs, dirent, &rec_len))
+ return 0;
offset += rec_len;
if ((rec_len < 8) ||
((rec_len % 4) != 0) ||
- (((dirent->name_len & 0xFF)+8) > rec_len))
+ ((((unsigned) dirent->name_len & 0xFF)+8) > rec_len))
return 0;
}
return (offset == final_offset);
@@ -148,7 +186,8 @@ int ext2fs_process_dir_block(ext2_filsys fs,
int ret = 0;
int changed = 0;
int do_abort = 0;
- int rec_len, entry, size;
+ unsigned int rec_len, size;
+ int entry;
struct ext2_dir_entry *dirent;
if (blockcnt < 0)
@@ -162,12 +201,12 @@ int ext2fs_process_dir_block(ext2_filsys fs,
while (offset < fs->blocksize) {
dirent = (struct ext2_dir_entry *) (ctx->buf + offset);
- rec_len = (dirent->rec_len || fs->blocksize < 65536) ?
- dirent->rec_len : 65536;
+ if (ext2fs_get_rec_len(fs, dirent, &rec_len))
+ return BLOCK_ABORT;
if (((offset + rec_len) > fs->blocksize) ||
(rec_len < 8) ||
((rec_len % 4) != 0) ||
- (((dirent->name_len & 0xFF)+8) > rec_len)) {
+ ((((unsigned) dirent->name_len & 0xFF)+8) > rec_len)) {
ctx->errcode = EXT2_ET_DIR_CORRUPTED;
return BLOCK_ABORT;
}
@@ -185,8 +224,8 @@ int ext2fs_process_dir_block(ext2_filsys fs,
entry++;
if (ret & DIRENT_CHANGED) {
- rec_len = (dirent->rec_len || fs->blocksize < 65536) ?
- dirent->rec_len : 65536;
+ if (ext2fs_get_rec_len(fs, dirent, &rec_len))
+ return BLOCK_ABORT;
changed++;
}
if (ret & DIRENT_ABORT) {
diff --git a/lib/ext2fs/dirblock.c b/lib/ext2fs/dirblock.c
index 501c656..6542a81 100644
--- a/lib/ext2fs/dirblock.c
+++ b/lib/ext2fs/dirblock.c
@@ -46,8 +46,8 @@ errcode_t ext2fs_read_dir_block2(ext2_filsys fs, blk_t block,
if (flags & EXT2_DIRBLOCK_V2_STRUCT)
dirent->name_len = ext2fs_swab16(dirent->name_len);
#endif
- rec_len = (dirent->rec_len || fs->blocksize < 65536) ?
- dirent->rec_len : 65536;
+ if ((retval = ext2fs_get_rec_len(fs, dirent, &rec_len)) != 0)
+ return retval;
if ((rec_len < 8) || (rec_len % 4)) {
rec_len = 8;
retval = EXT2_ET_DIR_CORRUPTED;
@@ -72,7 +72,7 @@ errcode_t ext2fs_write_dir_block2(ext2_filsys fs, blk_t block,
errcode_t retval;
char *p, *end;
char *buf = 0;
- int rec_len;
+ unsigned int rec_len;
struct ext2_dir_entry *dirent;
retval = ext2fs_get_mem(fs->blocksize, &buf);
@@ -83,8 +83,8 @@ errcode_t ext2fs_write_dir_block2(ext2_filsys fs, blk_t block,
end = buf + fs->blocksize;
while (p < end) {
dirent = (struct ext2_dir_entry *) p;
- rec_len = (dirent->rec_len || fs->blocksize < 65536) ?
- dirent->rec_len : 65536;
+ if ((retval = ext2fs_get_rec_len(fs, dirent, &rec_len)) != 0)
+ return retval;
if ((rec_len < 8) ||
(rec_len % 4)) {
ext2fs_free_mem(&buf);
diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index 08bfa03..234fbdd 100644
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -796,6 +796,12 @@ extern errcode_t ext2fs_dirhash(int version, const char *name, int len,
/* dir_iterate.c */
+extern errcode_t ext2fs_get_rec_len(ext2_filsys fs,
+ struct ext2_dir_entry *dirent,
+ unsigned int *rec_len);
+extern errcode_t ext2fs_set_rec_len(ext2_filsys fs,
+ unsigned int len,
+ struct ext2_dir_entry *dirent);
extern errcode_t ext2fs_dir_iterate(ext2_filsys fs,
ext2_ino_t dir,
int flags,
diff --git a/lib/ext2fs/extent.c b/lib/ext2fs/extent.c
index b7eb617..1505447 100644
--- a/lib/ext2fs/extent.c
+++ b/lib/ext2fs/extent.c
@@ -104,7 +104,7 @@ static void dbg_print_extent(char *desc, struct ext2fs_extent *extent)
{
if (desc)
printf("%s: ", desc);
- printf("extent: lblk %llu--%llu, len %lu, pblk %llu, flags: ",
+ printf("extent: lblk %llu--%llu, len %u, pblk %llu, flags: ",
extent->e_lblk, extent->e_lblk + extent->e_len - 1,
extent->e_len, extent->e_pblk);
if (extent->e_flags & EXT2_EXTENT_FLAGS_LEAF)
@@ -168,7 +168,7 @@ extern void ext2fs_extent_free(ext2_extent_handle_t handle)
if (handle->inode)
ext2fs_free_mem(&handle->inode);
if (handle->path) {
- for (i=1; i < handle->max_depth; i++) {
+ for (i=1; i <= handle->max_depth; i++) {
if (handle->path[i].buf)
ext2fs_free_mem(&handle->path[i].buf);
}
@@ -321,7 +321,7 @@ retry:
return EXT2_ET_EXTENT_NO_NEXT;
}
if (op != EXT2_EXTENT_NEXT_SIB) {
-#ifdef DEBUG
+#ifdef DEBUG_GET_EXTENT
printf("<<<< OP = %s\n",
(op == EXT2_EXTENT_DOWN) ? "down" :
((op == EXT2_EXTENT_UP) ? "up" : "unknown"));
@@ -352,7 +352,7 @@ retry:
return EXT2_ET_EXTENT_NO_PREV;
}
if (op != EXT2_EXTENT_PREV_SIB) {
-#ifdef DEBUG
+#ifdef DEBUG_GET_EXTENT
printf("<<<< OP = %s\n",
(op == EXT2_EXTENT_DOWN_AND_LAST) ? "down/last" :
((op == EXT2_EXTENT_UP) ? "up" : "unknown"));
@@ -366,7 +366,7 @@ retry:
op = EXT2_EXTENT_DOWN;
else
op = EXT2_EXTENT_LAST_SIB;
-#ifdef DEBUG
+#ifdef DEBUG_GET_EXTENT
printf("<<<< OP = %s\n",
(op == EXT2_EXTENT_DOWN) ? "down" : "last_sib");
#endif
@@ -481,7 +481,7 @@ retry:
if (handle->level < handle->max_depth)
path->visit_num = 1;
}
-#ifdef DEBUG
+#ifdef DEBUG_GET_EXTENT
printf("Down to level %d/%d, end_blk=%llu\n",
handle->level, handle->max_depth,
path->end_blk);
@@ -495,7 +495,7 @@ retry:
return EXT2_ET_NO_CURRENT_NODE;
extent->e_flags = 0;
-#ifdef DEBUG
+#ifdef DEBUG_GET_EXTENT
printf("(Left %d)\n", path->left);
#endif
@@ -546,8 +546,8 @@ static errcode_t update_path(ext2_extent_handle_t handle)
struct ext3_extent_idx *ix;
if (handle->level == 0) {
- retval = ext2fs_write_inode_full(handle->fs, handle->ino,
- handle->inode, EXT2_INODE_SIZE(handle->fs->super));
+ retval = ext2fs_write_inode(handle->fs, handle->ino,
+ handle->inode);
} else {
ix = handle->path[handle->level - 1].curr;
blk = ext2fs_le32_to_cpu(ix->ei_leaf) +
@@ -628,7 +628,14 @@ static errcode_t extent_goto(ext2_extent_handle_t handle,
return EXT2_ET_OP_NOT_SUPPORTED;
}
+#ifdef DEBUG
+ printf("goto extent ino %u, level %d, %llu\n", handle->ino,
+ leaf_level, blk);
+#endif
+
+#ifdef DEBUG_GOTO_EXTENTS
dbg_print_extent("root", &extent);
+#endif
while (1) {
if (handle->max_depth - handle->level == leaf_level) {
/* block is in this &extent */
@@ -658,7 +665,9 @@ static errcode_t extent_goto(ext2_extent_handle_t handle,
if (retval)
return retval;
+#ifdef DEBUG_GOTO_EXTENTS
dbg_print_extent("next", &extent);
+#endif
if (blk == extent.e_lblk)
goto go_down;
if (blk > extent.e_lblk)
@@ -669,7 +678,9 @@ static errcode_t extent_goto(ext2_extent_handle_t handle,
if (retval)
return retval;
+#ifdef DEBUG_GOTO_EXTENTS
dbg_print_extent("prev", &extent);
+#endif
go_down:
retval = ext2fs_extent_get(handle, EXT2_EXTENT_DOWN,
@@ -677,7 +688,9 @@ static errcode_t extent_goto(ext2_extent_handle_t handle,
if (retval)
return retval;
+#ifdef DEBUG_GOTO_EXTENTS
dbg_print_extent("down", &extent);
+#endif
}
}
@@ -765,6 +778,11 @@ errcode_t ext2fs_extent_replace(ext2_extent_handle_t handle,
if (!path->curr)
return EXT2_ET_NO_CURRENT_NODE;
+#ifdef DEBUG
+ printf("extent replace: %u ", handle->ino);
+ dbg_print_extent(0, extent);
+#endif
+
if (handle->level == handle->max_depth) {
ex = path->curr;
@@ -922,7 +940,8 @@ static errcode_t extent_node_split(ext2_extent_handle_t handle)
goto done;
#ifdef DEBUG
- printf("will copy to new node at block %lu\n", new_node_pblk);
+ printf("will copy to new node at block %lu\n",
+ (unsigned long) new_node_pblk);
#endif
/* Copy data into new block buffer */
@@ -1011,8 +1030,8 @@ static errcode_t extent_node_split(ext2_extent_handle_t handle)
/* new node hooked in, so update inode block count (do this here?) */
handle->inode->i_blocks += handle->fs->blocksize / 512;
- retval = ext2fs_write_inode_full(handle->fs, handle->ino,
- handle->inode, EXT2_INODE_SIZE(handle->fs->super));
+ retval = ext2fs_write_inode(handle->fs, handle->ino,
+ handle->inode);
if (retval)
goto done;
@@ -1040,6 +1059,11 @@ errcode_t ext2fs_extent_insert(ext2_extent_handle_t handle, int flags,
if (!handle->path)
return EXT2_ET_NO_CURRENT_NODE;
+#ifdef DEBUG
+ printf("extent insert: %u ", handle->ino);
+ dbg_print_extent(0, extent);
+#endif
+
path = handle->path + handle->level;
if (path->entries >= path->max_entries) {
@@ -1122,16 +1146,24 @@ errcode_t ext2fs_extent_set_bmap(ext2_extent_handle_t handle,
int mapped = 1; /* logical is mapped? */
int orig_height;
int extent_uninit = 0;
+ int prev_uninit = 0;
+ int next_uninit = 0;
int new_uninit = 0;
int max_len = EXT_INIT_MAX_LEN;
+ int has_prev, has_next;
blk64_t orig_lblk;
struct extent_path *path;
- struct ext2fs_extent extent;
+ struct ext2fs_extent extent, next_extent, prev_extent;
struct ext2fs_extent newextent;
struct ext2_extent_info info;
EXT2_CHECK_MAGIC(handle, EXT2_ET_MAGIC_EXTENT_HANDLE);
+#ifdef DEBUG
+ printf("set_bmap ino %u log %lld phys %lld flags %d\n",
+ handle->ino, logical, physical, flags);
+#endif
+
if (!(handle->fs->flags & EXT2_FLAG_RW))
return EXT2_ET_RO_FILSYS;
@@ -1173,7 +1205,6 @@ errcode_t ext2fs_extent_set_bmap(ext2_extent_handle_t handle,
orig_height = info.max_depth - info.curr_level;
orig_lblk = extent.e_lblk;
-again:
/* go to the logical spot we want to (re/un)map */
retval = ext2fs_extent_goto(handle, logical);
if (retval) {
@@ -1194,12 +1225,44 @@ again:
/*
* This may be the extent *before* the requested logical,
* if it's currently unmapped.
+ *
+ * Get the previous and next leaf extents, if they are present.
*/
retval = ext2fs_extent_get(handle, EXT2_EXTENT_CURRENT, &extent);
if (retval)
goto done;
if (extent.e_flags & EXT2_EXTENT_FLAGS_UNINIT)
extent_uninit = 1;
+ retval = ext2fs_extent_get(handle, EXT2_EXTENT_NEXT_LEAF, &next_extent);
+ if (retval) {
+ has_next = 0;
+ if (retval != EXT2_ET_EXTENT_NO_NEXT)
+ goto done;
+ } else {
+ dbg_print_extent("set_bmap: next_extent",
+ &next_extent);
+ has_next = 1;
+ if (next_extent.e_flags & EXT2_EXTENT_FLAGS_UNINIT)
+ next_uninit = 1;
+ }
+ retval = ext2fs_extent_goto(handle, logical);
+ if (retval && retval != EXT2_ET_EXTENT_NOT_FOUND)
+ goto done;
+ retval = ext2fs_extent_get(handle, EXT2_EXTENT_PREV_LEAF, &prev_extent);
+ if (retval) {
+ has_prev = 0;
+ if (retval != EXT2_ET_EXTENT_NO_PREV)
+ goto done;
+ } else {
+ has_prev = 1;
+ dbg_print_extent("set_bmap: prev_extent",
+ &prev_extent);
+ if (prev_extent.e_flags & EXT2_EXTENT_FLAGS_UNINIT)
+ prev_uninit = 1;
+ }
+ retval = ext2fs_extent_goto(handle, logical);
+ if (retval && retval != EXT2_ET_EXTENT_NOT_FOUND)
+ goto done;
/* check if already pointing to the requested physical */
if (mapped && (new_uninit == extent_uninit) &&
@@ -1220,6 +1283,28 @@ again:
((int) extent.e_len < max_len-1)) {
extent.e_len++;
retval = ext2fs_extent_replace(handle, 0, &extent);
+ } else if ((logical == extent.e_lblk - 1) &&
+ (physical == extent.e_pblk - 1) &&
+ (new_uninit == extent_uninit) &&
+ ((int) extent.e_len < max_len - 1)) {
+ extent.e_len++;
+ extent.e_lblk--;
+ extent.e_pblk--;
+ retval = ext2fs_extent_replace(handle, 0, &extent);
+ } else if (has_next &&
+ (logical == next_extent.e_lblk - 1) &&
+ (physical == next_extent.e_pblk - 1) &&
+ (new_uninit == next_uninit) &&
+ ((int) next_extent.e_len < max_len - 1)) {
+ retval = ext2fs_extent_get(handle,
+ EXT2_EXTENT_NEXT_LEAF,
+ &next_extent);
+ if (retval)
+ goto done;
+ next_extent.e_len++;
+ next_extent.e_lblk--;
+ next_extent.e_pblk--;
+ retval = ext2fs_extent_replace(handle, 0, &next_extent);
} else if (logical < extent.e_lblk)
retval = ext2fs_extent_insert(handle, 0, &newextent);
else
@@ -1251,10 +1336,32 @@ again:
#ifdef DEBUG
printf("(re/un)mapping last block in extent\n");
#endif
- /* Make sure insert works before replacing old extent */
if (physical) {
- retval = ext2fs_extent_insert(handle,
- EXT2_EXTENT_INSERT_AFTER, &newextent);
+ if (has_next &&
+ (logical == (next_extent.e_lblk - 1)) &&
+ (physical == (next_extent.e_pblk - 1)) &&
+ (new_uninit == next_uninit) &&
+ ((int) next_extent.e_len < max_len - 1)) {
+ retval = ext2fs_extent_get(handle,
+ EXT2_EXTENT_NEXT_LEAF, &next_extent);
+ if (retval)
+ goto done;
+ next_extent.e_len++;
+ next_extent.e_lblk--;
+ next_extent.e_pblk--;
+ retval = ext2fs_extent_replace(handle, 0,
+ &next_extent);
+ if (retval)
+ goto done;
+ } else
+ retval = ext2fs_extent_insert(handle,
+ EXT2_EXTENT_INSERT_AFTER, &newextent);
+ if (retval)
+ goto done;
+ /* Now pointing at inserted extent; move back to prev */
+ retval = ext2fs_extent_get(handle,
+ EXT2_EXTENT_PREV_LEAF,
+ &extent);
if (retval)
goto done;
}
@@ -1266,24 +1373,38 @@ again:
#ifdef DEBUG
printf("(re/un)mapping first block in extent\n");
#endif
+ if (physical) {
+ if (has_prev &&
+ (logical == (prev_extent.e_lblk +
+ prev_extent.e_len)) &&
+ (physical == (prev_extent.e_pblk +
+ prev_extent.e_len)) &&
+ (new_uninit == prev_uninit) &&
+ ((int) prev_extent.e_len < max_len-1)) {
+ retval = ext2fs_extent_get(handle,
+ EXT2_EXTENT_PREV_LEAF, &prev_extent);
+ if (retval)
+ goto done;
+ prev_extent.e_len++;
+ retval = ext2fs_extent_replace(handle, 0,
+ &prev_extent);
+ } else
+ retval = ext2fs_extent_insert(handle,
+ 0, &newextent);
+ if (retval)
+ goto done;
+ retval = ext2fs_extent_get(handle,
+ EXT2_EXTENT_NEXT_LEAF,
+ &extent);
+ if (retval)
+ goto done;
+ }
extent.e_pblk++;
extent.e_lblk++;
extent.e_len--;
retval = ext2fs_extent_replace(handle, 0, &extent);
if (retval)
goto done;
- if (physical) {
- /*
- * We've removed the old block, now rely on
- * the optimized hueristics for adding a new
- * mapping with appropriate merging if necessary.
- */
- goto again;
- } else {
- retval = ext2fs_extent_fix_parents(handle);
- if (retval)
- goto done;
- }
} else {
__u32 orig_length;
@@ -1340,6 +1461,19 @@ errcode_t ext2fs_extent_delete(ext2_extent_handle_t handle, int flags)
if (!handle->path)
return EXT2_ET_NO_CURRENT_NODE;
+#ifdef DEBUG
+ {
+ struct ext2fs_extent extent;
+
+ retval = ext2fs_extent_get(handle, EXT2_EXTENT_CURRENT,
+ &extent);
+ if (retval == 0) {
+ printf("extent delete %u ", handle->ino);
+ dbg_print_extent(0, &extent);
+ }
+ }
+#endif
+
path = handle->path + handle->level;
if (!path->curr)
return EXT2_ET_NO_CURRENT_NODE;
@@ -1370,9 +1504,8 @@ errcode_t ext2fs_extent_delete(ext2_extent_handle_t handle, int flags)
retval = ext2fs_extent_delete(handle, flags);
handle->inode->i_blocks -= handle->fs->blocksize / 512;
- retval = ext2fs_write_inode_full(handle->fs,
- handle->ino, handle->inode,
- EXT2_INODE_SIZE(handle->fs->super));
+ retval = ext2fs_write_inode(handle->fs, handle->ino,
+ handle->inode);
ext2fs_block_alloc_stats(handle->fs, extent.e_pblk, -1);
}
} else {
@@ -1863,7 +1996,8 @@ void do_goto_block(int argc, char **argv)
retval = extent_goto(current_handle, level, (blk64_t) blk);
if (retval) {
- com_err(argv[0], retval, "while trying to go to block %lu, level %d",
+ com_err(argv[0], retval,
+ "while trying to go to block %u, level %d",
blk, level);
return;
}
diff --git a/lib/ext2fs/gen_bitmap.c b/lib/ext2fs/gen_bitmap.c
index a1b1d8f..54a39dc 100644
--- a/lib/ext2fs/gen_bitmap.c
+++ b/lib/ext2fs/gen_bitmap.c
@@ -103,6 +103,8 @@ errcode_t ext2fs_make_generic_bitmap(errcode_t magic, ext2_filsys fs,
bitmap->description = 0;
size = (size_t) (((bitmap->real_end - bitmap->start) / 8) + 1);
+ /* Round up to allow for the BT x86 instruction */
+ size = (size + 7) & ~3;
retval = ext2fs_get_mem(size, &bitmap->bitmap);
if (retval) {
ext2fs_free_mem(&bitmap->description);
@@ -327,21 +329,125 @@ errcode_t ext2fs_set_generic_bitmap_range(ext2fs_generic_bitmap bmap,
return 0;
}
+/*
+ * Compare @mem to zero buffer by 256 bytes.
+ * Return 1 if @mem is zeroed memory, otherwise return 0.
+ */
+static int mem_is_zero(const char *mem, size_t len)
+{
+ static const char zero_buf[256];
+
+ while (len >= sizeof(zero_buf)) {
+ if (memcmp(mem, zero_buf, sizeof(zero_buf)))
+ return 0;
+ len -= sizeof(zero_buf);
+ mem += sizeof(zero_buf);
+ }
+ /* Deal with leftover bytes. */
+ if (len)
+ return !memcmp(mem, zero_buf, len);
+ return 1;
+}
+
+/*
+ * Return true if all of the bits in a specified range are clear
+ */
+static int ext2fs_test_clear_generic_bitmap_range(ext2fs_generic_bitmap bitmap,
+ unsigned int start,
+ unsigned int len)
+{
+ size_t start_byte, len_byte = len >> 3;
+ unsigned int start_bit, len_bit = len % 8;
+ int first_bit = 0;
+ int last_bit = 0;
+ int mark_count = 0;
+ int mark_bit = 0;
+ int i;
+ const char *ADDR = bitmap->bitmap;
+
+ start -= bitmap->start;
+ start_byte = start >> 3;
+ start_bit = start % 8;
+
+ if (start_bit != 0) {
+ /*
+ * The compared start block number or start inode number
+ * is not the first bit in a byte.
+ */
+ mark_count = 8 - start_bit;
+ if (len < 8 - start_bit) {
+ mark_count = (int)len;
+ mark_bit = len + start_bit - 1;
+ } else
+ mark_bit = 7;
+
+ for (i = mark_count; i > 0; i--, mark_bit--)
+ first_bit |= 1 << mark_bit;
+
+ /*
+ * Compare blocks or inodes in the first byte.
+ * If there is any marked bit, this function returns 0.
+ */
+ if (first_bit & ADDR[start_byte])
+ return 0;
+ else if (len <= 8 - start_bit)
+ return 1;
+
+ start_byte++;
+ len_bit = (len - mark_count) % 8;
+ len_byte = (len - mark_count) >> 3;
+ }
+
+ /*
+ * The compared start block number or start inode number is
+ * the first bit in a byte.
+ */
+ if (len_bit != 0) {
+ /*
+ * The compared end block number or end inode number is
+ * not the last bit in a byte.
+ */
+ for (mark_bit = len_bit - 1; mark_bit >= 0; mark_bit--)
+ last_bit |= 1 << mark_bit;
+
+ /*
+ * Compare blocks or inodes in the last byte.
+ * If there is any marked bit, this function returns 0.
+ */
+ if (last_bit & ADDR[start_byte + len_byte])
+ return 0;
+ else if (len_byte == 0)
+ return 1;
+ }
+
+ /* Check whether all bytes are 0 */
+ return mem_is_zero(ADDR + start_byte, len_byte);
+}
+
int ext2fs_test_block_bitmap_range(ext2fs_block_bitmap bitmap,
blk_t block, int num)
{
- int i;
-
+ EXT2_CHECK_MAGIC(bitmap, EXT2_ET_MAGIC_BLOCK_BITMAP);
if ((block < bitmap->start) || (block+num-1 > bitmap->real_end)) {
ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_TEST,
block, bitmap->description);
return 0;
}
- for (i=0; i < num; i++) {
- if (ext2fs_fast_test_block_bitmap(bitmap, block+i))
- return 0;
+ return ext2fs_test_clear_generic_bitmap_range((ext2fs_generic_bitmap)
+ bitmap, block, num);
+}
+
+int ext2fs_test_inode_bitmap_range(ext2fs_inode_bitmap bitmap,
+ ino_t inode, int num)
+{
+ EXT2_CHECK_MAGIC(bitmap, EXT2_ET_MAGIC_INODE_BITMAP);
+ if ((inode < bitmap->start) || (inode+num-1 > bitmap->real_end)) {
+ ext2fs_warn_bitmap(EXT2_ET_BAD_INODE_TEST,
+ inode, bitmap->description);
+ return 0;
}
- return 1;
+ return ext2fs_test_clear_generic_bitmap_range((ext2fs_generic_bitmap)
+ bitmap, inode, num);
}
void ext2fs_mark_block_bitmap_range(ext2fs_block_bitmap bitmap,
diff --git a/lib/ext2fs/i_block.c b/lib/ext2fs/i_block.c
index c7e5c44..6e1b136 100644
--- a/lib/ext2fs/i_block.c
+++ b/lib/ext2fs/i_block.c
@@ -21,6 +21,7 @@
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
+#include <errno.h>
#include "ext2_fs.h"
#include "ext2fs.h"
@@ -28,48 +29,60 @@
errcode_t ext2fs_iblk_add_blocks(ext2_filsys fs, struct ext2_inode *inode,
blk64_t num_blocks)
{
- unsigned long long b;
+ unsigned long long b = inode->i_blocks;
- if ((fs->super->s_feature_ro_compat &
- EXT4_FEATURE_RO_COMPAT_HUGE_FILE) &&
- (inode->i_flags & EXT4_HUGE_FILE_FL)) {
- b = inode->i_blocks +
- (((long long) inode->osd2.linux2.l_i_blocks_hi) << 32);
- b += num_blocks;
- inode->i_blocks = b & 0xFFFFFFFF;
+ if (!(fs->super->s_feature_ro_compat &
+ EXT4_FEATURE_RO_COMPAT_HUGE_FILE) ||
+ !(inode->i_flags & EXT4_HUGE_FILE_FL))
+ num_blocks *= fs->blocksize / 512;
+
+ b += num_blocks;
+
+ if (fs->super->s_feature_ro_compat &
+ EXT4_FEATURE_RO_COMPAT_HUGE_FILE) {
+ b += ((long long) inode->osd2.linux2.l_i_blocks_hi) << 32;
inode->osd2.linux2.l_i_blocks_hi = b >> 32;
- } else
- inode->i_blocks += (fs->blocksize / 512) * num_blocks;
+ } else if (b > 0xFFFFFFFF)
+ return EOVERFLOW;
+ inode->i_blocks = b & 0xFFFFFFFF;
return 0;
}
-
errcode_t ext2fs_iblk_sub_blocks(ext2_filsys fs, struct ext2_inode *inode,
blk64_t num_blocks)
{
- unsigned long long b;
+ unsigned long long b = inode->i_blocks;
+
+ if (!(fs->super->s_feature_ro_compat &
+ EXT4_FEATURE_RO_COMPAT_HUGE_FILE) ||
+ !(inode->i_flags & EXT4_HUGE_FILE_FL))
+ num_blocks *= fs->blocksize / 512;
- if ((fs->super->s_feature_ro_compat &
- EXT4_FEATURE_RO_COMPAT_HUGE_FILE) &&
- (inode->i_flags & EXT4_HUGE_FILE_FL)) {
- b = inode->i_blocks +
- (((long long) inode->osd2.linux2.l_i_blocks_hi) << 32);
- b -= num_blocks;
- inode->i_blocks = b & 0xFFFFFFFF;
+ if (num_blocks > b)
+ return EOVERFLOW;
+
+ b -= num_blocks;
+
+ if (fs->super->s_feature_ro_compat &
+ EXT4_FEATURE_RO_COMPAT_HUGE_FILE) {
+ b += ((long long) inode->osd2.linux2.l_i_blocks_hi) << 32;
inode->osd2.linux2.l_i_blocks_hi = b >> 32;
- } else
- inode->i_blocks -= (fs->blocksize / 512) * num_blocks;
+ }
+ inode->i_blocks = b & 0xFFFFFFFF;
return 0;
}
errcode_t ext2fs_iblk_set(ext2_filsys fs, struct ext2_inode *inode, blk64_t b)
{
- if ((fs->super->s_feature_ro_compat &
- EXT4_FEATURE_RO_COMPAT_HUGE_FILE) &&
- (inode->i_flags & EXT4_HUGE_FILE_FL)) {
- inode->i_blocks = b & 0xFFFFFFFF;
+ if (!(fs->super->s_feature_ro_compat &
+ EXT4_FEATURE_RO_COMPAT_HUGE_FILE) ||
+ !(inode->i_flags & EXT4_HUGE_FILE_FL))
+ b *= fs->blocksize / 512;
+
+ inode->i_blocks = b & 0xFFFFFFFF;
+ if (fs->super->s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_HUGE_FILE)
inode->osd2.linux2.l_i_blocks_hi = b >> 32;
- } else
- inode->i_blocks = (fs->blocksize / 512) * b;
+ else if (b >> 32)
+ return EOVERFLOW;
return 0;
}
diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c
index b7f17b8..d28b6ad 100644
--- a/lib/ext2fs/ismounted.c
+++ b/lib/ext2fs/ismounted.c
@@ -253,8 +253,16 @@ static int is_swap_device(const char *file)
if (!(f = fopen("/proc/swaps", "r")))
return 0;
/* Skip the first line */
- if (fgets(buf, sizeof(buf), f))
+ if (!fgets(buf, sizeof(buf), f))
+ goto leave;
+ if (*buf && strncmp(buf, "Filename\t", 9))
+ /* Linux <=2.6.19 contained a bug in the /proc/swaps
+ * code where the header would not be displayed
+ */
+ goto valid_first_line;
+
while (fgets(buf, sizeof(buf), f)) {
+valid_first_line:
if ((cp = strchr(buf, ' ')) != NULL)
*cp = 0;
if ((cp = strchr(buf, '\t')) != NULL)
@@ -272,6 +280,8 @@ static int is_swap_device(const char *file)
}
#endif /* __GNU__ */
}
+
+leave:
fclose(f);
return ret;
}
@@ -351,6 +361,7 @@ int main(int argc, char **argv)
exit(1);
}
+ add_error_table(&et_ext2_error_table);
mntpt[0] = 0;
retval = ext2fs_check_mount_point(argv[1], &mount_flags,
mntpt, sizeof(mntpt));
diff --git a/lib/ext2fs/link.c b/lib/ext2fs/link.c
index 5ed6394..7f2cfbc 100644
--- a/lib/ext2fs/link.c
+++ b/lib/ext2fs/link.c
@@ -19,12 +19,14 @@
#include "ext2fs.h"
struct link_struct {
+ ext2_filsys fs;
const char *name;
int namelen;
ext2_ino_t inode;
int flags;
int done;
unsigned int blocksize;
+ errcode_t err;
struct ext2_super_block *sb;
};
@@ -36,13 +38,14 @@ static int link_proc(struct ext2_dir_entry *dirent,
{
struct link_struct *ls = (struct link_struct *) priv_data;
struct ext2_dir_entry *next;
- int rec_len, min_rec_len, curr_rec_len;
+ unsigned int rec_len, min_rec_len, curr_rec_len;
int ret = 0;
rec_len = EXT2_DIR_REC_LEN(ls->namelen);
- curr_rec_len = (dirent->rec_len || ls->blocksize < 65536) ?
- dirent->rec_len : 65536;
+ ls->err = ext2fs_get_rec_len(ls->fs, dirent, &curr_rec_len);
+ if (ls->err)
+ return DIRENT_ABORT;
/*
* See if the following directory entry (if any) is unused;
@@ -52,8 +55,10 @@ static int link_proc(struct ext2_dir_entry *dirent,
if ((offset + curr_rec_len < blocksize - 8) &&
(next->inode == 0) &&
(offset + curr_rec_len + next->rec_len <= blocksize)) {
- dirent->rec_len += next->rec_len;
- curr_rec_len = dirent->rec_len;
+ curr_rec_len += next->rec_len;
+ ls->err = ext2fs_set_rec_len(ls->fs, curr_rec_len, dirent);
+ if (ls->err)
+ return DIRENT_ABORT;
ret = DIRENT_CHANGED;
}
@@ -67,12 +72,16 @@ static int link_proc(struct ext2_dir_entry *dirent,
if (curr_rec_len < (min_rec_len + rec_len))
return ret;
rec_len = curr_rec_len - min_rec_len;
- dirent->rec_len = min_rec_len;
+ ls->err = ext2fs_set_rec_len(ls->fs, min_rec_len, dirent);
+ if (ls->err)
+ return DIRENT_ABORT;
next = (struct ext2_dir_entry *) (buf + offset +
dirent->rec_len);
next->inode = 0;
next->name_len = 0;
- next->rec_len = rec_len;
+ ls->err = ext2fs_set_rec_len(ls->fs, rec_len, next);
+ if (ls->err)
+ return DIRENT_ABORT;
return DIRENT_CHANGED;
}
@@ -111,6 +120,7 @@ errcode_t ext2fs_link(ext2_filsys fs, ext2_ino_t dir, const char *name,
if (!(fs->flags & EXT2_FLAG_RW))
return EXT2_ET_RO_FILSYS;
+ ls.fs = fs;
ls.name = name;
ls.namelen = name ? strlen(name) : 0;
ls.inode = ino;
@@ -118,11 +128,14 @@ errcode_t ext2fs_link(ext2_filsys fs, ext2_ino_t dir, const char *name,
ls.done = 0;
ls.sb = fs->super;
ls.blocksize = fs->blocksize;
+ ls.err = 0;
retval = ext2fs_dir_iterate(fs, dir, DIRENT_FLAG_INCLUDE_EMPTY,
0, link_proc, &ls);
if (retval)
return retval;
+ if (ls.err)
+ return ls.err;
if (!ls.done)
return EXT2_ET_DIR_NO_SPACE;
diff --git a/lib/ext2fs/mkjournal.c b/lib/ext2fs/mkjournal.c
index f5a9dba..2cf9e41 100644
--- a/lib/ext2fs/mkjournal.c
+++ b/lib/ext2fs/mkjournal.c
@@ -354,7 +354,7 @@ static errcode_t write_journal_inode(ext2_filsys fs, ext2_ino_t journal_ino,
inode.i_links_count = 1;
inode.i_mode = LINUX_S_IFREG | 0600;
- if ((retval = ext2fs_write_inode(fs, journal_ino, &inode)))
+ if ((retval = ext2fs_write_new_inode(fs, journal_ino, &inode)))
goto errout;
retval = 0;
@@ -494,21 +494,33 @@ errcode_t ext2fs_add_journal_inode(ext2_filsys fs, blk_t size, int flags)
goto errout;
/* Get inode number of the journal file */
- if (fstat(fd, &st) < 0)
+ if (fstat(fd, &st) < 0) {
+ retval = errno;
goto errout;
+ }
#if defined(HAVE_CHFLAGS) && defined(UF_NODUMP)
retval = fchflags (fd, UF_NODUMP|UF_IMMUTABLE);
#else
#if HAVE_EXT2_IOCTLS
- f = EXT2_NODUMP_FL | EXT2_IMMUTABLE_FL;
+ if (ioctl(fd, EXT2_IOC_GETFLAGS, &f) < 0) {
+ retval = errno;
+ goto errout;
+ }
+ f |= EXT2_NODUMP_FL | EXT2_IMMUTABLE_FL;
retval = ioctl(fd, EXT2_IOC_SETFLAGS, &f);
#endif
#endif
- if (retval)
+ if (retval) {
+ retval = errno;
goto errout;
+ }
- close(fd);
+ if (close(fd) < 0) {
+ retval = errno;
+ fd = -1;
+ goto errout;
+ }
journal_ino = st.st_ino;
} else {
if ((mount_flags & EXT2_MF_BUSY) &&
diff --git a/lib/ext2fs/newdir.c b/lib/ext2fs/newdir.c
index 4e7b40d..7f4266a 100644
--- a/lib/ext2fs/newdir.c
+++ b/lib/ext2fs/newdir.c
@@ -41,7 +41,10 @@ errcode_t ext2fs_new_dir_block(ext2_filsys fs, ext2_ino_t dir_ino,
return retval;
memset(buf, 0, fs->blocksize);
dir = (struct ext2_dir_entry *) buf;
- dir->rec_len = fs->blocksize;
+
+ retval = ext2fs_set_rec_len(fs, fs->blocksize, dir);
+ if (retval)
+ return retval;
if (dir_ino) {
if (fs->super->s_feature_incompat &
@@ -60,7 +63,9 @@ errcode_t ext2fs_new_dir_block(ext2_filsys fs, ext2_ino_t dir_ino,
* Set up entry for '..'
*/
dir = (struct ext2_dir_entry *) (buf + dir->rec_len);
- dir->rec_len = rec_len;
+ retval = ext2fs_set_rec_len(fs, rec_len, dir);
+ if (retval)
+ return retval;
dir->inode = parent_ino;
dir->name_len = 2 | filetype;
dir->name[0] = '.';
diff --git a/lib/ext2fs/res_gdt.c b/lib/ext2fs/res_gdt.c
index dda7c2b..62b5988 100644
--- a/lib/ext2fs/res_gdt.c
+++ b/lib/ext2fs/res_gdt.c
@@ -208,7 +208,7 @@ out_inode:
#endif
if (inode_dirty) {
inode.i_atime = inode.i_mtime = fs->now ? fs->now : time(0);
- retval2 = ext2fs_write_inode(fs, EXT2_RESIZE_INO, &inode);
+ retval2 = ext2fs_write_new_inode(fs, EXT2_RESIZE_INO, &inode);
if (!retval)
retval = retval2;
}
diff --git a/lib/ext2fs/rw_bitmaps.c b/lib/ext2fs/rw_bitmaps.c
index 341f834..56fcfd6 100644
--- a/lib/ext2fs/rw_bitmaps.c
+++ b/lib/ext2fs/rw_bitmaps.c
@@ -248,7 +248,7 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
goto cleanup;
}
} else
- memset(block_bitmap, 0xff, block_nbytes);
+ memset(block_bitmap, 0, block_nbytes);
cnt = block_nbytes << 3;
retval = ext2fs_set_block_bitmap_range(fs->block_map,
blk_itr, cnt, block_bitmap);
@@ -270,7 +270,7 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
goto cleanup;
}
} else
- memset(inode_bitmap, 0xff, inode_nbytes);
+ memset(inode_bitmap, 0, inode_nbytes);
cnt = inode_nbytes << 3;
retval = ext2fs_set_inode_bitmap_range(fs->inode_map,
ino_itr, cnt, inode_bitmap);
diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c
index 42bc01e..9964919 100644
--- a/lib/ext2fs/swapfs.c
+++ b/lib/ext2fs/swapfs.c
@@ -73,9 +73,19 @@ void ext2fs_swap_super(struct ext2_super_block * sb)
sb->s_kbytes_written = ext2fs_swab64(sb->s_kbytes_written);
for (i=0; i < 4; i++)
sb->s_hash_seed[i] = ext2fs_swab32(sb->s_hash_seed[i]);
+
+ /* if journal backup is for a valid extent-based journal... */
+ if (!ext2fs_extent_header_verify(sb->s_jnl_blocks,
+ sizeof(sb->s_jnl_blocks))) {
+ /* ... swap only the journal i_size */
+ sb->s_jnl_blocks[16] = ext2fs_swab32(sb->s_jnl_blocks[16]);
+ /* and the extent data is not swapped on read */
+ return;
+ }
+
+ /* direct/indirect journal: swap it all */
for (i=0; i < 17; i++)
sb->s_jnl_blocks[i] = ext2fs_swab32(sb->s_jnl_blocks[i]);
-
}
void ext2fs_swap_group_desc(struct ext2_group_desc *gdp)
diff --git a/lib/ext2fs/tst_badblocks.c b/lib/ext2fs/tst_badblocks.c
index 358da20..c4744b3 100644
--- a/lib/ext2fs/tst_badblocks.c
+++ b/lib/ext2fs/tst_badblocks.c
@@ -271,6 +271,8 @@ int main(int argc, char **argv)
int equal;
errcode_t retval;
+ add_error_table(&et_ext2_error_table);
+
bb1 = bb2 = bb3 = bb4 = bb5 = 0;
printf("test1: ");
diff --git a/lib/ext2fs/tst_getsize.c b/lib/ext2fs/tst_getsize.c
index f9fc9d7..b196cbc 100644
--- a/lib/ext2fs/tst_getsize.c
+++ b/lib/ext2fs/tst_getsize.c
@@ -34,6 +34,7 @@ int main(int argc, const char *argv[])
fprintf(stderr, "%s device\n", argv[0]);
exit(1);
}
+ add_error_table(&et_ext2_error_table);
retval = ext2fs_get_device_size(argv[1], 1024, &blocks);
if (retval) {
com_err(argv[0], retval, "while getting device size");
diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in
index 3f8f768..4a2bdb1 100644
--- a/lib/ss/Makefile.in
+++ b/lib/ss/Makefile.in
@@ -37,12 +37,12 @@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds
XTRA_CFLAGS= -I$(srcdir)/../et
.c.o:
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $<
- at PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
- at CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
- at ELF_CMT@ @$(CC) $(ALL_CFLAGS) -DSHARED_ELF_LIB -fPIC -o elfshared/$*.o -c $<
- at BSDLIB_CMT@ @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
+ $(E) " CC $<"
+ $(Q) $(CC) $(ALL_CFLAGS) -c $<
+ at PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
+ at CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
+ at ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -DSHARED_ELF_LIB -fPIC -o elfshared/$*.o -c $<
+ at BSDLIB_CMT@ $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
# for the library
@@ -96,18 +96,18 @@ FILES= $(SRCS) $(MKCMDSFILES) $(HFILES) \
all:: libss.a ss.pc # libss_p.a lint
std_rqs.c: std_rqs.ct mk_cmds
- @echo " MK_CMDS $@"
- @DIR=$(srcdir) $(MK_CMDS) $(srcdir)/std_rqs.ct
+ $(E) " MK_CMDS $@"
+ $(Q) DIR=$(srcdir) $(MK_CMDS) $(srcdir)/std_rqs.ct
std_rqs.o: ss_err.h
test_cmd.c: test_cmd.ct mk_cmds
- @echo " MK_CMDS $@"
- @DIR=$(srcdir) $(MK_CMDS) $(srcdir)/test_cmd.ct
+ $(E) " MK_CMDS $@"
+ $(Q) DIR=$(srcdir) $(MK_CMDS) $(srcdir)/test_cmd.ct
ss_err.c ss_err.h: ss_err.et
- @echo " COMPILE_ET ss_err.et"
- @$(COMPILE_ET) $(srcdir)/ss_err.et
+ $(E) " COMPILE_ET ss_err.et"
+ $(Q) $(COMPILE_ET) $(srcdir)/ss_err.et
ct.tab.c ct.tab.h: ct.y
$(RM) -f ct.tab.* y.*
@@ -120,42 +120,42 @@ ct.tab.c ct.tab.h: ct.y
# $(CHMOD) -x $@
mk_cmds: $(DEP_SUBSTITUTE) $(srcdir)/mk_cmds.sh.in
- @echo " SUBST $@"
- @$(SUBSTITUTE) $(srcdir)/mk_cmds.sh.in mk_cmds
- @$(CHMOD) +x mk_cmds
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE) $(srcdir)/mk_cmds.sh.in mk_cmds
+ $(Q) $(CHMOD) +x mk_cmds
ss.pc: $(srcdir)/ss.pc.in $(top_builddir)/config.status
- @echo " CONFIG.STATUS $@"
- @cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status
+ $(E) " CONFIG.STATUS $@"
+ $(Q) cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status
installdirs::
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(E) " MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
+ $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \
$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig
install:: libss.a $(INSTALL_HFILES) installdirs ss_err.h mk_cmds ss.pc
- @echo " INSTALL_DATA $(DESTDIR)$(libdir)/libss.a"
- @$(INSTALL_DATA) libss.a $(DESTDIR)$(libdir)/libss.a
- @-$(RANLIB) $(DESTDIR)$(libdir)/libss.a
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libss.a
- @$(RM) -f $(DESTDIR)$(includedir)/ss/*
- @for i in $(INSTALL_HFILES); do \
+ $(E) " INSTALL_DATA $(DESTDIR)$(libdir)/libss.a"
+ $(Q) $(INSTALL_DATA) libss.a $(DESTDIR)$(libdir)/libss.a
+ -$(Q) $(RANLIB) $(DESTDIR)$(libdir)/libss.a
+ $(Q) $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libss.a
+ $(Q) $(RM) -f $(DESTDIR)$(includedir)/ss/*
+ $(Q) for i in $(INSTALL_HFILES); do \
echo " INSTALL_DATA $(DESTDIR)$(includedir)/ss/$$i"; \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/ss/$$i; \
done
- @echo " INSTALL_DATA $(includedir)/ss/ss_err.h"
- @$(INSTALL_DATA) ss_err.h $(DESTDIR)$(includedir)/ss/ss_err.h
- @for i in $(SHARE_FILES); do \
+ $(E) " INSTALL_DATA $(includedir)/ss/ss_err.h"
+ $(Q) $(INSTALL_DATA) ss_err.h $(DESTDIR)$(includedir)/ss/ss_err.h
+ $(Q) for i in $(SHARE_FILES); do \
echo " INSTALL_DATA $(DESTDIR)$(datadir)/ss/$$i"; \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/ss/$$i; \
done
- @echo " INSTALL $(bindir)/mk_cmds"
- @$(INSTALL) mk_cmds $(DESTDIR)$(bindir)/mk_cmds
- @echo " INSTALL_DATA $(man1dir)/mk_cmds.1"
- @$(INSTALL_DATA) $(srcdir)/mk_cmds.1 $(DESTDIR)$(man1dir)/mk_cmds.1
- @echo " INSTALL_DATA $(libdir)/pkgconfig/ss.pc"
- @$(INSTALL_DATA) ss.pc $(DESTDIR)$(libdir)/pkgconfig/ss.pc
+ $(E) " INSTALL $(bindir)/mk_cmds"
+ $(Q) $(INSTALL) mk_cmds $(DESTDIR)$(bindir)/mk_cmds
+ $(E) " INSTALL_DATA $(man1dir)/mk_cmds.1"
+ $(Q) $(INSTALL_DATA) $(srcdir)/mk_cmds.1 $(DESTDIR)$(man1dir)/mk_cmds.1
+ $(E) " INSTALL_DATA $(libdir)/pkgconfig/ss.pc"
+ $(Q) $(INSTALL_DATA) ss.pc $(DESTDIR)$(libdir)/pkgconfig/ss.pc
uninstall::
$(RM) -f $(DESTDIR)$(libdir)/libss.a $(DESTDIR)$(bindir)/mk_cmds \
@@ -163,15 +163,15 @@ uninstall::
$(DESTDIR)$(man1dir)/mk_cmds.1
$(RM) -rf $(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss
-test_ss: test_ss.o test_cmd.o $(DEPLIBSS) $(LIBCOM_ERR)
- @echo " LD $@"
- @$(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \
+test_ss: test_ss.o test_cmd.o $(DEPLIBSS) $(DEPLIBCOM_ERR)
+ $(E) " LD $@"
+ $(Q) $(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \
$(LIBSS) $(LIBCOM_ERR)
check:: all test_ss
- @echo " RUN TEST test_ss"
+ $(E) " RUN TEST test_ss"
-@(LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./test_ss -f $(srcdir)/test_script > test_out 2>&1; exit 0)
- @if diff test_out $(srcdir)/test_script_expected > test.diff; then \
+ $(Q) if diff test_out $(srcdir)/test_script_expected > test.diff; then \
true ; else echo "Regression test for ss library failed!"; exit 1 ; fi
clean::
diff --git a/lib/ss/get_readline.c b/lib/ss/get_readline.c
index 16679a3..4421052 100644
--- a/lib/ss/get_readline.c
+++ b/lib/ss/get_readline.c
@@ -36,7 +36,7 @@ static void ss_release_readline(ss_data *info)
}
/* Libraries we will try to use for readline/editline functionality */
-#define DEFAULT_LIBPATH "libreadline.so.5:libreadline.so.4:libreadline.so:libedit.so.2:libedit.so:libeditline.so.0:libeditline.so"
+#define DEFAULT_LIBPATH "libreadline.so.6:libreadline.so.5:libreadline.so.4:libreadline.so:libedit.so.2:libedit.so:libeditline.so.0:libeditline.so"
void ss_get_readline(int sci_idx)
{
diff --git a/lib/ss/invocation.c b/lib/ss/invocation.c
index 074706f..74fcb14 100644
--- a/lib/ss/invocation.c
+++ b/lib/ss/invocation.c
@@ -71,6 +71,7 @@ int ss_create_invocation(subsystem_name, version_string, info_ptr,
*(new_table->rqt_tables+1) = (ss_request_table *) NULL;
new_table->readline_handle = 0;
+ new_table->readline_shutdown = 0;
new_table->readline = 0;
new_table->add_history = 0;
new_table->redisplay = 0;
diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in
index 35fc2e9..10e5277 100644
--- a/lib/uuid/Makefile.in
+++ b/lib/uuid/Makefile.in
@@ -60,97 +60,101 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
@MAKEFILE_CHECKER@
.c.o:
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
- at PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
- at CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
- at ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
- at BSDLIB_CMT@ @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
+ $(E) " CC $<"
+ $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@
+ at PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
+ at CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
+ at ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
+ at BSDLIB_CMT@ $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
all:: tst_uuid uuid_time $(SMANPAGES) uuid.pc
+uuid.h: $(srcdir)/uuid.h.in
+ $(E) " CP $@"
+ $(Q) cp $(srcdir)/uuid.h.in uuid.h
+
$(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_types.h.in $(top_builddir)/config.status
cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status
tst_uuid.o: $(srcdir)/tst_uuid.c
- @echo " CC $@"
- @$(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o
+ $(E) " CC $@"
+ $(Q) $(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o
tst_uuid: tst_uuid.o $(DEPSTATIC_LIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(STATIC_LIBUUID)
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(STATIC_LIBUUID)
uuid_time: $(srcdir)/uuid_time.c $(DEPLIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \
$(LIBUUID)
uuid.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid.3.in uuid.3
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuid.3.in uuid.3
uuid_clear.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_clear.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_clear.3.in uuid_clear.3
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_clear.3.in uuid_clear.3
uuid_compare.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_compare.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_compare.3.in uuid_compare.3
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_compare.3.in uuid_compare.3
uuid_copy.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_copy.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_copy.3.in uuid_copy.3
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_copy.3.in uuid_copy.3
uuid_generate.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_generate.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_generate.3.in uuid_generate.3
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_generate.3.in uuid_generate.3
uuid_is_null.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_is_null.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_is_null.3.in uuid_is_null.3
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_is_null.3.in uuid_is_null.3
uuid_parse.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_parse.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_parse.3.in uuid_parse.3
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_parse.3.in uuid_parse.3
uuid_time.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_time.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_time.3.in uuid_time.3
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_time.3.in uuid_time.3
uuid_unparse.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_unparse.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_unparse.3.in uuid_unparse.3
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_unparse.3.in uuid_unparse.3
uuid.pc: $(srcdir)/uuid.pc.in $(top_builddir)/config.status
- @echo " CONFIG.STATUS $@"
- @cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status
+ $(E) " CONFIG.STATUS $@"
+ $(Q) cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status
installdirs::
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(E) " MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)"
+ $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir) \
$(DESTDIR)$(libdir)/pkgconfig
install:: all installdirs
- @echo " INSTALL_DATA $(libdir)/libuuid.a"
- @$(INSTALL_DATA) libuuid.a $(DESTDIR)$(libdir)/libuuid.a
- @-$(RANLIB) $(DESTDIR)$(libdir)/libuuid.a
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libuuid.a
- @echo " INSTALL_DATA $(includedir)/uuid/uuid.h"
- @$(INSTALL_DATA) $(srcdir)/uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h
- @for i in $(SMANPAGES); do \
+ $(E) " INSTALL_DATA $(libdir)/libuuid.a"
+ $(Q) $(INSTALL_DATA) libuuid.a $(DESTDIR)$(libdir)/libuuid.a
+ -$(Q) $(RANLIB) $(DESTDIR)$(libdir)/libuuid.a
+ $(Q) $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libuuid.a
+ $(E) " INSTALL_DATA $(includedir)/uuid/uuid.h"
+ $(Q) $(INSTALL_DATA) uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h
+ $(Q) for i in $(SMANPAGES); do \
$(RM) -f $(DESTDIR)$(man3dir)/$$i.gz; \
echo " INSTALL_DATA $(man3dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$i; \
done
- @$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
+ $(Q) $(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
$(DESTDIR)$(man3dir)/uuid_generate_time.3.gz
- @echo " LINK $(man3dir)/uuid_generate_random.3"
- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
- @echo " LINK $(man3dir)/uuid_generate_time.3"
- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
- @echo " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
- @$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
+ $(E) " LINK $(man3dir)/uuid_generate_random.3"
+ $(Q) $(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
+ $(E) " LINK $(man3dir)/uuid_generate_time.3"
+ $(Q) $(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
+ $(E) " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
+ $(Q) $(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
uninstall::
$(RM) -f $(DESTDIR)$(libdir)/libuuid.a \
@@ -161,7 +165,7 @@ uninstall::
$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
clean::
- $(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/* checker/*
+ $(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/* checker/* uuid.h
$(RM) -f ../libuuid.a ../libuuid_p.a tst_uuid uuid_time $(SMANPAGES)
check:: tst_uuid
@@ -179,21 +183,20 @@ distclean:: clean
../../lib/libuuid.so: image
../../lib/libuuid.dylib: image
-$(OBJS): subdirs
+$(OBJS): subdirs uuid.h
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
# the Makefile.in file
#
-clear.o: $(srcdir)/clear.c $(srcdir)/uuidP.h $(srcdir)/uuid.h
-compare.o: $(srcdir)/compare.c $(srcdir)/uuidP.h $(srcdir)/uuid.h
-copy.o: $(srcdir)/copy.c $(srcdir)/uuidP.h $(srcdir)/uuid.h
-gen_uuid.o: $(srcdir)/gen_uuid.c $(srcdir)/uuidP.h $(srcdir)/uuid.h \
- $(srcdir)/uuidd.h
-isnull.o: $(srcdir)/isnull.c $(srcdir)/uuidP.h $(srcdir)/uuid.h
-pack.o: $(srcdir)/pack.c $(srcdir)/uuidP.h $(srcdir)/uuid.h
-parse.o: $(srcdir)/parse.c $(srcdir)/uuidP.h $(srcdir)/uuid.h
-unpack.o: $(srcdir)/unpack.c $(srcdir)/uuidP.h $(srcdir)/uuid.h
-unparse.o: $(srcdir)/unparse.c $(srcdir)/uuidP.h $(srcdir)/uuid.h
-uuid_time.o: $(srcdir)/uuid_time.c $(srcdir)/uuidP.h $(srcdir)/uuid.h
+clear.o: $(srcdir)/clear.c $(srcdir)/uuidP.h
+compare.o: $(srcdir)/compare.c $(srcdir)/uuidP.h
+copy.o: $(srcdir)/copy.c $(srcdir)/uuidP.h
+gen_uuid.o: $(srcdir)/gen_uuid.c $(srcdir)/uuidP.h $(srcdir)/uuidd.h
+isnull.o: $(srcdir)/isnull.c $(srcdir)/uuidP.h
+pack.o: $(srcdir)/pack.c $(srcdir)/uuidP.h
+parse.o: $(srcdir)/parse.c $(srcdir)/uuidP.h
+unpack.o: $(srcdir)/unpack.c $(srcdir)/uuidP.h
+unparse.o: $(srcdir)/unparse.c $(srcdir)/uuidP.h
+uuid_time.o: $(srcdir)/uuid_time.c $(srcdir)/uuidP.h
diff --git a/lib/uuid/gen_uuid.c b/lib/uuid/gen_uuid.c
index b7a12ee..420ca2b 100644
--- a/lib/uuid/gen_uuid.c
+++ b/lib/uuid/gen_uuid.c
@@ -419,15 +419,19 @@ static ssize_t read_all(int fd, char *buf, size_t count)
{
ssize_t ret;
ssize_t c = 0;
+ int tries = 0;
memset(buf, 0, count);
while (count > 0) {
ret = read(fd, buf, count);
- if (ret < 0) {
- if ((errno == EAGAIN) || (errno == EINTR))
+ if (ret <= 0) {
+ if ((errno == EAGAIN || errno == EINTR || ret == 0) &&
+ (tries++ < 5))
continue;
- return -1;
+ return c ? c : -1;
}
+ if (ret > 0)
+ tries = 0;
count -= ret;
buf += ret;
c += ret;
@@ -455,8 +459,11 @@ static void close_all_fds(void)
max = OPEN_MAX;
#endif
- for (i=0; i < max; i++)
+ for (i=0; i < max; i++) {
close(i);
+ if (i <= 2)
+ open("/dev/null", O_RDWR);
+ }
}
@@ -474,6 +481,7 @@ static int get_uuid_via_daemon(int op, uuid_t out, int *num)
ssize_t ret;
int32_t reply_len = 0, expected = 16;
struct sockaddr_un srv_addr;
+ struct stat st;
pid_t pid;
static const char *uuidd_path = UUIDD_PATH;
static int access_ret = -2;
@@ -489,6 +497,10 @@ static int get_uuid_via_daemon(int op, uuid_t out, int *num)
sizeof(struct sockaddr_un)) < 0) {
if (access_ret == -2)
access_ret = access(uuidd_path, X_OK);
+ if (access_ret == 0)
+ access_ret = stat(uuidd_path, &st);
+ if (access_ret == 0 && (st.st_mode & (S_ISUID | S_ISGID)) == 0)
+ access_ret = access(UUIDD_DIR, W_OK);
if (access_ret == 0 && start_attempts++ < 5) {
if ((pid = fork()) == 0) {
close_all_fds();
diff --git a/lib/uuid/tst_uuid.c b/lib/uuid/tst_uuid.c
index e03138f..7ac0207 100644
--- a/lib/uuid/tst_uuid.c
+++ b/lib/uuid/tst_uuid.c
@@ -41,7 +41,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "uuid.h"
+#include <uuid/uuid.h>
static int test_uuid(const char * uuid, int isValid)
{
diff --git a/lib/uuid/uuid.h b/lib/uuid/uuid.h.in
similarity index 100%
rename from lib/uuid/uuid.h
rename to lib/uuid/uuid.h.in
diff --git a/lib/uuid/uuidP.h b/lib/uuid/uuidP.h
index d0e24c6..e897bbb 100644
--- a/lib/uuid/uuidP.h
+++ b/lib/uuid/uuidP.h
@@ -39,7 +39,7 @@
#endif
#include <sys/types.h>
-#include "uuid.h"
+#include <uuid/uuid.h>
/*
* Offset between 15-Oct-1582 and 1-Jan-70
diff --git a/lib/uuid/uuidd.h b/lib/uuid/uuidd.h
index 528acdc..c71f4b7 100644
--- a/lib/uuid/uuidd.h
+++ b/lib/uuid/uuidd.h
@@ -35,8 +35,9 @@
#ifndef _UUID_UUIDD_H
#define _UUID_UUIDD_H
-#define UUIDD_SOCKET_PATH "/var/lib/libuuid/request"
-#define UUIDD_PIDFILE_PATH "/var/lib/libuuid/uuidd.pid"
+#define UUIDD_DIR "/var/lib/libuuid"
+#define UUIDD_SOCKET_PATH UUIDD_DIR "/request"
+#define UUIDD_PIDFILE_PATH UUIDD_DIR "/uuidd.pid"
#define UUIDD_PATH "/usr/sbin/uuidd"
#define UUIDD_OP_GETPID 0
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 99cb149..09c6d6a 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -25,14 +25,14 @@ INSTALL = @INSTALL@
SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
$(E2IMAGE_PROG) @FSCK_PROG@ e2undo
-USPROGS= mklost+found filefrag $(UUIDD_PROG)
+USPROGS= mklost+found filefrag e2freefrag $(UUIDD_PROG)
SMANPAGES= tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
e2label.8 $(FINDFS_MAN) $(BLKID_MAN) $(E2IMAGE_MAN) \
- logsave.8 filefrag.8 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@
+ logsave.8 filefrag.8 e2freefrag.8 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@
FMANPAGES= mke2fs.conf.5
-UPROGS= chattr lsattr uuidgen
-UMANPAGES= chattr.1 lsattr.1 uuidgen.1
+UPROGS= chattr lsattr @UUID_CMT@ uuidgen
+UMANPAGES= chattr.1 lsattr.1 @UUID_CMT@ uuidgen.1
LPROGS= @E2INITRD_PROG@
@@ -50,6 +50,7 @@ FSCK_OBJS= fsck.o base_device.o ismounted.o
BLKID_OBJS= blkid.o
FILEFRAG_OBJS= filefrag.o
E2UNDO_OBJS= e2undo.o
+E2FREEFRAG_OBJS= e2freefrag.o
PROFILED_TUNE2FS_OBJS= profiled/tune2fs.o profiled/util.o
PROFILED_MKLPF_OBJS= profiled/mklost+found.o
@@ -77,25 +78,25 @@ SRCS= $(srcdir)/tune2fs.c $(srcdir)/mklost+found.c $(srcdir)/mke2fs.c \
$(srcdir)/uuidgen.c $(srcdir)/blkid.c $(srcdir)/logsave.c \
$(srcdir)/filefrag.c $(srcdir)/base_device.c \
$(srcdir)/ismounted.c $(srcdir)/../e2fsck/profile.c \
- $(srcdir)/e2undo.c
+ $(srcdir)/e2undo.c $(srcdir)/e2freefrag.c
LIBS= $(LIBEXT2FS) $(LIBCOM_ERR)
-DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR)
+DEPLIBS= $(LIBEXT2FS) $(DEPLIBCOM_ERR)
PROFILED_LIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR)
-PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR)
+PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(DEPPROFILED_LIBCOM_ERR)
STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
-STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
+STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR)
LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)
-DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)
+DEPLIBS_E2P= $(LIBE2P) $(DEPLIBCOM_ERR)
COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
.c.o:
- @echo " CC $<"
- @$(CC) -c $(ALL_CFLAGS) $< -o $@
- at PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
+ $(E) " CC $<"
+ $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
+ at PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
all:: profiled $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \
$(FMANPAGES) $(LPROGS)
@@ -106,93 +107,93 @@ all:: profiled $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \
e2image.profiled
profiled:
- at PROFILE_CMT@ @echo " MKDIR $@"
- at PROFILE_CMT@ @mkdir profiled
+ at PROFILE_CMT@ $(E) " MKDIR $@"
+ at PROFILE_CMT@ $(Q) mkdir profiled
prof_err.c prof_err.h: $(srcdir)/../e2fsck/prof_err.et
- @echo " COMPILE_ET prof_err.et"
- @$(COMPILE_ET) $(srcdir)/../e2fsck/prof_err.et
+ $(E) " COMPILE_ET prof_err.et"
+ $(Q) $(COMPILE_ET) $(srcdir)/../e2fsck/prof_err.et
default_profile.c: $(srcdir)/mke2fs.conf $(srcdir)/profile-to-c.awk
- @echo " PROFILE_TO_C mke2fs.conf"
- @$(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \
+ $(E) " PROFILE_TO_C mke2fs.conf"
+ $(Q) $(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \
> default_profile.c
profile.o:
- @echo " CC $<"
- @$(CC) -c $(ALL_CFLAGS) $(srcdir)/../e2fsck/profile.c -o $@
- at PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/profile.o -c \
+ $(E) " CC $<"
+ $(Q) $(CC) -c $(ALL_CFLAGS) $(srcdir)/../e2fsck/profile.c -o $@
+ at PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/profile.o -c \
@PROFILE_CMT@ $(srcdir)/../e2fsck/profile.c
findsuper: findsuper.o
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o findsuper findsuper.o
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o findsuper findsuper.o
partinfo: partinfo.o
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o
e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBBLKID) $(LIBEXT2FS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \
$(LIBBLKID) $(LIBEXT2FS) $(LIBINTL)
tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBBLKID) \
$(DEPLIBUUID) $(LIBEXT2FS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \
$(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBS_E2P) $(LIBINTL)
tune2fs.static: $(TUNE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBBLKID)
- @echo " LD $@"
- @$(CC) $(LDFLAGS_STATIC) -o tune2fs.static $(TUNE2FS_OBJS) \
+ $(E) " LD $@"
+ $(Q) $(CC) $(LDFLAGS_STATIC) -o tune2fs.static $(TUNE2FS_OBJS) \
$(STATIC_LIBS) $(STATIC_LIBBLKID) $(STATIC_LIBUUID) \
$(STATIC_LIBE2P) $(LIBINTL)
tune2fs.profiled: $(PROFILED_TUNE2FS_OBJS) $(PROFILED_DEPLIBS) \
$(PROFILED_E2P) $(DEPPROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o tune2fs.profiled \
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o tune2fs.profiled \
$(PROFILED_TUNE2FS_OBJS) $(PROFILED_LIBBLKID) \
$(PROFILED_LIBUUID) $(PROFILED_LIBE2P) $(LIBINTL) \
$(PROFILED_LIBS)
blkid: $(BLKID_OBJS) $(DEPLIBBLKID) $(LIBEXT2FS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBBLKID) $(LIBINTL) \
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBBLKID) $(LIBINTL) \
$(LIBEXT2FS)
blkid.static: $(BLKID_OBJS) $(STATIC_DEPLIBS) $(DEPSTATIC_LIBBLKID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o blkid.static $(BLKID_OBJS) $(STATIC_LIBS) \
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o blkid.static $(BLKID_OBJS) $(STATIC_LIBS) \
$(STATIC_LIBBLKID) $(LIBINTL)
blkid.profiled: $(PROFILED_BLKID_OBJS) $(DEPPROFILED_LIBBLKID) \
$(PROFILED_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o blkid.profiled $(PROFILED_BLKID_OBJS) \
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o blkid.profiled $(PROFILED_BLKID_OBJS) \
$(PROFILED_LIBBLKID) $(LIBINTL) $(PROFILED_LIBEXT2FS)
e2image: $(E2IMAGE_OBJS) $(DEPLIBS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL)
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL)
e2image.profiled: $(PROFILED_E2IMAGE_OBJS) $(PROFILED_DEPLIBS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o e2image.profiled \
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o e2image.profiled \
$(PROFILED_E2IMAGE_OBJS) $(PROFILED_LIBS) $(LIBINTL)
e2undo: $(E2UNDO_OBJS) $(DEPLIBS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o e2undo $(E2UNDO_OBJS) $(LIBS) $(LIBINTL)
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o e2undo $(E2UNDO_OBJS) $(LIBS) $(LIBINTL)
e2undo.profiled: $(PROFILED_E2UNDO_OBJS) $(PROFILED_DEPLIBS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o e2undo.profiled \
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o e2undo.profiled \
$(PROFILED_E2UNDO_OBJS) $(PROFILED_LIBS) $(LIBINTL)
base_device: base_device.c
- @echo " LD $@"
- @$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \
-DDEBUG -o base_device
check:: base_device
@@ -200,263 +201,272 @@ check:: base_device
cmp $(srcdir)/base_device.tst base_device.out
mklost+found: $(MKLPF_OBJS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL)
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL)
mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(LIBE2P) $(DEPLIBBLKID) $(DEPLIBUUID) \
$(LIBEXT2FS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBBLKID) \
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBBLKID) \
$(LIBUUID) $(LIBEXT2FS) $(LIBE2P) $(LIBINTL)
mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBUUID) $(DEPSTATIC_LIBBLKID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -static -o mke2fs.static $(MKE2FS_OBJS) \
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -static -o mke2fs.static $(MKE2FS_OBJS) \
$(STATIC_LIBS) $(STATIC_LIBE2P) $(STATIC_LIBBLKID) \
$(STATIC_LIBUUID) $(LIBINTL)
mke2fs.profiled: $(PROFILED_MKE2FS_OBJS) $(PROFILED_DEPLIBS) \
$(PROFILED_LIBE2P) $(PROFILED_DEPLIBBLKID) $(PROFILED_DEPLIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o mke2fs.profiled \
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o mke2fs.profiled \
$(PROFILED_MKE2FS_OBJS) $(PROFILED_LIBBLKID) \
$(PROFILED_LIBUUID) $(PROFILED_LIBE2P) $(LIBINTL) \
$(PROFILED_LIBS)
chattr: $(CHATTR_OBJS) $(DEPLIBS_E2P)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
lsattr: $(LSATTR_OBJS) $(DEPLIBS_E2P)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
uuidgen: $(UUIDGEN_OBJS) $(DEPLIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL)
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL)
uuidgen.profiled: $(PROFILED_UUIDGEN_OBJS) $(PROFILED_DEPLIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o uuidgen.profiled \
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o uuidgen.profiled \
$(PROFILED_UUIDGEN_OBJS) $(PROFILED_LIBUUID) $(LIBINTL)
uuidd: $(UUIDD_OBJS) $(DEPLIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o uuidd $(UUIDD_OBJS) $(LIBUUID) $(LIBINTL)
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o uuidd $(UUIDD_OBJS) $(LIBUUID) $(LIBINTL)
uuidd.profiled: $(PROFILED_UUIDD_OBJS) $(PROFILED_DEPLIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o uuidd.profiled $(PROFILED_UUIDD_OBJS) \
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o uuidd.profiled $(PROFILED_UUIDD_OBJS) \
$(PROFILED_LIBUUID) $(LIBINTL)
dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \
$(LIBS_E2P) $(LIBUUID) $(LIBINTL)
dumpe2fs.profiled: $(PROFILED_DUMPE2FS_OBJS) $(PROFILED_DEPLIBS) \
$(PROFILED_LIBE2P) $(PROFILED_DEPLIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o dumpe2fs.profiled \
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o dumpe2fs.profiled \
$(PROFILED_DUMPE2FS_OBJS) $(PROFILED_LIBS) \
$(PROFILED_LIBE2P) $(PROFILED_LIBUUID) $(LIBINTL)
fsck: $(FSCK_OBJS) $(DEPLIBBLKID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBINTL)
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBINTL)
fsck.profiled: $(PROFILED_FSCK_OBJS) $(PROFILED_DEPLIBBLKID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o fsck.profiled $(PROFILED_FSCK_OBJS) \
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o fsck.profiled $(PROFILED_FSCK_OBJS) \
$(PROFILED_LIBBLKID) $(LIBINTL)
badblocks: $(BADBLOCKS_OBJS) $(DEPLIBS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL)
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL)
badblocks.profiled: $(PROFILED_BADBLOCKS_OBJS) $(PROFILED_DEPLIBS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o badblocks.profiled \
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o badblocks.profiled \
$(PROFILED_BADBLOCKS_OBJS) $(PROFILED_LIBS) $(LIBINTL)
logsave: logsave.o
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o logsave logsave.o
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o logsave logsave.o
logsave.profiled: profiled/logsave.o
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o logsave.profiled profiled/logsave.o
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o logsave.profiled profiled/logsave.o
+
+e2freefrag: $(E2FREEFRAG_OBJS)
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o e2freefrag $(E2FREEFRAG_OBJS) $(LIBS)
filefrag: $(FILEFRAG_OBJS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS)
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS)
filefrag.profiled: $(PROFILED_FILEFRAG_OBJS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o filefrag.profiled \
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o filefrag.profiled \
$(PROFILED_FILEFRAG_OBJS)
-tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- $(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR)
+tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
+ $(E) " LD $@"
+ $(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) \
+ $(LIBCOM_ERR)
tune2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/tune2fs.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/tune2fs.8.in tune2fs.8
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/tune2fs.8.in tune2fs.8
mklost+found.8: $(DEP_SUBSTITUTE) $(srcdir)/mklost+found.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/mklost+found.8.in mklost+found.8
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/mklost+found.8.in mklost+found.8
mke2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/mke2fs.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.8.in mke2fs.8
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.8.in mke2fs.8
mke2fs.conf.5: $(DEP_SUBSTITUTE) $(srcdir)/mke2fs.conf.5.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.conf.5.in mke2fs.conf.5
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.conf.5.in mke2fs.conf.5
e2label.8: $(DEP_SUBSTITUTE) $(srcdir)/e2label.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2label.8.in e2label.8
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/e2label.8.in e2label.8
e2undo.8: $(DEP_SUBSTITUTE) $(srcdir)/e2undo.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2undo.8.in e2undo.8
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/e2undo.8.in e2undo.8
findfs.8: $(DEP_SUBSTITUTE) $(srcdir)/findfs.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/findfs.8.in findfs.8
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/findfs.8.in findfs.8
e2image.8: $(DEP_SUBSTITUTE) $(srcdir)/e2image.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2image.8.in e2image.8
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/e2image.8.in e2image.8
dumpe2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/dumpe2fs.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/dumpe2fs.8.in dumpe2fs.8
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/dumpe2fs.8.in dumpe2fs.8
badblocks.8: $(DEP_SUBSTITUTE) $(srcdir)/badblocks.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/badblocks.8.in badblocks.8
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/badblocks.8.in badblocks.8
fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/fsck.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/fsck.8.in fsck.8
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/fsck.8.in fsck.8
blkid.8: $(DEP_SUBSTITUTE) $(srcdir)/blkid.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/blkid.8.in blkid.8
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/blkid.8.in blkid.8
logsave.8: $(DEP_SUBSTITUTE) $(srcdir)/logsave.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/logsave.8.in logsave.8
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/logsave.8.in logsave.8
uuidd.8: $(DEP_SUBSTITUTE) $(srcdir)/uuidd.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuidd.8.in uuidd.8
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuidd.8.in uuidd.8
chattr.1: $(DEP_SUBSTITUTE) $(srcdir)/chattr.1.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/chattr.1.in chattr.1
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/chattr.1.in chattr.1
lsattr.1: $(DEP_SUBSTITUTE) $(srcdir)/lsattr.1.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/lsattr.1.in lsattr.1
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/lsattr.1.in lsattr.1
uuidgen.1: $(DEP_SUBSTITUTE) $(srcdir)/uuidgen.1.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuidgen.1.in uuidgen.1
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/uuidgen.1.in uuidgen.1
blkid.1: $(DEP_SUBSTITUTE) $(srcdir)/blkid.1.in
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/blkid.1.in blkid.1
+
+e2freefrag.8: $(DEP_SUBSTITUTE) $(srcdir)/e2freefrag.8.in
@echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/blkid.1.in blkid.1
+ @$(SUBSTITUTE_UPTIME) $(srcdir)/e2freefrag.8.in e2freefrag.8
filefrag.8: $(DEP_SUBSTITUTE) $(srcdir)/filefrag.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
installdirs:
- @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
+ $(E) " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
+ $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
$(DESTDIR)$(libdir) $(DESTDIR)/$(root_sysconfdir)
install: all $(SMANPAGES) $(UMANPAGES) installdirs
- @for i in $(SPROGS); do \
+ $(Q) for i in $(SPROGS); do \
echo " INSTALL $(root_sbindir)/$$i"; \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
done
- @for i in $(USPROGS); do \
+ $(Q) for i in $(USPROGS); do \
echo " INSTALL $(sbindir)/$$i"; \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
done
- @echo " LINK $(root_sbindir)/mkfs.ext2"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+ $(E) " LINK $(root_sbindir)/mkfs.ext2"
+ $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
$(DESTDIR)$(root_sbindir)/mkfs.ext2
- @echo " LINK $(root_sbindir)/mkfs.ext3"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+ $(E) " LINK $(root_sbindir)/mkfs.ext3"
+ $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
$(DESTDIR)$(root_sbindir)/mkfs.ext3
- @echo " LINK $(root_sbindir)/mkfs.ext4"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+ $(E) " LINK $(root_sbindir)/mkfs.ext4"
+ $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
$(DESTDIR)$(root_sbindir)/mkfs.ext4
- @echo " LINK $(root_sbindir)/mkfs.ext4dev"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+ $(E) " LINK $(root_sbindir)/mkfs.ext4dev"
+ $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
$(DESTDIR)$(root_sbindir)/mkfs.ext4dev
- @echo " LINK $(root_sbindir)/e2label"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
+ $(E) " LINK $(root_sbindir)/e2label"
+ $(Q) $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
$(DESTDIR)$(root_sbindir)/e2label
- @if test -n "$(FINDFS_LINK)"; then \
+ $(Q) if test -n "$(FINDFS_LINK)"; then \
echo " LINK $(root_sbindir)/findfs"; \
$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
$(DESTDIR)$(root_sbindir)/$(FINDFS_LINK); \
fi
- @for i in $(UPROGS); do \
+ $(Q) for i in $(UPROGS); do \
echo " INSTALL $(bindir)/$$i"; \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \
done
- @for i in $(LPROGS); do \
+ $(Q) for i in $(LPROGS); do \
echo " INSTALL $(libdir)/$$i"; \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(libdir)/$$i; \
done
- @for i in $(SMANPAGES); do \
+ $(Q) for i in $(SMANPAGES); do \
for j in $(COMPRESS_EXT); do \
$(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
done; \
echo " INSTALL_DATA $(man8dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
done
- @$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
+ $(Q) $(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
$(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
- @echo " LINK mkfs.ext2.8"
- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+ $(E) " LINK mkfs.ext2.8"
+ $(Q) $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
$(DESTDIR)$(man8dir)/mkfs.ext2.8
- @echo " LINK mkfs.ext3.8"
- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+ $(E) " LINK mkfs.ext3.8"
+ $(Q) $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
$(DESTDIR)$(man8dir)/mkfs.ext3.8
- @echo " LINK mkfs.ext4.8"
- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+ $(E) " LINK mkfs.ext4.8"
+ $(Q) $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
$(DESTDIR)$(man8dir)/mkfs.ext4.8
- @echo " LINK mkfs.ext4dev.8"
- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+ $(E) " LINK mkfs.ext4dev.8"
+ $(Q) $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
$(DESTDIR)$(man8dir)/mkfs.ext4dev.8
- @for i in $(UMANPAGES); do \
+ $(Q) for i in $(UMANPAGES); do \
for j in $(COMPRESS_EXT); do \
$(RM) -f $(DESTDIR)$(man1dir)/$$i.$$j; \
done; \
echo " INSTALL_DATA $(man1dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$i; \
done
- @for i in $(FMANPAGES); do \
+ $(Q) for i in $(FMANPAGES); do \
for j in $(COMPRESS_EXT); do \
$(RM) -f $(DESTDIR)$(man5dir)/$$i.$$j; \
done; \
echo " INSTALL_DATA $(man5dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
done
- @if test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
+ $(Q) if test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
if cmp -s $(DESTDIR)$(root_sysconfdir)/mke2fs.conf \
$(srcdir)/mke2fs.conf; then \
true; \
@@ -486,11 +496,11 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
fi
install-strip: install
- @for i in $(SPROGS); do \
+ $(Q) for i in $(SPROGS); do \
echo " STRIP $(root_sbindir)/$$i"; \
$(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
done
- @for i in $(USPROGS); do \
+ $(Q) for i in $(USPROGS); do \
echo " STRIP $(sbindir)/$$i"; \
$(STRIP) $(DESTDIR)$(sbindir)/$$i; \
done
@@ -535,7 +545,7 @@ uninstall:
clean:
$(RM) -f $(SPROGS) $(USPROGS) $(UPROGS) $(UMANPAGES) $(SMANPAGES) \
$(FMANPAGES) \
- base_device base_device.out mke2fs.static filefrag \
+ base_device base_device.out mke2fs.static filefrag e2freefrag \
e2initrd_helper partinfo prof_err.[ch] default_profile.c \
uuidd e2image tune2fs.static tst_ismounted fsck.profiled \
blkid.profiled tune2fs.profiled e2image.profiled \
@@ -555,70 +565,79 @@ distclean: clean
#
tune2fs.o: $(srcdir)/tune2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \
$(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
- $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
- $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(top_srcdir)/lib/uuid/uuid.h $(top_srcdir)/lib/e2p/e2p.h \
- $(srcdir)/jfs_user.h $(top_srcdir)/lib/ext2fs/kernel-jbd.h \
- $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h \
- $(srcdir)/util.h $(top_srcdir)/lib/blkid/blkid.h \
- $(top_builddir)/lib/blkid/blkid_types.h $(top_srcdir)/version.h \
- $(srcdir)/nls-enable.h
+ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(top_srcdir)/lib/e2p/e2p.h $(srcdir)/jfs_user.h \
+ $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \
+ $(top_srcdir)/lib/ext2fs/kernel-list.h $(srcdir)/util.h \
+ $(top_srcdir)/version.h $(srcdir)/nls-enable.h
mklost+found.o: $(srcdir)/mklost+found.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \
$(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/version.h \
$(srcdir)/nls-enable.h
mke2fs.o: $(srcdir)/mke2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \
$(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/uuid/uuid.h $(top_srcdir)/lib/e2p/e2p.h \
- $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
- $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
- $(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/util.h \
- $(srcdir)/../e2fsck/profile.h prof_err.h $(top_srcdir)/version.h \
- $(srcdir)/nls-enable.h
+ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
+ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(srcdir)/util.h $(srcdir)/../e2fsck/profile.h prof_err.h \
+ $(top_srcdir)/version.h $(srcdir)/nls-enable.h
chattr.o: $(srcdir)/chattr.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \
$(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/version.h $(srcdir)/nls-enable.h
+ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/version.h $(srcdir)/nls-enable.h
lsattr.o: $(srcdir)/lsattr.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \
$(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
- $(top_srcdir)/version.h $(srcdir)/nls-enable.h
+ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/version.h $(srcdir)/nls-enable.h
dumpe2fs.o: $(srcdir)/dumpe2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \
$(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
- $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
- $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
$(top_srcdir)/lib/e2p/e2p.h $(srcdir)/jfs_user.h \
$(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \
- $(top_srcdir)/lib/ext2fs/kernel-list.h $(top_srcdir)/lib/uuid/uuid.h \
- $(top_srcdir)/version.h $(srcdir)/nls-enable.h
+ $(top_srcdir)/lib/ext2fs/kernel-list.h $(top_srcdir)/version.h \
+ $(srcdir)/nls-enable.h
badblocks.o: $(srcdir)/badblocks.c $(top_srcdir)/lib/et/com_err.h \
$(top_srcdir)/lib/ext2fs/ext2_io.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
$(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
- $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
- $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
$(srcdir)/nls-enable.h
fsck.o: $(srcdir)/fsck.c $(top_srcdir)/version.h $(srcdir)/nls-enable.h \
- $(srcdir)/fsck.h $(top_srcdir)/lib/blkid/blkid.h \
- $(top_builddir)/lib/blkid/blkid_types.h
+ $(srcdir)/fsck.h
util.o: $(srcdir)/util.c $(top_srcdir)/lib/et/com_err.h \
$(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
$(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
+ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(srcdir)/nls-enable.h $(srcdir)/util.h
+uuidgen.o: $(srcdir)/uuidgen.c $(srcdir)/nls-enable.h
+blkid.o: $(srcdir)/blkid.c $(top_srcdir)/lib/ext2fs/ext2fs.h \
+ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
$(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
$(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
- $(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/nls-enable.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
- $(srcdir)/util.h
-uuidgen.o: $(srcdir)/uuidgen.c $(top_srcdir)/lib/uuid/uuid.h \
- $(srcdir)/nls-enable.h
-blkid.o: $(srcdir)/blkid.c $(top_srcdir)/lib/blkid/blkid.h \
- $(top_builddir)/lib/blkid/blkid_types.h
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h
logsave.o: $(srcdir)/logsave.c
-filefrag.o: $(srcdir)/filefrag.c
+filefrag.o: $(srcdir)/filefrag.c $(top_builddir)/lib/ext2fs/ext2_types.h \
+ $(top_srcdir)/lib/ext2fs/fiemap.h
base_device.o: $(srcdir)/base_device.c $(srcdir)/fsck.h
-ismounted.o: $(srcdir)/ismounted.c $(top_srcdir)/lib/et/com_err.h
+ismounted.o: $(srcdir)/ismounted.c $(srcdir)/fsck.h \
+ $(top_srcdir)/lib/et/com_err.h
profile.o: $(srcdir)/../e2fsck/profile.c $(top_srcdir)/lib/et/com_err.h \
$(srcdir)/../e2fsck/profile.h prof_err.h
-e2undo.o: $(srcdir)/e2undo.c $(top_srcdir)/lib/ext2fs/tdb.h
+e2undo.o: $(srcdir)/e2undo.c $(top_srcdir)/lib/ext2fs/tdb.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
+ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(srcdir)/nls-enable.h
+e2freefrag.o: $(srcdir)/e2freefrag.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
+ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(srcdir)/e2freefrag.h
diff --git a/misc/badblocks.8.in b/misc/badblocks.8.in
index 5a10f8a..f256c0e 100644
--- a/misc/badblocks.8.in
+++ b/misc/badblocks.8.in
@@ -131,6 +131,12 @@ option of
can be used to retrieve the list of blocks currently marked bad on
an existing filesystem, in a format suitable for use with this option.
.TP
+.B \-n
+Use non-destructive read-write mode. By default only a non-destructive
+read-only test is done. This option must not be combined with the
+.B \-w
+option, as they are mutually exclusive.
+.TP
.BI \-o " output_file"
Write the list of bad blocks to the specified file. Without this option,
.B badblocks
@@ -150,6 +156,15 @@ Default is 0, meaning
.B badblocks
will exit after the first pass.
.TP
+.B \-s
+Show the progress of the scan by writing out rough percentage completion
+of the current badblocks pass over the disk. Note that badblocks may do
+multiple test passes over the disk, in particular if the
+.B \-p
+or
+.B \-w
+option is requested by the user.
+.TP
.BI \-t " test_pattern"
Specify a test pattern to be read (and written) to disk blocks. The
.I test_pattern
@@ -168,16 +183,6 @@ If multiple patterns
are specified then all blocks will be tested with one pattern
before proceeding to the next pattern.
.TP
-.B \-n
-Use non-destructive read-write mode. By default only a non-destructive
-read-only test is done. This option must not be combined with the
-.B \-w
-option, as they are mutually exclusive.
-.TP
-.B \-s
-Show the progress of the scan by writing out the block numbers as they
-are checked.
-.TP
.B \-v
Verbose mode.
.TP
diff --git a/misc/badblocks.c b/misc/badblocks.c
index 528bc22..bcf89f7 100644
--- a/misc/badblocks.c
+++ b/misc/badblocks.c
@@ -223,6 +223,10 @@ static void *terminate_addr = NULL;
static void terminate_intr(int signo EXT2FS_ATTR((unused)))
{
+ fflush(out);
+ fprintf(stderr, "\n\nInterrupted at block %llu\n",
+ (unsigned long long) currently_testing);
+ fflush(stderr);
if (terminate_addr)
longjmp(terminate_addr,1);
exit(1);
@@ -434,6 +438,9 @@ static unsigned int test_ro (int dev, blk_t last_block,
unsigned int bb_count = 0;
errcode_t errcode;
+ /* set up abend handler */
+ capture_terminate(NULL);
+
errcode = ext2fs_badblocks_list_iterate_begin(bb_list,&bb_iter);
if (errcode) {
com_err (program_name, errcode,
@@ -531,6 +538,8 @@ static unsigned int test_ro (int dev, blk_t last_block,
ext2fs_badblocks_list_iterate_end(bb_iter);
+ uncapture_terminate();
+
return bb_count;
}
@@ -544,6 +553,9 @@ static unsigned int test_rw (int dev, blk_t last_block,
int i, try, got, nr_pattern, pat_idx;
unsigned int bb_count = 0;
+ /* set up abend handler */
+ capture_terminate(NULL);
+
buffer = allocate_buffer(2 * blocks_at_once * block_size);
read_buffer = buffer + blocks_at_once * block_size;
@@ -1010,11 +1022,6 @@ int main (int argc, char ** argv)
switch (c) {
case 'b':
block_size = parse_uint(optarg, "block size");
- if (block_size > 4096) {
- com_err (program_name, 0,
- _("bad block size - %s"), optarg);
- exit (1);
- }
break;
case 'f':
force++;
diff --git a/misc/blkid.c b/misc/blkid.c
index 0c34d61..388abad 100644
--- a/misc/blkid.c
+++ b/misc/blkid.c
@@ -170,7 +170,6 @@ static void pretty_print_dev(blkid_dev dev)
blkid_tag_iterate iter;
const char *type, *value, *devname;
const char *uuid = "", *fs_type = "", *label = "";
- char *cp;
int len, mount_flags;
char mtpt[80];
errcode_t retval;
diff --git a/misc/chattr.1.in b/misc/chattr.1.in
index 2b5955b..92f6d70 100644
--- a/misc/chattr.1.in
+++ b/misc/chattr.1.in
@@ -125,7 +125,7 @@ spread apart for allocation purposes. For example it is a very good
idea to set the 'T' attribute on the /home directory, so that /home/john
and /home/mary are placed into separate block groups. For directories
where this attribute is not set, the Orlov block allocator will try to
-group subdirectories closer together where posible.
+group subdirectories closer together where possible.
.PP
A file with the 't' attribute will not have a partial block fragment at
the end of the file merged with other files (for those filesystems which
diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c
index 61b82f6..a70cc4e 100644
--- a/misc/dumpe2fs.c
+++ b/misc/dumpe2fs.c
@@ -50,8 +50,8 @@ int hex_format = 0;
static void usage(void)
{
- fprintf (stderr, _("Usage: %s [-bfhixV] [-ob superblock] "
- "[-oB blocksize] device\n"), program_name);
+ fprintf (stderr, _("Usage: %s [-bfhixV] [-o superblock=<num>] "
+ "[-o blocksize=<num>] device\n"), program_name);
exit (1);
}
@@ -243,6 +243,10 @@ static void list_desc (ext2_filsys fs)
ino_itr += fs->super->s_inodes_per_group;
}
}
+ if (block_bitmap)
+ free(block_bitmap);
+ if (inode_bitmap)
+ free(inode_bitmap);
}
static void list_bad_blocks(ext2_filsys fs, int dump)
@@ -277,14 +281,19 @@ static void list_bad_blocks(ext2_filsys fs, int dump)
ext2fs_badblocks_list_iterate_end(bb_iter);
if (!dump)
fputc('\n', stdout);
+ ext2fs_badblocks_list_free(bb_list);
}
static void print_inline_journal_information(ext2_filsys fs)
{
+ journal_superblock_t *jsb;
struct ext2_inode inode;
+ ext2_file_t journal_file;
errcode_t retval;
ino_t ino = fs->super->s_journal_inum;
- int size;
+ char buf[1024];
+ __u32 *mask_ptr, mask, m;
+ int i, j, size, printed = 0;
retval = ext2fs_read_inode(fs, ino, &inode);
if (retval) {
@@ -292,6 +301,38 @@ static void print_inline_journal_information(ext2_filsys fs)
_("while reading journal inode"));
exit(1);
}
+ retval = ext2fs_file_open2(fs, ino, &inode, 0, &journal_file);
+ if (retval) {
+ com_err(program_name, retval,
+ _("while opening journal inode"));
+ exit(1);
+ }
+ retval = ext2fs_file_read(journal_file, buf, sizeof(buf), 0);
+ if (retval) {
+ com_err(program_name, retval,
+ _("while reading journal super block"));
+ exit(1);
+ }
+ ext2fs_file_close(journal_file);
+ jsb = (journal_superblock_t *) buf;
+ if (be32_to_cpu(jsb->s_header.h_magic) != JFS_MAGIC_NUMBER) {
+ fprintf(stderr,
+ "Journal superblock magic number invalid!\n");
+ exit(1);
+ }
+ printf(_("Journal features: "));
+ for (i=0, mask_ptr=&jsb->s_feature_compat; i <3; i++,mask_ptr++) {
+ mask = be32_to_cpu(*mask_ptr);
+ for (j=0,m=1; j < 32; j++, m<<=1) {
+ if (mask & m) {
+ printf(" %s", e2p_jrnl_feature2string(i, m));
+ printed++;
+ }
+ }
+ }
+ if (printed == 0)
+ printf(" (none)");
+ printf("\n");
fputs(_("Journal size: "), stdout);
if ((fs->super->s_feature_ro_compat &
EXT4_FEATURE_RO_COMPAT_HUGE_FILE) &&
@@ -303,6 +344,12 @@ static void print_inline_journal_information(ext2_filsys fs)
printf("%uk\n", size);
else
printf("%uM\n", size >> 10);
+ printf(_("Journal length: %u\n"
+ "Journal sequence: 0x%08x\n"
+ "Journal start: %u\n"),
+ (unsigned int)ntohl(jsb->s_maxlen),
+ (unsigned int)ntohl(jsb->s_sequence),
+ (unsigned int)ntohl(jsb->s_start));
}
static void print_journal_information(ext2_filsys fs)
diff --git a/misc/e2freefrag.8.in b/misc/e2freefrag.8.in
new file mode 100644
index 0000000..564be74
--- /dev/null
+++ b/misc/e2freefrag.8.in
@@ -0,0 +1,96 @@
+.\" -*- nroff -*-
+.TH E2FREEFRAG 8 "@E2FSPROGS_MONTH@ @E2FSPROGS_YEAR@" "E2fsprogs version @E2FSPROGS_VERSION@"
+.SH NAME
+e2freefrag \- report free space fragmentation information
+.SH SYNOPSIS
+.B e2freefrag
+[
+.B \-c chunk_kb
+]
+[
+.B \-h
+]
+.B filesys
+
+.SH DESCRIPTION
+.B e2freefrag
+is used to report free space fragmentation on ext2/3/4 file systems.
+.I filesys
+is the filesystem device name (e.g.
+.IR /dev/hdc1 ", " /dev/md0 ).
+The
+.B e2freefrag
+program will scan the block bitmap information to check how many free blocks
+are present as contiguous and aligned free space. The percentage of contiguous
+free blocks of size and of alignment
+.IR chunk_kb
+is reported. It also displays the minimum/maximum/average free chunk size in
+the filesystem, along with a histogram of all free chunks. This information
+can be used to gauge the level of free space fragmentation in the filesystem.
+.SH OPTIONS
+.TP
+.BI \-c " chunk_kb"
+If a chunk size is specified, then
+.B e2freefrag
+will print how many free chunks of size
+.I chunk_kb
+are available in units of kilobytes (Kb). The chunk size must be a
+power of two and be larger than filesystem block size.
+.TP
+.BI \-h
+Print the usage of the program.
+.SH EXAMPLE
+# e2freefrag /dev/vgroot/lvhome
+.br
+Device: /dev/vgroot/lvhome
+.br
+Blocksize: 4096 bytes
+.br
+Total blocks: 1504085
+.br
+Free blocks: 292995 (19.5%)
+.br
+
+Min. free extent: 4 KB
+.br
+Max. free extent: 24008 KB
+.br
+Avg. free extent: 252 KB
+.br
+
+HISTOGRAM OF FREE EXTENT SIZES:
+.br
+Extent Size Range : Free extents Free Blocks Percent
+.br
+ 4K... 8K- : 704 704 0.2%
+.br
+ 8K... 16K- : 810 1979 0.7%
+.br
+ 16K... 32K- : 843 4467 1.5%
+.br
+ 32K... 64K- : 579 6263 2.1%
+.br
+ 64K... 128K- : 493 11067 3.8%
+.br
+ 128K... 256K- : 394 18097 6.2%
+.br
+ 256K... 512K- : 281 25477 8.7%
+.br
+ 512K... 1024K- : 253 44914 15.3%
+.br
+ 1M... 2M- : 143 51897 17.7%
+.br
+ 2M... 4M- : 73 50683 17.3%
+.br
+ 4M... 8M- : 37 52417 17.9%
+.br
+ 8M... 16M- : 7 19028 6.5%
+.br
+ 16M... 32M- : 1 6002 2.0%
+.SH AUTHOR
+This version of e2freefrag was written by Rupesh Thakare, and modified by
+Andreas Dilger <adilger at sun.com>, and Kalpak Shah.
+.SH SEE ALSO
+.IR debugfs (8),
+.IR dumpe2fs (8),
+.IR e2fsck (8)
diff --git a/misc/e2freefrag.c b/misc/e2freefrag.c
new file mode 100644
index 0000000..a4ab994
--- /dev/null
+++ b/misc/e2freefrag.c
@@ -0,0 +1,310 @@
+/*
+ * e2freefrag - report filesystem free-space fragmentation
+ *
+ * Copyright (C) 2009 Sun Microsystems, Inc.
+ *
+ * Author: Rupesh Thakare <rupesh at sun.com>
+ * Andreas Dilger <adilger at sun.com>
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License version 2.
+ * %End-Header%
+ */
+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
+#endif
+
+#include "ext2fs/ext2_fs.h"
+#include "ext2fs/ext2fs.h"
+#include "e2freefrag.h"
+
+void usage(const char *prog)
+{
+ fprintf(stderr, "usage: %s [-c chunksize in kb] [-h] "
+ "device_name\n", prog);
+ exit(1);
+}
+
+static int ul_log2(unsigned long arg)
+{
+ int l = 0;
+
+ arg >>= 1;
+ while (arg) {
+ l++;
+ arg >>= 1;
+ }
+ return l;
+}
+
+void init_chunk_info(ext2_filsys fs, struct chunk_info *info)
+{
+ int i;
+
+ info->blocksize_bits = ul_log2((unsigned long)fs->blocksize);
+ if (info->chunkbytes) {
+ info->chunkbits = ul_log2(info->chunkbytes);
+ info->blks_in_chunk = info->chunkbytes >> info->blocksize_bits;
+ } else {
+ info->chunkbits = ul_log2(DEFAULT_CHUNKSIZE);
+ info->blks_in_chunk = DEFAULT_CHUNKSIZE >> info->blocksize_bits;
+ }
+
+ info->min = ~0UL;
+ info->max = info->avg = 0;
+ info->real_free_chunks = 0;
+
+ for (i = 0; i < MAX_HIST; i++) {
+ info->histogram.fc_chunks[i] = 0;
+ info->histogram.fc_blocks[i] = 0;
+ }
+}
+
+void update_chunk_stats(struct chunk_info *info, unsigned long chunk_size)
+{
+ unsigned long index;
+
+ index = ul_log2(chunk_size) + 1;
+ if (index >= MAX_HIST)
+ index = MAX_HIST-1;
+ info->histogram.fc_chunks[index]++;
+ info->histogram.fc_blocks[index] += chunk_size;
+
+ if (chunk_size > info->max)
+ info->max = chunk_size;
+ if (chunk_size < info->min)
+ info->min = chunk_size;
+ info->avg += chunk_size;
+ info->real_free_chunks++;
+}
+
+void scan_block_bitmap(ext2_filsys fs, struct chunk_info *info)
+{
+ unsigned long long blocks_count = fs->super->s_blocks_count;
+ unsigned long long chunks = (blocks_count + info->blks_in_chunk) >>
+ (info->chunkbits - info->blocksize_bits);
+ unsigned long long chunk_num;
+ unsigned long last_chunk_size = 0;
+ unsigned long long chunk_start_blk = 0;
+ int used;
+
+ for (chunk_num = 0; chunk_num < chunks; chunk_num++) {
+ unsigned long long blk, num_blks;
+ int chunk_free;
+
+ /* Last chunk may be smaller */
+ if (chunk_start_blk + info->blks_in_chunk > blocks_count)
+ num_blks = blocks_count - chunk_start_blk;
+ else
+ num_blks = info->blks_in_chunk;
+
+ chunk_free = 0;
+
+ /* Initialize starting block for first chunk correctly else
+ * there is a segfault when blocksize = 1024 in which case
+ * block_map->start = 1 */
+ for (blk = 0; blk < num_blks; blk++, chunk_start_blk++) {
+ if (chunk_num == 0 && blk == 0) {
+ blk = fs->super->s_first_data_block;
+ chunk_start_blk = blk;
+ }
+ used = ext2fs_fast_test_block_bitmap(fs->block_map,
+ chunk_start_blk);
+ if (!used) {
+ last_chunk_size++;
+ chunk_free++;
+ }
+
+ if (used && last_chunk_size != 0) {
+ update_chunk_stats(info, last_chunk_size);
+ last_chunk_size = 0;
+ }
+ }
+
+ if (chunk_free == info->blks_in_chunk)
+ info->free_chunks++;
+ }
+ if (last_chunk_size != 0)
+ update_chunk_stats(info, last_chunk_size);
+}
+
+errcode_t get_chunk_info(ext2_filsys fs, struct chunk_info *info)
+{
+ unsigned long total_chunks;
+ char *unitp = "KMGTPEZY";
+ int units = 10;
+ unsigned long start = 0, end, cum;
+ int i, retval = 0;
+
+ scan_block_bitmap(fs, info);
+
+ printf("Total blocks: %u\nFree blocks: %u (%0.1f%%)\n",
+ fs->super->s_blocks_count, fs->super->s_free_blocks_count,
+ (double)fs->super->s_free_blocks_count * 100 /
+ fs->super->s_blocks_count);
+
+ if (info->chunkbytes) {
+ printf("\nChunksize: %lu bytes (%u blocks)\n",
+ info->chunkbytes, info->blks_in_chunk);
+ total_chunks = (fs->super->s_blocks_count +
+ info->blks_in_chunk) >>
+ (info->chunkbits - info->blocksize_bits);
+ printf("Total chunks: %lu\nFree chunks: %lu (%0.1f%%)\n",
+ total_chunks, info->free_chunks,
+ (double)info->free_chunks * 100 / total_chunks);
+ }
+
+ /* Display chunk information in KB */
+ if (info->real_free_chunks) {
+ info->min = (info->min * fs->blocksize) >> 10;
+ info->max = (info->max * fs->blocksize) >> 10;
+ info->avg = (info->avg / info->real_free_chunks *
+ fs->blocksize) >> 10;
+ } else {
+ info->min = 0;
+ }
+
+ printf("\nMin. free extent: %lu KB \nMax. free extent: %lu KB\n"
+ "Avg. free extent: %lu KB\n", info->min, info->max, info->avg);
+
+ printf("\nHISTOGRAM OF FREE EXTENT SIZES:\n");
+ printf("%s : %12s %12s %7s\n", "Extent Size Range", "Free extents",
+ "Free Blocks", "Percent");
+ for (i = 0; i < MAX_HIST; i++) {
+ end = 1 << (i + info->blocksize_bits - units);
+ if (info->histogram.fc_chunks[i] != 0) {
+ char end_str[32];
+
+ sprintf(end_str, "%5lu%c-", end, *unitp);
+ if (i == MAX_HIST-1)
+ strcpy(end_str, "max ");
+ printf("%5lu%c...%7s : %12lu %12lu %6.2f%%\n",
+ start, *unitp, end_str,
+ info->histogram.fc_chunks[i],
+ info->histogram.fc_blocks[i],
+ (double)info->histogram.fc_blocks[i] * 100 /
+ fs->super->s_free_blocks_count);
+ }
+ start = end;
+ if (start == 1<<10) {
+ start = 1;
+ units += 10;
+ unitp++;
+ }
+ }
+
+ return retval;
+}
+
+void close_device(char *device_name, ext2_filsys fs)
+{
+ int retval = ext2fs_close(fs);
+
+ if (retval)
+ com_err(device_name, retval, "while closing the filesystem.\n");
+}
+
+void collect_info(ext2_filsys fs, struct chunk_info *chunk_info)
+{
+ unsigned int retval = 0, i, free_blks;
+
+ printf("Device: %s\n", fs->device_name);
+ printf("Blocksize: %u bytes\n", fs->blocksize);
+
+ retval = ext2fs_read_block_bitmap(fs);
+ if (retval) {
+ com_err(fs->device_name, retval, "while reading block bitmap");
+ close_device(fs->device_name, fs);
+ exit(1);
+ }
+
+ init_chunk_info(fs, chunk_info);
+
+ retval = get_chunk_info(fs, chunk_info);
+ if (retval) {
+ com_err(fs->device_name, retval, "while collecting chunk info");
+ close_device(fs->device_name, fs);
+ exit(1);
+ }
+}
+
+void open_device(char *device_name, ext2_filsys *fs)
+{
+ int retval;
+ int flag = EXT2_FLAG_FORCE;
+
+ retval = ext2fs_open(device_name, flag, 0, 0, unix_io_manager, fs);
+ if (retval) {
+ com_err(device_name, retval, "while opening filesystem");
+ exit(1);
+ }
+}
+
+int main(int argc, char *argv[])
+{
+ struct chunk_info chunk_info = { };
+ errcode_t retval = 0;
+ ext2_filsys fs = NULL;
+ char *device_name;
+ char *progname;
+ char c, *end;
+
+ add_error_table(&et_ext2_error_table);
+ progname = argv[0];
+
+ while ((c = getopt(argc, argv, "c:h")) != EOF) {
+ switch (c) {
+ case 'c':
+ chunk_info.chunkbytes = strtoull(optarg, &end, 0);
+ if (*end != '\0') {
+ fprintf(stderr, "%s: bad chunk size '%s'\n",
+ progname, optarg);
+ usage(progname);
+ }
+ if (chunk_info.chunkbytes &
+ (chunk_info.chunkbytes - 1)) {
+ fprintf(stderr, "%s: chunk size must be a "
+ "power of 2.\n", argv[0]);
+ usage(progname);
+ }
+ chunk_info.chunkbytes *= 1024;
+ break;
+ default:
+ fprintf(stderr, "%s: bad option '%c'\n",
+ progname, c);
+ case 'h':
+ usage(progname);
+ break;
+ }
+ }
+
+ if (optind == argc) {
+ fprintf(stderr, "%s: missing device name.\n", progname);
+ usage(progname);
+ }
+
+ device_name = argv[optind];
+
+ open_device(device_name, &fs);
+
+ if (chunk_info.chunkbytes && (chunk_info.chunkbytes < fs->blocksize)) {
+ fprintf(stderr, "%s: chunksize must be greater than or equal "
+ "to filesystem blocksize.\n", progname);
+ exit(1);
+ }
+ collect_info(fs, &chunk_info);
+ close_device(device_name, fs);
+
+ return retval;
+}
diff --git a/misc/e2freefrag.h b/misc/e2freefrag.h
new file mode 100644
index 0000000..80d1eef
--- /dev/null
+++ b/misc/e2freefrag.h
@@ -0,0 +1,20 @@
+#include <sys/types.h>
+
+#define DEFAULT_CHUNKSIZE (1024*1024)
+
+#define MAX_HIST 32
+struct free_chunk_histogram {
+ unsigned long fc_chunks[MAX_HIST];
+ unsigned long fc_blocks[MAX_HIST];
+};
+
+struct chunk_info {
+ unsigned long chunkbytes; /* chunk size in bytes */
+ int chunkbits; /* chunk size in bits */
+ unsigned long free_chunks; /* total free chunks of given size */
+ unsigned long real_free_chunks; /* free chunks of any size */
+ int blocksize_bits; /* fs blocksize in bits */
+ int blks_in_chunk; /* number of blocks in a chunk */
+ unsigned long min, max, avg; /* chunk size stats */
+ struct free_chunk_histogram histogram; /* histogram of all chunk sizes*/
+};
diff --git a/misc/e2image.c b/misc/e2image.c
index dd2a1ca..83c1cca 100644
--- a/misc/e2image.c
+++ b/misc/e2image.c
@@ -339,11 +339,14 @@ static void write_block(int fd, char *buf, int sparse_offset,
int name_id[256];
+#define EXT4_MAX_REC_LEN ((1<<16)-1)
+
static void scramble_dir_block(ext2_filsys fs, blk_t blk, char *buf)
{
char *p, *end, *cp;
struct ext2_dir_entry_2 *dirent;
- int rec_len, id, len;
+ unsigned int rec_len;
+ int id, len;
end = buf + fs->blocksize;
for (p = buf; p < end-8; p += rec_len) {
@@ -352,8 +355,10 @@ static void scramble_dir_block(ext2_filsys fs, blk_t blk, char *buf)
#ifdef WORDS_BIGENDIAN
rec_len = ext2fs_swab16(rec_len);
#endif
- rec_len = (rec_len || fs->blocksize < 65536) ?
- rec_len : 65536;
+ if (rec_len == EXT4_MAX_REC_LEN || rec_len == 0)
+ rec_len = fs->blocksize;
+ else
+ rec_len = (rec_len & 65532) | ((rec_len & 3) << 16);
#if 0
printf("rec_len = %d, name_len = %d\n", rec_len, dirent->name_len);
#endif
@@ -363,8 +368,10 @@ static void scramble_dir_block(ext2_filsys fs, blk_t blk, char *buf)
"bad rec_len (%d)\n", (unsigned long) blk,
rec_len);
rec_len = end - p;
+ (void) ext2fs_set_rec_len(fs, rec_len,
+ (struct ext2_dir_entry *) dirent);
#ifdef WORDS_BIGENDIAN
- dirent->rec_len = ext2fs_swab16(rec_len);
+ dirent->rec_len = ext2fs_swab16(dirent->rec_len);
#endif
continue;
}
diff --git a/misc/e2undo.c b/misc/e2undo.c
index a5a360a..2c9d536 100644
--- a/misc/e2undo.c
+++ b/misc/e2undo.c
@@ -136,6 +136,7 @@ int main(int argc, char *argv[])
bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
textdomain(NLS_CAT_NAME);
#endif
+ add_error_table(&et_ext2_error_table);
prg_name = argv[0];
while((c = getopt(argc, argv, "f")) != EOF) {
diff --git a/misc/filefrag.8.in b/misc/filefrag.8.in
index ccaa4a6..463f731 100644
--- a/misc/filefrag.8.in
+++ b/misc/filefrag.8.in
@@ -5,7 +5,7 @@ filefrag \- report on file fragmentation
.SH SYNOPSIS
.B filefrag
[
-.B \-besvx
+.B \-Bbsvx
]
[
.I files...
@@ -23,6 +23,10 @@ extent information using FIEMAP ioctl which is more efficient and faster.
If FIEMAP is not supported then filefrag will fall back to using FIBMAP.
.SH OPTIONS
.TP
+.B \-B
+Force the use of the older FIBMAP ioctl instead of the FIEMAP ioctl for
+testing purposes.
+.TP
.B \-b
Use 1024 byte blocksize for the output.
.TP
diff --git a/misc/filefrag.c b/misc/filefrag.c
index 80ac05c..1611f90 100644
--- a/misc/filefrag.c
+++ b/misc/filefrag.c
@@ -46,6 +46,7 @@ int verbose = 0;
int no_bs = 0; /* Don't use the files blocksize, use 1K blocksize */
int sync_file = 0; /* fsync file before getting the mapping */
int xattr_map = 0; /* get xattr mapping */
+int force_bmap = 0;
int logical_width = 12;
int physical_width = 14;
unsigned long long filesize;
@@ -95,8 +96,6 @@ static int get_bmap(int fd, unsigned long block, unsigned long *phy_blk)
int ret;
unsigned int b;
- printf("Calling get_bmap for block %lu\n", block);
- abort();
b = block;
ret = ioctl(fd, FIBMAP, &b); /* FIBMAP takes pointer to integer */
if (ret < 0) {
@@ -164,19 +163,21 @@ static void print_extent_info(struct fiemap_extent *fm_extent, int cur_ex,
ext_len, flags);
}
-int filefrag_fiemap(int fd, int blk_shift, int *num_extents)
+static int filefrag_fiemap(int fd, int blk_shift, int *num_extents)
{
char buf[4096] = "";
struct fiemap *fiemap = (struct fiemap *)buf;
struct fiemap_extent *fm_ext = &fiemap->fm_extents[0];
int count = (sizeof(buf) - sizeof(*fiemap)) /
sizeof(struct fiemap_extent);
- unsigned long long logical_blk = 0, last_blk = 0;
+ unsigned long long last_blk = 0;
unsigned long flags = 0;
+ unsigned int i;
static int fiemap_incompat_printed;
+ int fiemap_header_printed = 0;
int tot_extents = 1, n = 0;
- int last = 0, eof = 0;
- int i, rc;
+ int last = 0;
+ int rc;
fiemap->fm_length = ~0ULL;
@@ -191,25 +192,26 @@ int filefrag_fiemap(int fd, int blk_shift, int *num_extents)
if (xattr_map)
flags |= FIEMAP_FLAG_XATTR;
- if (verbose)
- printf(" ext %*s %*s %*s length flags\n", logical_width,
- "logical", physical_width, "physical",
- physical_width, "expected");
-
do {
fiemap->fm_length = ~0ULL;
fiemap->fm_flags = flags;
fiemap->fm_extent_count = count;
rc = ioctl(fd, FS_IOC_FIEMAP, (unsigned long) fiemap);
- if (rc == -EBADR) {
- if (fiemap_incompat_printed == 0) {
+ if (rc < 0) {
+ if (errno == EBADR && fiemap_incompat_printed == 0) {
printf("FIEMAP failed with unsupported "
"flags %x\n", fiemap->fm_flags);
fiemap_incompat_printed = 1;
}
- }
- if (rc)
return rc;
+ }
+
+ if (verbose && !fiemap_header_printed) {
+ printf(" ext %*s %*s %*s length flags\n", logical_width,
+ "logical", physical_width, "physical",
+ physical_width, "expected");
+ fiemap_header_printed = 1;
+ }
if (!verbose) {
*num_extents = fiemap->fm_mapped_extents;
@@ -221,7 +223,7 @@ int filefrag_fiemap(int fd, int blk_shift, int *num_extents)
break;
for (i = 0; i < fiemap->fm_mapped_extents; i++) {
- __u64 phy_blk, phy_start, logical_blk;
+ __u64 phy_blk, logical_blk;
unsigned long ext_len;
phy_blk = fm_ext[i].fe_physical >> blk_shift;
@@ -240,8 +242,8 @@ int filefrag_fiemap(int fd, int blk_shift, int *num_extents)
n++;
}
- fiemap->fm_start += fm_ext[i-1].fe_logical +
- fm_ext[i-1].fe_length;
+ fiemap->fm_start = (fm_ext[i-1].fe_logical +
+ fm_ext[i-1].fe_length);
} while (last == 0);
*num_extents = tot_extents;
@@ -268,7 +270,6 @@ static void frag_report(const char *filename)
int is_ext2 = 0;
static int once = 1;
unsigned int flags;
- unsigned long first_blk, last_blk;
int rc;
#ifdef HAVE_OPEN64
@@ -331,20 +332,24 @@ static void frag_report(const char *filename)
printf("File size of %s is %lld (%ld block%s, blocksize %d)\n",
filename, (long long) fileinfo.st_size, numblocks,
numblocks == 1 ? "" : "s", bs);
- if (filefrag_fiemap(fd, int_log2(bs), &num_extents) != 0) {
- for (i = 0; i < numblocks; i++) {
+ if (force_bmap ||
+ filefrag_fiemap(fd, int_log2(bs), &num_extents) != 0) {
+ for (i = 0, count = 0; i < numblocks; i++) {
if (is_ext2 && last_block) {
if (((i-EXT2_DIRECT) % bpib) == 0)
last_block++;
if (((i-EXT2_DIRECT-bpib) % (bpib*bpib)) == 0)
last_block++;
if (((i-EXT2_DIRECT-bpib-bpib*bpib) %
- (bpib*bpib*bpib)) == 0)
+ (((__u64) bpib)*bpib*bpib)) == 0)
last_block++;
}
rc = get_bmap(fd, i, &block);
if (block == 0)
continue;
+ if (!num_extents)
+ num_extents++;
+ count++;
if (last_block && (block != last_block+1) ) {
if (verbose)
printf("Discontinuity: Block %ld is at "
@@ -371,7 +376,7 @@ static void frag_report(const char *filename)
static void usage(const char *progname)
{
- fprintf(stderr, "Usage: %s [-bvsx] file ...\n", progname);
+ fprintf(stderr, "Usage: %s [-Bbvsx] file ...\n", progname);
exit(1);
}
@@ -379,10 +384,12 @@ int main(int argc, char**argv)
{
char **cpp;
int c;
- int ret;
- while ((c = getopt(argc, argv, "bsvx")) != EOF)
+ while ((c = getopt(argc, argv, "Bbsvx")) != EOF)
switch (c) {
+ case 'B':
+ force_bmap++;
+ break;
case 'b':
no_bs++;
break;
diff --git a/misc/ismounted.c b/misc/ismounted.c
index 6d4b878..50b4140 100644
--- a/misc/ismounted.c
+++ b/misc/ismounted.c
@@ -86,9 +86,6 @@ static errcode_t check_mntent_file(const char *mtab_file, const char *file,
char buf[1024], *device = 0, *mnt_dir = 0, *cp;
*mount_flags = 0;
- if ((f = fopen(mtab_file, "r")) == NULL)
- return errno;
-
if ((f = setmntent (mtab_file, "r")) == NULL)
return errno;
if (stat(file, &st_buf) == 0) {
diff --git a/misc/logsave.c b/misc/logsave.c
index 81ac9f6..43eb6f7 100644
--- a/misc/logsave.c
+++ b/misc/logsave.c
@@ -74,13 +74,32 @@ static int write_all(int fd, const char *buf, size_t count)
static void send_output(const char *buffer, int c, int flag)
{
- char *n;
+ const char *cp;
+ char *n;
+ int cnt, d, del;
if (c == 0)
c = strlen(buffer);
- if (flag & SEND_CONSOLE)
- write_all(1, buffer, c);
+ if (flag & SEND_CONSOLE) {
+ cnt = c;
+ cp = buffer;
+ while (cnt) {
+ del = 0;
+ for (d=0; d < cnt; d++) {
+ if (skip_mode &&
+ (cp[d] == '\001' || cp[d] == '\002')) {
+ del = 1;
+ break;
+ }
+ }
+ write_all(1, cp, d);
+ if (del)
+ d++;
+ cnt -= d;
+ cp += d;
+ }
+ }
if (!(flag & SEND_LOG))
return;
if (outfd > 0)
diff --git a/misc/lsattr.c b/misc/lsattr.c
index 254ebb4..15b17ad 100644
--- a/misc/lsattr.c
+++ b/misc/lsattr.c
@@ -74,7 +74,7 @@ static void usage(void)
exit(1);
}
-static void list_attributes (const char * name)
+static int list_attributes (const char * name)
{
unsigned long flags;
unsigned long generation;
@@ -82,14 +82,14 @@ static void list_attributes (const char * name)
if (fgetflags (name, &flags) == -1) {
com_err (program_name, errno, _("While reading flags on %s"),
name);
- return;
+ return -1;
}
if (generation_opt) {
if (fgetversion (name, &generation) == -1) {
com_err (program_name, errno,
_("While reading version on %s"),
name);
- return;
+ return -1;
}
printf ("%5lu ", generation);
}
@@ -101,23 +101,27 @@ static void list_attributes (const char * name)
print_flags(stdout, flags, pf_options);
printf(" %s\n", name);
}
+ return 0;
}
static int lsattr_dir_proc (const char *, struct dirent *, void *);
-static void lsattr_args (const char * name)
+static int lsattr_args (const char * name)
{
STRUCT_STAT st;
+ int retval = 0;
- if (LSTAT (name, &st) == -1)
+ if (LSTAT (name, &st) == -1) {
com_err (program_name, errno, _("while trying to stat %s"),
name);
- else {
+ retval = -1;
+ } else {
if (S_ISDIR(st.st_mode) && !dirs_opt)
- iterate_on_dir (name, lsattr_dir_proc, NULL);
+ retval = iterate_on_dir (name, lsattr_dir_proc, NULL);
else
- list_attributes (name);
+ retval = list_attributes (name);
}
+ return retval;
}
static int lsattr_dir_proc (const char * dir_name, struct dirent * de,
@@ -155,6 +159,7 @@ int main (int argc, char ** argv)
{
int c;
int i;
+ int err, retval = 0;
#ifdef ENABLE_NLS
setlocale(LC_MESSAGES, "");
@@ -192,10 +197,15 @@ int main (int argc, char ** argv)
if (verbose)
fprintf (stderr, "lsattr %s (%s)\n",
E2FSPROGS_VERSION, E2FSPROGS_DATE);
- if (optind > argc - 1)
- lsattr_args (".");
- else
- for (i = optind; i < argc; i++)
- lsattr_args (argv[i]);
- exit(0);
+ if (optind > argc - 1) {
+ if (lsattr_args (".") == -1)
+ retval = 1;
+ } else {
+ for (i = optind; i < argc; i++) {
+ err = lsattr_args (argv[i]);
+ if (err)
+ retval = 1;
+ }
+ }
+ exit(retval);
}
diff --git a/misc/mke2fs.8.in b/misc/mke2fs.8.in
index 1575b08..45a99f8 100644
--- a/misc/mke2fs.8.in
+++ b/misc/mke2fs.8.in
@@ -45,6 +45,9 @@ mke2fs \- create an ext2/ext3/ext4 filesystem
.I journal-options
]
[
+.B \-K
+]
+[
.B \-N
.I number-of-inodes
]
@@ -267,10 +270,12 @@ are developing test cases.
.TP
.BI \-G " number-of-groups"
Specify the number of block groups that will be packed together to
-create one large virtual block group on an ext4 filesystem. This
-improves meta-data locality and performance on meta-data heavy
-workloads. The number of groups must be a power of 2 and may only be
-specified if the flex_bg filesystem feature is enabled.
+create a larger virtual block group (or "flex_bg group") in an
+ext4 filesystem. This improves meta-data locality and performance
+on meta-data heavy workloads. The number of groups must be a power
+of 2 and may only be specified if the
+.B flex_bg
+filesystem feature is enabled.
.TP
.BI \-i " bytes-per-inode"
Specify the bytes/inode ratio.
@@ -364,6 +369,10 @@ and may be no more than 102,400 filesystem blocks.
@JDEV at .BR size " or " device
@JDEV at options can be given for a filesystem.
.TP
+.BI \-K
+Keep, do not attempt to discard blocks at mkfs time (discarding blocks initially
+is useful on solid state devices and sparse / thin-provisioned storage).
+.TP
.BI \-l " filename"
Read the bad blocks list from
.IR filename .
@@ -468,20 +477,27 @@ prefix the feature name with a caret ('^') character. The
pseudo-filesystem feature "none" will clear all filesystem features.
.RS 1.2i
.TP
-.B large_file
-Filesystem can contain files that are greater than 2GB. (Modern kernels
-set this feature automatically when a file > 2GB is created.)
-.TP
.B dir_index
Use hashed b-trees to speed up lookups in large directories.
.TP
+.B extent
+Instead of using the indirect block scheme for storing the location of
+data blocks in an inode, use extents instead. This is a much more
+efficient encoding which speeds up filesystem access, especially for
+large files.
+.TP
.B filetype
Store file type information in directory entries.
.TP
.B flex_bg
-Allow bitmaps and inode tables for a block group to be placed anywhere
-on the storage media (use with \-G option to group meta-data in order
-to create a large virtual block group).
+Allow the per-block group metadata (allocation bitmaps and inode tables)
+to be placed anywhere on the storage media. In addition,
+.B mke2fs
+will place the per-block group metadata together starting at the first
+block group of each "flex_bg group". The size of the flex_bg group
+can be specified using the
+.B \-G
+option.
.TP
.B has_journal
Create an ext3 journal (as if using the
@@ -496,21 +512,9 @@ option).
@JDEV at must be created with the same
@JDEV at block size as the filesystems that will be using it.
.TP
-.B extent
-Instead of using the indirect block scheme for storing the location of
-data blocks in an inode, use extents instead. This is a much more
-efficient encoding which speeds up filesystem access, especially for
-large files.
-.TP
-.B uninit_bg
-Create a filesystem without initializing all of the block groups. This
-feature also enables checksums and highest-inode-used statistics in each
-blockgroup. This feature can
-speed up filesystem creation time noticeably (if lazy_itable_init is
-enabled), and can also reduce
-.BR e2fsck
-time dramatically. It is only supported by the ext4 filesystem in
-recent Linux kernels.
+.B large_file
+Filesystem can contain files that are greater than 2GB. (Modern kernels
+set this feature automatically when a file > 2GB is created.)
.TP
.B resize_inode
Reserve space so the block group descriptor table may grow in the future.
@@ -527,6 +531,16 @@ extended option.
.B sparse_super
Create a filesystem with fewer superblock backup copies
(saves space on large filesystems).
+.TP
+.B uninit_bg
+Create a filesystem without initializing all of the block groups. This
+feature also enables checksums and highest-inode-used statistics in each
+blockgroup. This feature can
+speed up filesystem creation time noticeably (if lazy_itable_init is
+enabled), and can also reduce
+.BR e2fsck
+time dramatically. It is only supported by the ext4 filesystem in
+recent Linux kernels.
.RE
.TP
.B \-q
diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index a9b01cb..b386f65 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -20,6 +20,7 @@
#include <stdio.h>
#include <string.h>
+#include <strings.h>
#include <fcntl.h>
#include <ctype.h>
#include <time.h>
@@ -46,8 +47,10 @@ extern int optind;
#endif
#include <sys/ioctl.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <libgen.h>
#include <limits.h>
+#include <blkid/blkid.h>
#include "ext2fs/ext2_fs.h"
#include "et/com_err.h"
@@ -77,6 +80,7 @@ int cflag;
int verbose;
int quiet;
int super_only;
+int discard = 1;
int force;
int noaction;
int journal_size;
@@ -109,7 +113,7 @@ static void usage(void)
"\t[-g blocks-per-group] [-L volume-label] "
"[-M last-mounted-directory]\n\t[-O feature[,...]] "
"[-r fs-revision] [-E extended-option[,...]]\n"
- "\t[-T fs-type] [-U UUID] [-jnqvFSV] device [blocks-count]\n"),
+ "\t[-T fs-type] [-U UUID] [-jnqvFKSV] device [blocks-count]\n"),
program_name);
exit(1);
}
@@ -613,6 +617,8 @@ static void show_stats(ext2_filsys fs)
s->s_log_block_size);
printf(_("Fragment size=%u (log=%u)\n"), fs->fragsize,
s->s_log_frag_size);
+ printf(_("Stride=%u blocks, Stripe width=%u blocks\n"),
+ s->s_raid_stride, s->s_raid_stripe_width);
printf(_("%u inodes, %u blocks\n"), s->s_inodes_count,
s->s_blocks_count);
printf(_("%u blocks (%2.2f%%) reserved for the super user\n"),
@@ -1072,6 +1078,48 @@ static int get_bool_from_profile(char **fs_types, const char *opt, int def_val)
extern const char *mke2fs_default_profile;
static const char *default_files[] = { "<default>", 0 };
+#ifdef HAVE_BLKID_PROBE_GET_TOPOLOGY
+/*
+ * Sets the geometry of a device (stripe/stride), and returns the
+ * device's alignment offset, if any, or a negative error.
+ */
+static int ext2fs_get_device_geometry(const char *file,
+ struct ext2_super_block *fs_param)
+{
+ int rc = -1;
+ int blocksize;
+ blkid_probe pr;
+ blkid_topology tp;
+ unsigned long min_io;
+ unsigned long opt_io;
+ struct stat statbuf;
+
+ /* Nothing to do for a regular file */
+ if (!stat(file, &statbuf) && S_ISREG(statbuf.st_mode))
+ return 0;
+
+ pr = blkid_new_probe_from_filename(file);
+ if (!pr)
+ goto out;
+
+ tp = blkid_probe_get_topology(pr);
+ if (!tp)
+ goto out;
+
+ min_io = blkid_topology_get_minimum_io_size(tp);
+ opt_io = blkid_topology_get_optimal_io_size(tp);
+ blocksize = EXT2_BLOCK_SIZE(fs_param);
+
+ fs_param->s_raid_stride = min_io / blocksize;
+ fs_param->s_raid_stripe_width = opt_io / blocksize;
+
+ rc = blkid_topology_get_alignment_offset(tp);
+out:
+ blkid_free_probe(pr);
+ return rc;
+}
+#endif
+
static void PRS(int argc, char *argv[])
{
int b, c;
@@ -1165,7 +1213,7 @@ static void PRS(int argc, char *argv[])
}
while ((c = getopt (argc, argv,
- "b:cf:g:G:i:jl:m:no:qr:s:t:vE:FI:J:L:M:N:O:R:ST:U:V")) != EOF) {
+ "b:cf:g:G:i:jl:m:no:qr:s:t:vE:FI:J:KL:M:N:O:R:ST:U:V")) != EOF) {
switch (c) {
case 'b':
blocksize = strtol(optarg, &tmp, 0);
@@ -1244,6 +1292,9 @@ static void PRS(int argc, char *argv[])
case 'J':
parse_journal_opts(optarg);
break;
+ case 'K':
+ discard = 0;
+ break;
case 'j':
if (!journal_size)
journal_size = -1;
@@ -1632,6 +1683,21 @@ got_size:
fs_param.s_log_frag_size = fs_param.s_log_block_size =
int_log2(blocksize >> EXT2_MIN_BLOCK_LOG_SIZE);
+#ifdef HAVE_BLKID_PROBE_GET_TOPOLOGY
+ retval = ext2fs_get_device_geometry(device_name, &fs_param);
+ if (retval < 0) {
+ fprintf(stderr,
+ _("warning: Unable to get device geometry for %s\n"),
+ device_name);
+ } else if (retval) {
+ printf(_("%s alignment is offset by %lu bytes.\n"),
+ device_name, retval);
+ printf(_("This may result in very poor performance, "
+ "(re)-partitioning suggested.\n"));
+ proceed_question();
+ }
+#endif
+
blocksize = EXT2_BLOCK_SIZE(&fs_param);
lazy_itable_init = get_bool_from_profile(fs_types,
@@ -1850,6 +1916,48 @@ static int mke2fs_setup_tdb(const char *name, io_manager *io_ptr)
return retval;
}
+#ifdef __linux__
+
+#ifndef BLKDISCARD
+#define BLKDISCARD _IO(0x12,119)
+#endif
+
+static void mke2fs_discard_blocks(ext2_filsys fs)
+{
+ int fd;
+ int ret;
+ int blocksize;
+ __u64 blocks;
+ __uint64_t range[2];
+
+ blocks = fs->super->s_blocks_count;
+ blocksize = EXT2_BLOCK_SIZE(fs->super);
+ range[0] = 0;
+ range[1] = blocks * blocksize;
+
+ fd = open64(fs->device_name, O_RDWR);
+
+ /*
+ * We don't care about whether the ioctl succeeds; it's only an
+ * optmization for SSDs or sparse storage.
+ */
+ if (fd > 0) {
+ ret = ioctl(fd, BLKDISCARD, &range);
+ if (verbose) {
+ printf(_("Calling BLKDISCARD from %llu to %llu "),
+ range[0], range[1]);
+ if (ret)
+ printf(_("failed.\n"));
+ else
+ printf(_("succeeded.\n"));
+ }
+ close(fd);
+ }
+}
+#else
+#define mke2fs_discard_blocks(fs)
+#endif
+
int main (int argc, char *argv[])
{
errcode_t retval = 0;
@@ -1893,6 +2001,11 @@ int main (int argc, char *argv[])
com_err(device_name, retval, _("while setting up superblock"));
exit(1);
}
+
+ /* Can't undo discard ... */
+ if (discard && (io_ptr != undo_io_manager))
+ mke2fs_discard_blocks(fs);
+
sprintf(tdb_string, "tdb_data_size=%d", fs->blocksize <= 4096 ?
32768 : fs->blocksize * 8);
io_channel_set_options(fs->io, tdb_string);
diff --git a/misc/mke2fs.conf b/misc/mke2fs.conf
index 3795b1e..52fe58e 100644
--- a/misc/mke2fs.conf
+++ b/misc/mke2fs.conf
@@ -9,11 +9,11 @@
features = has_journal
}
ext4 = {
- features = has_journal,extents,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
+ features = has_journal,extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
inode_size = 256
}
ext4dev = {
- features = has_journal,extents,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
+ features = has_journal,extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
inode_size = 256
options = test_fs=1
}
diff --git a/misc/tune2fs.8.in b/misc/tune2fs.8.in
index 4abc728..62934f7 100644
--- a/misc/tune2fs.8.in
+++ b/misc/tune2fs.8.in
@@ -219,13 +219,15 @@ it is converted to a numerical gid before it is stored in the superblock.
.TP
.B \-i " \fIinterval-between-checks\fR[\fBd\fR|\fBm\fR|\fBw\fR]"
Adjust the maximal time between two filesystem checks.
-No postfix or
+No suffix or
.B d
-result in days,
+will interpret the number
+.I interval-between-checks
+as days,
.B m
-in months, and
+as months, and
.B w
-in weeks. A value of zero will disable the time-dependent checking.
+as weeks. A value of zero will disable the time-dependent checking.
.sp
It is strongly recommended that either
.B \-c
@@ -431,24 +433,30 @@ The following filesystem features can be set or cleared using
.BR tune2fs :
.RS 1.2i
.TP
-.B large_file
-Filesystem can contain files that are greater than 2GB. (Modern kernels
-set this feature automatically when a file > 2GB is created.)
-.TP
.B dir_index
Use hashed b-trees to speed up lookups in large directories.
.TP
.B filetype
Store file type information in directory entries.
.TP
+.B flex_bg
+Allow bitmaps and inode tables for a block group to be placed
+anywhere on the storage media. \fBTune2fs\fR will not reorganize
+the location of the inode tables and allocation bitmaps, as
+.BR mke2fs (8)
+will do when it creates a freshly formated file system with
+.B flex_bg
+enabled.
+.TP
.B has_journal
Use a journal to ensure filesystem consistency even across unclean shutdowns.
Setting the filesystem feature is equivalent to using the
.B \-j
option.
.TP
-.B sparse_super
-Limit the number of backup superblocks to save space on large filesystems.
+.B large_file
+Filesystem can contain files that are greater than 2GB. (Modern kernels
+set this feature automatically when a file > 2GB is created.)
.TP
.B resize_inode
Reserve space so the block group descriptor table may grow in the
@@ -456,6 +464,9 @@ future.
.B Tune2fs
only supports clearing this filesystem feature.
.TP
+.B sparse_super
+Limit the number of backup superblocks to save space on large filesystems.
+.TP
.B uninit_bg
Allow the kernel to initialize bitmaps and inode tables and keep a high
watermark for the unused inodes in a filesystem, to reduce
@@ -483,7 +494,7 @@ feature,
.B e2fsck -D
can be run to convert existing directories to the hashed B-tree format.
Enabling certain filesystem features may prevent the filesystem from being
-mounted by kernels which do not support those features. In particular the
+mounted by kernels which do not support those features. In particular, the
.BR uninit_bg
and
.BR flex_bg
diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 0af116c..41a0638 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -962,42 +962,40 @@ static void parse_extended_opts(ext2_filsys fs, const char *opts)
}
/*
- * Fill in two bitmaps that we need to to control the inode resizing
- * process. The first is the set of blocks that must be moved, and
- * the second is the set of blocks which are allocation bitmap blocks
- * and must be treated specially.
+ * Fill in the block bitmap bmap with the information regarding the
+ * blocks to be moved
*/
static int get_move_bitmaps(ext2_filsys fs, int new_ino_blks_per_grp,
- ext2fs_block_bitmap bmap,
- ext2fs_block_bitmap metadata_bmap)
+ ext2fs_block_bitmap bmap)
{
dgrp_t i;
+ int retval;
+ ext2_badblocks_list bb_list = 0;
blk_t j, needed_blocks = 0;
- blk_t i_bmap, b_bmap;
blk_t start_blk, end_blk;
- int num, k;
- for (i = 0; i < fs->group_desc_count; i++) {
- b_bmap = fs->group_desc[i].bg_block_bitmap;
- ext2fs_mark_block_bitmap(metadata_bmap, b_bmap);
- i_bmap = fs->group_desc[i].bg_inode_bitmap;
- ext2fs_mark_block_bitmap(metadata_bmap, i_bmap);
+ retval = ext2fs_read_bb_inode(fs, &bb_list);
+ if (retval)
+ return retval;
+ for (i = 0; i < fs->group_desc_count; i++) {
start_blk = fs->group_desc[i].bg_inode_table +
fs->inode_blocks_per_group;
end_blk = fs->group_desc[i].bg_inode_table +
new_ino_blks_per_grp;
- num=0;
for (j = start_blk; j < end_blk; j++) {
if (ext2fs_test_block_bitmap(fs->block_map, j)) {
- /* FIXME!!
- * What happens if the block is marked
- * as a bad block
+ /*
+ * IF the block is a bad block we fail
*/
+ if (ext2fs_badblocks_list_test(bb_list, j)) {
+ ext2fs_badblocks_list_free(bb_list);
+ return ENOSPC;
+ }
+
ext2fs_mark_block_bitmap(bmap, j);
- needed_blocks++;
} else {
/*
* We are going to use this block for
@@ -1005,27 +1003,52 @@ static int get_move_bitmaps(ext2_filsys fs, int new_ino_blks_per_grp,
*/
ext2fs_mark_block_bitmap(fs->block_map, j);
}
- if ((j == i_bmap) || (j == b_bmap))
- num++;
}
- if (num <= fs->group_desc[i].bg_free_blocks_count)
- continue;
+ needed_blocks += end_blk - start_blk;
}
+ ext2fs_badblocks_list_free(bb_list);
if (needed_blocks > fs->super->s_free_blocks_count)
return ENOSPC;
return 0;
}
-static int move_block(ext2_filsys fs, ext2fs_block_bitmap bmap,
- ext2fs_block_bitmap metadata_bmap)
+static int ext2fs_is_meta_block(ext2_filsys fs, blk_t blk)
+{
+ dgrp_t group;
+ group = ext2fs_group_of_blk(fs, blk);
+ if (fs->group_desc[group].bg_block_bitmap == blk)
+ return 1;
+ if (fs->group_desc[group].bg_inode_bitmap == blk)
+ return 1;
+ return 0;
+}
+
+static int ext2fs_is_block_in_group(ext2_filsys fs, dgrp_t group, blk_t blk)
+{
+ blk_t start_blk, end_blk;
+ start_blk = fs->super->s_first_data_block +
+ EXT2_BLOCKS_PER_GROUP(fs->super) * group;
+ /*
+ * We cannot get new block beyond end_blk for for the last block group
+ * so we can check with EXT2_BLOCKS_PER_GROUP even for last block group
+ */
+ end_blk = start_blk + EXT2_BLOCKS_PER_GROUP(fs->super);
+ if (blk >= start_blk && blk <= end_blk)
+ return 1;
+ return 0;
+}
+
+static int move_block(ext2_filsys fs, ext2fs_block_bitmap bmap)
{
+
char *buf;
+ dgrp_t group;
errcode_t retval;
+ int meta_data = 0;
blk_t blk, new_blk, goal;
struct blk_move *bmv;
- dgrp_t group;
retval = ext2fs_get_mem(fs->blocksize, &buf);
if (retval)
@@ -1036,20 +1059,31 @@ static int move_block(ext2_filsys fs, ext2fs_block_bitmap bmap,
if (!ext2fs_test_block_bitmap(bmap, blk))
continue;
- /*
- * If the block is a bitmap block, find a new block in
- * the same block group.
- */
- if (ext2fs_test_block_bitmap(metadata_bmap, blk)) {
+ if (ext2fs_is_meta_block(fs, blk)) {
+ /*
+ * If the block is mapping a fs meta data block
+ * like group desc/block bitmap/inode bitmap. We
+ * should find a block in the same group and fix
+ * the respective fs metadata pointers. Otherwise
+ * fail
+ */
group = ext2fs_group_of_blk(fs, blk);
goal = ext2fs_group_first_block(fs, group);
- } else
- goal = new_blk;
+ meta_data = 1;
+ } else {
+ goal = new_blk;
+ }
retval = ext2fs_new_block(fs, goal, NULL, &new_blk);
if (retval)
goto err_out;
+ /* new fs meta data block should be in the same group */
+ if (meta_data && !ext2fs_is_block_in_group(fs, group, new_blk)) {
+ retval = ENOSPC;
+ goto err_out;
+ }
+
/* Mark this block as allocated */
ext2fs_mark_block_bitmap(fs->block_map, new_blk);
@@ -1214,7 +1248,6 @@ static int group_desc_scan_and_fix(ext2_filsys fs, ext2fs_block_bitmap bmap)
return 0;
}
-
static int expand_inode_table(ext2_filsys fs, unsigned long new_ino_size)
{
dgrp_t i;
@@ -1367,7 +1400,7 @@ static int resize_inode(ext2_filsys fs, unsigned long new_size)
{
errcode_t retval;
int new_ino_blks_per_grp;
- ext2fs_block_bitmap bmap, metadata_bmap;
+ ext2fs_block_bitmap bmap;
ext2fs_read_inode_bitmap(fs);
ext2fs_read_block_bitmap(fs);
@@ -1387,34 +1420,33 @@ static int resize_inode(ext2_filsys fs, unsigned long new_size)
retval = ext2fs_allocate_block_bitmap(fs, _("blocks to be moved"),
&bmap);
- if (retval)
- return retval;
-
- retval = ext2fs_allocate_block_bitmap(fs, _("blocks to be moved"),
- &metadata_bmap);
- if (retval)
+ if (retval) {
+ fputs(_("Failed to allocate block bitmap when "
+ "increasing inode size\n"), stderr);
return retval;
-
- retval = get_move_bitmaps(fs, new_ino_blks_per_grp, bmap,
- metadata_bmap);
- if (retval)
+ }
+ retval = get_move_bitmaps(fs, new_ino_blks_per_grp, bmap);
+ if (retval) {
+ fputs(_("Not enough space to increase inode size \n"), stderr);
goto err_out;
-
- retval = move_block(fs, bmap, metadata_bmap);
- if (retval)
+ }
+ retval = move_block(fs, bmap);
+ if (retval) {
+ fputs(_("Failed to relocate blocks during inode resize \n"),
+ stderr);
goto err_out;
-
+ }
retval = inode_scan_and_fix(fs, bmap);
if (retval)
- goto err_out;
+ goto err_out_undo;
retval = group_desc_scan_and_fix(fs, bmap);
if (retval)
- goto err_out;
+ goto err_out_undo;
retval = expand_inode_table(fs, new_size);
if (retval)
- goto err_out;
+ goto err_out_undo;
ext2fs_calculate_summary_stats(fs);
@@ -1428,6 +1460,15 @@ err_out:
ext2fs_free_block_bitmap(bmap);
return retval;
+
+err_out_undo:
+ free_blk_move_list();
+ ext2fs_free_block_bitmap(bmap);
+ fputs(_("Error in resizing the inode size.\n"
+ "Run e2undo to undo the "
+ "file system changes. \n"), stderr);
+
+ return retval;
}
static int tune2fs_setup_tdb(const char *name, io_manager *io_ptr)
@@ -1744,11 +1785,7 @@ retry_open:
* with the new free inode count
*/
fs->flags &= ~EXT2_FLAG_SUPER_ONLY;
- if (resize_inode(fs, new_inode_size)) {
- fputs(_("Error in resizing the inode size.\n"
- "Run e2undo to undo the "
- "file system changes. \n"), stderr);
- } else {
+ if (resize_inode(fs, new_inode_size) == 0) {
printf(_("Setting inode size %lu\n"),
new_inode_size);
}
@@ -1766,6 +1803,7 @@ retry_open:
ext2fs_mark_super_dirty(fs);
printf(_("Setting stripe width to %d\n"), stripe_width);
}
+ free(device_name);
remove_error_table(&et_ext2_error_table);
return (ext2fs_close(fs) ? 1 : 0);
}
diff --git a/misc/uuidd.c b/misc/uuidd.c
index e2d3656..89bff72 100644
--- a/misc/uuidd.c
+++ b/misc/uuidd.c
@@ -85,19 +85,23 @@ static void create_daemon(void)
die("setreuid");
}
-static int read_all(int fd, char *buf, size_t count)
+static ssize_t read_all(int fd, char *buf, size_t count)
{
ssize_t ret;
- int c = 0;
+ ssize_t c = 0;
+ int tries = 0;
memset(buf, 0, count);
while (count > 0) {
ret = read(fd, buf, count);
- if (ret < 0) {
- if ((errno == EAGAIN) || (errno == EINTR))
+ if (ret <= 0) {
+ if ((errno == EAGAIN || errno == EINTR || ret == 0) &&
+ (tries++ < 5))
continue;
- return -1;
+ return c ? c : -1;
}
+ if (ret > 0)
+ tries = 0;
count -= ret;
buf += ret;
c += ret;
@@ -276,6 +280,18 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
}
/*
+ * Make sure the socket isn't using fd numbers 0-2 to avoid it
+ * getting closed by create_daemon()
+ */
+ while (!debug && s <= 2) {
+ s = dup(s);
+ if (s < 0) {
+ perror("dup");
+ exit(1);
+ }
+ }
+
+ /*
* Create the address we will be binding to.
*/
my_addr.sun_family = AF_UNIX;
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 25032ac..843b021 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -61,8 +61,8 @@ CATALOGS = @CATALOGS@
.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
.po.mo:
- @echo "$(MSGFMT) -c -o $@ $<"; \
- $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+ $(E) "$(MSGFMT) -c -o $@ $<"
+ $(Q) $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
.po.gmo:
@lang=`echo $* | sed -e 's,.*/,,'`; \
diff --git a/po/cs.gmo b/po/cs.gmo
index cc4aa07..13d9bb5 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index 3237222..cdfde75 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -64,34 +64,34 @@
#.
msgid ""
msgstr ""
-"Project-Id-Version: e2fsprogs 1.41.1\n"
+"Project-Id-Version: e2fsprogs 1.41.8\n"
"Report-Msgid-Bugs-To: tytso at alum.mit.edu\n"
-"POT-Creation-Date: 2008-08-29 23:13-0400\n"
-"PO-Revision-Date: 2009-03-02 18:07+0100\n"
+"POT-Creation-Date: 2009-07-11 17:49-0400\n"
+"PO-Revision-Date: 2009-11-24 21:32+0100\n"
"Last-Translator: Petr Pisar <petr.pisar at atlas.cz>\n"
"Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: e2fsck/badblocks.c:22 misc/mke2fs.c:164
+#: e2fsck/badblocks.c:22 misc/mke2fs.c:165
#, c-format
msgid "Bad block %u out of range; ignored.\n"
msgstr "Špatný blok %u mimo rozsah; ignorován.\n"
#: e2fsck/badblocks.c:45
msgid "while sanity checking the bad blocks inode"
-msgstr "při kontrole správnosti inode špatných bloků"
+msgstr "při kontrole správnosti iuzlu špatných bloků"
#: e2fsck/badblocks.c:57
msgid "while reading the bad blocks inode"
-msgstr "pÅ™i Ätenà inode Å¡patných bloků"
+msgstr "pÅ™i Ätenà iuzlu Å¡patných bloků"
#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:1020 e2fsck/unix.c:1103 misc/badblocks.c:1102
-#: misc/badblocks.c:1110 misc/badblocks.c:1124 misc/badblocks.c:1136
-#: misc/dumpe2fs.c:505 misc/e2image.c:573 misc/e2image.c:669
-#: misc/e2image.c:685 misc/mke2fs.c:180 misc/tune2fs.c:1449 resize/main.c:304
+#: e2fsck/unix.c:1057 e2fsck/unix.c:1140 misc/badblocks.c:1155
+#: misc/badblocks.c:1163 misc/badblocks.c:1177 misc/badblocks.c:1189
+#: misc/dumpe2fs.c:510 misc/e2image.c:583 misc/e2image.c:679
+#: misc/e2image.c:695 misc/mke2fs.c:181 misc/tune2fs.c:1532 resize/main.c:310
#, c-format
msgid "while trying to open %s"
msgstr "pÅ™i pokusu otevÅ™Ãt %s"
@@ -101,43 +101,43 @@ msgstr "pÅ™i pokusu otevÅ™Ãt %s"
msgid "while trying popen '%s'"
msgstr "při pokusu popen „%s“"
-#: e2fsck/badblocks.c:93 misc/mke2fs.c:187
+#: e2fsck/badblocks.c:93 misc/mke2fs.c:188
msgid "while reading in list of bad blocks from file"
msgstr "pÅ™i naÄÃtánà seznamu Å¡patných bloků ze souboru"
#: e2fsck/badblocks.c:104
msgid "while updating bad block inode"
-msgstr "při aktualizaci inode špatných bloků"
+msgstr "při aktualizaci iuzlu špatných bloků"
#: e2fsck/badblocks.c:130
#, c-format
msgid "Warning: illegal block %u found in bad block inode. Cleared.\n"
msgstr "VarovánÃ: v iuzlu Å¡patných bloků nalezen nepovolený blok %u. Vymazán.\n"
-#: e2fsck/ehandler.c:53
+#: e2fsck/ehandler.c:54
#, c-format
msgid "Error reading block %lu (%s) while %s. "
msgstr "Chyba pÅ™i Ätenà bloku %lu (%s) pÅ™i %s. "
-#: e2fsck/ehandler.c:56
+#: e2fsck/ehandler.c:57
#, c-format
msgid "Error reading block %lu (%s). "
msgstr "Chyba pÅ™i Ätenà bloku %lu (%s). "
-#: e2fsck/ehandler.c:59 e2fsck/ehandler.c:106
+#: e2fsck/ehandler.c:60 e2fsck/ehandler.c:109
msgid "Ignore error"
msgstr "Ignorovat chybu"
-#: e2fsck/ehandler.c:60
+#: e2fsck/ehandler.c:61
msgid "Force rewrite"
msgstr "Vynutit pÅ™epsánÃ"
-#: e2fsck/ehandler.c:100
+#: e2fsck/ehandler.c:103
#, c-format
msgid "Error writing block %lu (%s) while %s. "
msgstr "Chyba při zápisu bloku %lu (%s) při %s. "
-#: e2fsck/ehandler.c:103
+#: e2fsck/ehandler.c:106
#, c-format
msgid "Error writing block %lu (%s). "
msgstr "Chyba při zápisu bloku %lu (%s). "
@@ -187,54 +187,54 @@ msgstr ""
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr "PoužitÃ: %s [-F] [-I bloky_inode_bufferů] zaÅ™ÃzenÃ\n"
-#: e2fsck/iscan.c:83 e2fsck/unix.c:804
+#: e2fsck/iscan.c:83 e2fsck/unix.c:817
#, c-format
msgid "while opening %s for flushing"
msgstr "pÅ™i otevÃránà %s pro synchronizaci"
-#: e2fsck/iscan.c:88 e2fsck/unix.c:810 resize/main.c:282
+#: e2fsck/iscan.c:88 e2fsck/unix.c:823 resize/main.c:286
#, c-format
msgid "while trying to flush %s"
msgstr "při pokusu synchronizovat %s"
-#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:480
+#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:489
msgid "while opening inode scan"
-msgstr "pÅ™i otevÃránà průchodu inode"
+msgstr "při zahájenà průchodu iuzly"
-#: e2fsck/iscan.c:129 misc/e2image.c:498
+#: e2fsck/iscan.c:129 misc/e2image.c:507
msgid "while getting next inode"
-msgstr "pÅ™i zÃskávánà dalÅ¡Ã inode"
+msgstr "pÅ™i zÃskávánà dalÅ¡Ãho iuzlu"
#: e2fsck/iscan.c:138
#, c-format
msgid "%u inodes scanned.\n"
msgstr "prozkoumáno %u iuzlů.\n"
-#: e2fsck/journal.c:505
+#: e2fsck/journal.c:507
msgid "reading journal superblock\n"
msgstr "Ätenà superbloku žurnálu\n"
-#: e2fsck/journal.c:562
+#: e2fsck/journal.c:564
#, c-format
msgid "%s: no valid journal superblock found\n"
msgstr "%s: nenalezen platný superblok žurnálu\n"
-#: e2fsck/journal.c:571
+#: e2fsck/journal.c:573
#, c-format
msgid "%s: journal too short\n"
msgstr "%s: žurnál pÅ™ÃliÅ¡ krátký\n"
-#: e2fsck/journal.c:856
+#: e2fsck/journal.c:860
#, c-format
msgid "%s: recovering journal\n"
msgstr "%s: obnovuji žurnál\n"
-#: e2fsck/journal.c:858
+#: e2fsck/journal.c:862
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
msgstr "%s: nebudu obnovovat žurnál v režimu jen pro ÄtenÃ\n"
-#: e2fsck/journal.c:879
+#: e2fsck/journal.c:887
#, c-format
msgid "while trying to re-open %s"
msgstr "pÅ™i pokusu znovu otevÅ™Ãt %s"
@@ -306,7 +306,7 @@ msgstr "gskupin"
#: e2fsck/message.c:126
msgid "hHTREE @d @i"
-msgstr "hinode HTREE adresáře"
+msgstr "hiuzel HTREE adresáře"
#: e2fsck/message.c:127
msgid "llost+found"
@@ -394,76 +394,76 @@ msgstr "<Iuzel žurnálu>"
#: e2fsck/message.c:159
msgid "<Reserved inode 9>"
-msgstr "<Rezervovaná inode 9>"
+msgstr "<Rezervovaný iuzel 9>"
#: e2fsck/message.c:160
msgid "<Reserved inode 10>"
-msgstr "<Rezervovaná inode 10>"
+msgstr "<Rezervovaný iuzel 10>"
-#: e2fsck/message.c:321
+#: e2fsck/message.c:323
#, c-format
msgid "regular file"
msgstr "obyÄejný soubor"
-#: e2fsck/message.c:323
+#: e2fsck/message.c:325
#, c-format
msgid "directory"
msgstr "adresář"
-#: e2fsck/message.c:325
+#: e2fsck/message.c:327
#, c-format
msgid "character device"
msgstr "znakové zaÅ™ÃzenÃ"
-#: e2fsck/message.c:327
+#: e2fsck/message.c:329
#, c-format
msgid "block device"
msgstr "blokové zaÅ™ÃzenÃ"
-#: e2fsck/message.c:329
+#: e2fsck/message.c:331
#, c-format
msgid "named pipe"
msgstr "pojmenovaná roura"
-#: e2fsck/message.c:331
+#: e2fsck/message.c:333
#, c-format
msgid "symbolic link"
msgstr "symbolický odkaz"
-#: e2fsck/message.c:333
+#: e2fsck/message.c:335
#, c-format
msgid "socket"
msgstr "soket"
-#: e2fsck/message.c:335
+#: e2fsck/message.c:337
#, c-format
msgid "unknown file type with mode 0%o"
msgstr "neznámý druh souboru o módu 0%o"
-#: e2fsck/pass1b.c:215
+#: e2fsck/pass1b.c:220
msgid "multiply claimed inode map"
msgstr "mapa několikrát alokovaných iuzlů"
-#: e2fsck/pass1b.c:567 e2fsck/pass1b.c:700
+#: e2fsck/pass1b.c:581 e2fsck/pass1b.c:714
#, c-format
msgid "internal error: can't find dup_blk for %u\n"
msgstr "vnitÅ™nà chyba: nemohu najÃt dup_blk pro %u\n"
-#: e2fsck/pass1b.c:743
+#: e2fsck/pass1b.c:757
msgid "returned from clone_file_block"
msgstr "vrácený z clone_file_block"
-#: e2fsck/pass1b.c:762
+#: e2fsck/pass1b.c:776
#, c-format
msgid "internal error: couldn't lookup EA block record for %u"
msgstr "VnitÅ™nà chyba: nemohu najÃt záznam EA bloku pro %u"
-#: e2fsck/pass1b.c:774
+#: e2fsck/pass1b.c:788
#, c-format
msgid "internal error: couldn't lookup EA inode record for %u"
msgstr "VnitÅ™nà chyba: nemohu najÃt záznam EA iuzlu pro %u"
-#: e2fsck/pass1.c:430 e2fsck/pass2.c:780
+#: e2fsck/pass1.c:430 e2fsck/pass2.c:782
msgid "reading directory block"
msgstr "Ätenà adresářového bloku"
@@ -473,11 +473,11 @@ msgstr "mapa použÃvaných iuzlů"
#: e2fsck/pass1.c:561
msgid "directory inode map"
-msgstr "mapa inode adresářů"
+msgstr "mapa iuzlů adresářů"
#: e2fsck/pass1.c:569
msgid "regular file inode map"
-msgstr "mapa inode obyÄejných souborů"
+msgstr "mapa iuzlů obyÄejných souborů"
#: e2fsck/pass1.c:576
msgid "in-use block map"
@@ -491,81 +491,81 @@ msgstr "otevÃránà průzkumu iuzlů"
msgid "getting next inode from scan"
msgstr "zÃskávánà dalÅ¡Ãho iuzlu z průzkumu"
-#: e2fsck/pass1.c:1122
+#: e2fsck/pass1.c:1123
msgid "Pass 1"
msgstr "Průchod 1"
-#: e2fsck/pass1.c:1181
+#: e2fsck/pass1.c:1180
#, c-format
msgid "reading indirect blocks of inode %u"
-msgstr "Ätu nepÅ™Ãmé bloky inode %u"
+msgstr "Ätu nepÅ™Ãmé bloky iuzlu %u"
-#: e2fsck/pass1.c:1223
+#: e2fsck/pass1.c:1224
msgid "bad inode map"
-msgstr "mapa špatných inode"
+msgstr "mapa špatných iuzlů"
-#: e2fsck/pass1.c:1245
+#: e2fsck/pass1.c:1246
msgid "inode in bad block map"
-msgstr "inode v mapě špatných bloků"
+msgstr "iuzel v mapě špatných bloků"
-#: e2fsck/pass1.c:1265
+#: e2fsck/pass1.c:1266
msgid "imagic inode map"
-msgstr "mapa imagic inode"
+msgstr "mapa imagic iuzlů"
-#: e2fsck/pass1.c:1292
+#: e2fsck/pass1.c:1293
msgid "multiply claimed block map"
msgstr "mapa několikrát alokovaných bloků"
-#: e2fsck/pass1.c:1391
+#: e2fsck/pass1.c:1392
msgid "ext attr block map"
msgstr "mapa bloků rozÅ¡ÃÅ™ených atributů"
-#: e2fsck/pass1.c:2107
+#: e2fsck/pass1.c:2134
#, c-format
-msgid "%6lu: expecting %6lu got phys %6lu (blkcnt %lld)\n"
-msgstr "%6lu: oÄekáváno %6lu, obdrženo fyz. %6lu (bloků %lld)\n"
+msgid "%6lu(%c): expecting %6lu got phys %6lu (blkcnt %lld)\n"
+msgstr "%6lu(%c): oÄekáváno %6lu, obdrženo fyz. %6lu (bloků %lld)\n"
-#: e2fsck/pass1.c:2420
+#: e2fsck/pass1.c:2449
msgid "block bitmap"
msgstr "bitmapa bloků"
-#: e2fsck/pass1.c:2424
+#: e2fsck/pass1.c:2453
msgid "inode bitmap"
-msgstr "bitmapa inode"
+msgstr "bitmapa iuzlů"
-#: e2fsck/pass1.c:2428
+#: e2fsck/pass1.c:2457
msgid "inode table"
-msgstr "tabulka inode"
+msgstr "tabulka iuzlů"
-#: e2fsck/pass2.c:284
+#: e2fsck/pass2.c:283
msgid "Pass 2"
msgstr "Průchod 2"
-#: e2fsck/pass2.c:803
+#: e2fsck/pass2.c:805
msgid "Can not continue."
msgstr "Nemohu pokraÄovat."
-#: e2fsck/pass3.c:79
+#: e2fsck/pass3.c:76
msgid "inode done bitmap"
-msgstr "bitmapa hotových inode"
+msgstr "bitmapa hotových iuzlů"
-#: e2fsck/pass3.c:90
+#: e2fsck/pass3.c:84
msgid "Peak memory"
msgstr "Maximum paměti"
-#: e2fsck/pass3.c:146
+#: e2fsck/pass3.c:134
msgid "Pass 3"
msgstr "Průchod 3"
-#: e2fsck/pass3.c:334
+#: e2fsck/pass3.c:320
msgid "inode loop detection bitmap"
-msgstr "bitmapa detekce cyklů inode"
+msgstr "bitmapa detekce cyklů iuzlů"
-#: e2fsck/pass4.c:196
+#: e2fsck/pass4.c:191
msgid "Pass 4"
msgstr "Průchod 4"
-#: e2fsck/pass5.c:70
+#: e2fsck/pass5.c:64
msgid "Pass 5"
msgstr "Průchod 5"
@@ -611,7 +611,7 @@ msgstr "Useknout"
#: e2fsck/problem.c:60
msgid "Clear inode"
-msgstr "Vymazat inode"
+msgstr "VyÄistit iuzel"
#: e2fsck/problem.c:61
msgid "Abort"
@@ -737,7 +737,7 @@ msgstr "Bitmapa bloků pro skupinu %g nenà ve skupině. (blok %b)\n"
#. @-expanded: inode bitmap for group %g is not in group. (block %b)\n
#: e2fsck/problem.c:110
msgid "@i @B for @g %g is not in @g. (@b %b)\n"
-msgstr "Bitmapa inode pro skupinu %g nenà ve skupině. (blok %b)\n"
+msgstr "Bitmapa iuzlů pro skupinu %g nenà ve skupině. (blok %b)\n"
#. @-expanded: inode table for group %g is not in group. (block %b)\n
#. @-expanded: WARNING: SEVERE DATA LOSS POSSIBLE.\n
@@ -746,7 +746,7 @@ msgid ""
"@i table for @g %g is not in @g. (@b %b)\n"
"WARNING: SEVERE DATA LOSS POSSIBLE.\n"
msgstr ""
-"Tabulka inode pro skupinu %g nenà ve skupině. (blok %b)\n"
+"Tabulka iuzlů pro skupinu %g nenà ve skupině. (blok %b)\n"
"VAROVÃNÃ: MOŽNà VÃŽNà ZTRÃTA DAT.\n"
#. @-expanded: \n
@@ -859,11 +859,11 @@ msgstr "PoÄet iuzlů v superbloku je %i, mÄ›l by být %j.\n"
msgid "The Hurd does not support the filetype feature.\n"
msgstr "Hurd nepodporuje vlastnost filetype.\n"
-#. @-expanded: superblock has an invalid ext3 journal (inode %i).\n
+#. @-expanded: superblock has an invalid journal (inode %i).\n
#: e2fsck/problem.c:187
#, c-format
-msgid "@S has an @n ext3 @j (@i %i).\n"
-msgstr "Superblok má špatný žurnál ext3 (iuzel %i).\n"
+msgid "@S has an @n @j (@i %i).\n"
+msgstr "Superblok má neplatný žurnál (iuzel %i).\n"
#. @-expanded: External journal has multiple filesystem users (unsupported).\n
#: e2fsck/problem.c:192
@@ -885,106 +885,96 @@ msgstr "Externà žurnál má špatný superblok\n"
msgid "External @j does not support this @f\n"
msgstr "Externà žurnál nepodporuje tento systém souborů\n"
-#. @-expanded: Ext3 journal superblock is unknown type %N (unsupported).\n
+#. @-expanded: filesystem journal superblock is unknown type %N (unsupported).\n
#. @-expanded: It is likely that your copy of e2fsck is old and/or doesn't support this journal
#. @-expanded: format.\n
#. @-expanded: It is also possible the journal superblock is corrupt.\n
#: e2fsck/problem.c:212
msgid ""
-"Ext3 @j @S is unknown type %N (unsupported).\n"
+"@f @j @S is unknown type %N (unsupported).\n"
"It is likely that your copy of e2fsck is old and/or doesn't support this @j format.\n"
"It is also possible the @j @S is corrupt.\n"
msgstr ""
-"Superblok žurnálu ext3 má neznámý typ %N (nepodporováno).\n"
+"Superblok žurnálu systému souborů je neznámého typu %N (nepodporováno).\n"
"Je pravděpodobné, že vaše kopie e2fsck je stará a/nebo nepodporuje tento formát žurnálu.\n"
"Je také možné, že superblok žurnálu je poškozen.\n"
-#. @-expanded: Ext3 journal superblock is corrupt.\n
+#. @-expanded: journal superblock is corrupt.\n
#: e2fsck/problem.c:220
-msgid "Ext3 @j @S is corrupt.\n"
-msgstr "Superblok žurnálu ext3 je poškozen.\n"
+msgid "@j @S is corrupt.\n"
+msgstr "Superblok žurnálu je poškozen.\n"
-#. @-expanded: superblock doesn't have has_journal flag, but has ext3 journal %s.\n
+#. @-expanded: superblock has_journal flag is clear, but a journal %s is present.\n
#: e2fsck/problem.c:225
#, c-format
-msgid "@S doesn't have has_ at j flag, but has ext3 @j %s.\n"
-msgstr "Superblok nemá pÅ™Ãznak has_journal, ale má žurnál ext3 %s.\n"
+msgid "@S has_ at j flag is clear, but a @j %s is present.\n"
+msgstr "PÅ™Ãznak superbloku has_journal (má_žurnál) nenà nastaven, avÅ¡ak žurnálový %s je pÅ™Ãtomen.\n"
-#. @-expanded: superblock has ext3 needs_recovery flag set, but no journal.\n
+#. @-expanded: superblock needs_recovery flag is set, but no journal is present.\n
#: e2fsck/problem.c:230
-msgid "@S has ext3 needs_recovery flag set, but no @j.\n"
-msgstr "Superblok má nastaven pÅ™Ãznak ext3 needs_recovery, ale žádný žurnál.\n"
+msgid "@S needs_recovery flag is set, but no @j is present.\n"
+msgstr "Superblok má nastaven pÅ™Ãznak needs_recovery (potÅ™ebuje_obnovit), avÅ¡ak žádný žurnál neexistuje.\n"
-#. @-expanded: ext3 recovery flag is clear, but journal has data.\n
+#. @-expanded: superblock needs_recovery flag is clear, but journal has data.\n
#: e2fsck/problem.c:235
-msgid "ext3 recovery flag is clear, but @j has data.\n"
-msgstr "pÅ™Ãznak obnovenà ext3 nenastaven, ale žurnál obsahuje data.\n"
+msgid "@S needs_recovery flag is clear, but @j has data.\n"
+msgstr "PÅ™Ãznak superbloku needs_recovery (potÅ™ebuje_obnovit) nenà nastaven, avÅ¡ak žurnál obsahuje data.\n"
#. @-expanded: Clear journal
#: e2fsck/problem.c:240
msgid "Clear @j"
msgstr "Vymazat žurnál"
-#. @-expanded: Run journal anyway
-#: e2fsck/problem.c:245
-msgid "Run @j anyway"
-msgstr "Přesto spustit žurnál"
-
-#. @-expanded: Recovery flag not set in backup superblock, so running journal anyway.\n
-#: e2fsck/problem.c:250
-msgid "Recovery flag not set in backup @S, so running @j anyway.\n"
-msgstr "PÅ™Ãznak obnovenà nenà nastaven v záložnÃm superbloku, takže pÅ™esto spouÅ¡tÃm žurnál.\n"
+#. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem.
+#: e2fsck/problem.c:245 e2fsck/problem.c:647
+msgid "@f has feature flag(s) set, but is a revision 0 @f. "
+msgstr "Systém souborů má pÅ™Ãznak(y) vlastnostà nastaveny, aÄkoliv se jedná o revizi 0. "
#. @-expanded: %s orphaned inode %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n
-#: e2fsck/problem.c:255
+#: e2fsck/problem.c:250
msgid "%s @o @i %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n"
-msgstr "%s osiřelé inode %i (uid=%Iu, gid=%Ig, režim=%Im, velikost=%Is)\n"
+msgstr "%s osiřelý iuzel %i (uid=%Iu, gid=%Ig, režim=%Im, velikost=%Is)\n"
#. @-expanded: illegal block #%B (%b) found in orphaned inode %i.\n
-#: e2fsck/problem.c:260
+#: e2fsck/problem.c:255
msgid "@I @b #%B (%b) found in @o @i %i.\n"
-msgstr "Neplatný blok #%B (%b) nalezen v osiřelé inode %i.\n"
+msgstr "Neplatný blok #%B (%b) nalezen v osiřelém iuzlu %i.\n"
#. @-expanded: Already cleared block #%B (%b) found in orphaned inode %i.\n
-#: e2fsck/problem.c:265
+#: e2fsck/problem.c:260
msgid "Already cleared @b #%B (%b) found in @o @i %i.\n"
-msgstr "Již vymazaný blok #%B (%b) nalezen v osiřelé inode %f.\n"
+msgstr "Již vymazaný blok #%B (%b) nalezen v osiřelém iuzlu %f.\n"
#. @-expanded: illegal orphaned inode %i in superblock.\n
-#: e2fsck/problem.c:270
+#: e2fsck/problem.c:265
#, c-format
msgid "@I @o @i %i in @S.\n"
-msgstr "Neplatná osiřelá inode %i v superbloku.\n"
+msgstr "V superbloku neplatný osiřelý iuzel %i.\n"
#. @-expanded: illegal inode %i in orphaned inode list.\n
-#: e2fsck/problem.c:275
+#: e2fsck/problem.c:270
#, c-format
msgid "@I @i %i in @o @i list.\n"
-msgstr "Neplatná inode %i v seznamu osiřelých inode.\n"
+msgstr "Neplatný iuzel %i v seznamu osiřelých iuzlů.\n"
-#. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem.
-#: e2fsck/problem.c:280 e2fsck/problem.c:643
-msgid "@f has feature flag(s) set, but is a revision 0 @f. "
-msgstr "Systém souborů má pÅ™Ãznak(y) vlastnostà nastaveny, aÄkoliv se jedná o revizi 0. "
+#. @-expanded: journal superblock has an unknown read-only feature flag set.\n
+#: e2fsck/problem.c:275
+msgid "@j @S has an unknown read-only feature flag set.\n"
+msgstr "Superblok žurnálu má nastaven pÅ™Ãznak neznámé vlastnosti „jen pro ÄtenÓ.\n"
-#. @-expanded: Ext3 journal superblock has an unknown read-only feature flag set.\n
-#: e2fsck/problem.c:285
-msgid "Ext3 @j @S has an unknown read-only feature flag set.\n"
-msgstr "Superblok žurnálu ext3 má nastaven pÅ™Ãznak neznámé vlastnosti jen pro ÄtenÃ.\n"
-
-#. @-expanded: Ext3 journal superblock has an unknown incompatible feature flag set.\n
-#: e2fsck/problem.c:290
-msgid "Ext3 @j @S has an unknown incompatible feature flag set.\n"
-msgstr "Superblok žurnálu ext3 má nastaven pÅ™Ãznak neznámé nekompatibilnà vlastnosti.\n"
+#. @-expanded: journal superblock has an unknown incompatible feature flag set.\n
+#: e2fsck/problem.c:280
+msgid "@j @S has an unknown incompatible feature flag set.\n"
+msgstr "Superblok žurnálu má nastaven pÅ™Ãznak neznámé vlastnosti „nekompatibilnÓ.\n"
#. @-expanded: journal version not supported by this e2fsck.\n
-#: e2fsck/problem.c:295
+#: e2fsck/problem.c:285
msgid "@j version not supported by this e2fsck.\n"
msgstr "Verze žurnálu nepodporována tÃmto e2fsck.\n"
#. @-expanded: Moving journal from /%s to hidden inode.\n
#. @-expanded: \n
-#: e2fsck/problem.c:300
+#: e2fsck/problem.c:290
#, c-format
msgid ""
"Moving @j from /%s to hidden @i.\n"
@@ -995,7 +985,7 @@ msgstr ""
#. @-expanded: Error moving journal: %m\n
#. @-expanded: \n
-#: e2fsck/problem.c:305
+#: e2fsck/problem.c:295
#, c-format
msgid ""
"Error moving @j: %m\n"
@@ -1007,7 +997,7 @@ msgstr ""
#. @-expanded: Found invalid V2 journal superblock fields (from V1 journal).\n
#. @-expanded: Clearing fields beyond the V1 journal superblock...\n
#. @-expanded: \n
-#: e2fsck/problem.c:310
+#: e2fsck/problem.c:300
msgid ""
"Found @n V2 @j @S fields (from V1 @j).\n"
"Clearing fields beyond the V1 @j @S...\n"
@@ -1017,6 +1007,16 @@ msgstr ""
"Mažu pole za superblokem žurnálu V1…\n"
"\n"
+#. @-expanded: Run journal anyway
+#: e2fsck/problem.c:306
+msgid "Run @j anyway"
+msgstr "Přesto spustit žurnál"
+
+#. @-expanded: Recovery flag not set in backup superblock, so running journal anyway.\n
+#: e2fsck/problem.c:311
+msgid "Recovery flag not set in backup @S, so running @j anyway.\n"
+msgstr "PÅ™Ãznak obnovenà nenà nastaven v záložnÃm superbloku, takže pÅ™esto spouÅ¡tÃm žurnál.\n"
+
#. @-expanded: Backing up journal inode block information.\n
#. @-expanded: \n
#: e2fsck/problem.c:316
@@ -1040,7 +1040,7 @@ msgstr ""
#. @-expanded: Resize_inode not enabled, but the resize inode is non-zero.
#: e2fsck/problem.c:327
msgid "Resize_ at i not enabled, but the resize @i is non-zero. "
-msgstr "Resize_inodu nenà zapnuto, avšak iuzel pro měněnà velikosti nenà nula."
+msgstr "Resize_inode nenà zapnuto, avšak iuzel pro měněnà velikosti nenà nula."
#. @-expanded: Resize inode not valid.
#: e2fsck/problem.c:332
@@ -1106,118 +1106,122 @@ msgstr "Poslednà bitmapa bloků skupiny nenà inicializována. "
msgid "Journal transaction %i was corrupt, replay was aborted.\n"
msgstr "Transakce žurnálu %i byla poškozena, přehránà bylo zrušeno.\n"
+#: e2fsck/problem.c:385
+msgid "The test_fs flag is set (and ext4 is available). "
+msgstr "PÅ™Ãznak test_fs je nastaven (a ext4 je dostupný). "
+
#. @-expanded: Pass 1: Checking inodes, blocks, and sizes\n
-#: e2fsck/problem.c:388
+#: e2fsck/problem.c:392
msgid "Pass 1: Checking @is, @bs, and sizes\n"
-msgstr "Průchod 1: Kontroluji inode, bloky a velikosti\n"
+msgstr "Průchod 1: Kontroluji iuzly, bloky a velikosti\n"
#. @-expanded: root inode is not a directory.
-#: e2fsck/problem.c:392
+#: e2fsck/problem.c:396
msgid "@r is not a @d. "
-msgstr "Kořenová inode nenà adresář. "
+msgstr "Kořenový iuzel nenà adresář. "
#. @-expanded: root inode has dtime set (probably due to old mke2fs).
-#: e2fsck/problem.c:397
+#: e2fsck/problem.c:401
msgid "@r has dtime set (probably due to old mke2fs). "
-msgstr "Kořenová inode má nastaven dtime (možná kvůli starém mke2fs). "
+msgstr "Kořenový iuzel má nastaven dtime (možná kvůli starém mke2fs). "
#. @-expanded: Reserved inode %i (%Q) has invalid mode.
-#: e2fsck/problem.c:402
+#: e2fsck/problem.c:406
msgid "Reserved @i %i (%Q) has @n mode. "
msgstr "Rezervovaný iuzel %i (%Q) má špatný mód. "
#. @-expanded: deleted inode %i has zero dtime.
-#: e2fsck/problem.c:407
+#: e2fsck/problem.c:411
#, c-format
msgid "@D @i %i has zero dtime. "
-msgstr "Odstraněná inode %i má nulový dtime. "
+msgstr "Odstraněný iuzel %i má nulový dtime. "
#. @-expanded: inode %i is in use, but has dtime set.
-#: e2fsck/problem.c:412
+#: e2fsck/problem.c:416
#, c-format
msgid "@i %i is in use, but has dtime set. "
msgstr "Iuzel %i se použÃvá, ale má nastaven dtime. "
#. @-expanded: inode %i is a zero-length directory.
-#: e2fsck/problem.c:417
+#: e2fsck/problem.c:421
#, c-format
msgid "@i %i is a @z @d. "
msgstr "Iuzel %i je adresář nulové délky. "
#. @-expanded: group %g's block bitmap at %b conflicts with some other fs block.\n
-#: e2fsck/problem.c:422
+#: e2fsck/problem.c:426
msgid "@g %g's @b @B at %b @C.\n"
msgstr "Bitmapa bloků skupiny %g v %b koliduje s jiným blokem systému souborů.\n"
#. @-expanded: group %g's inode bitmap at %b conflicts with some other fs block.\n
-#: e2fsck/problem.c:427
+#: e2fsck/problem.c:431
msgid "@g %g's @i @B at %b @C.\n"
-msgstr "Bitmapa inode skupiny %g v %b koliduje s jiným blokem systému souborů.\n"
+msgstr "Bitmapa iuzlů skupiny %g v %b koliduje s jiným blokem systému souborů.\n"
#. @-expanded: group %g's inode table at %b conflicts with some other fs block.\n
-#: e2fsck/problem.c:432
+#: e2fsck/problem.c:436
msgid "@g %g's @i table at %b @C.\n"
-msgstr "Tabulka inode skupiny %g v %b koliduje s jiným blokem systému souborů.\n"
+msgstr "Tabulka iuzlů skupiny %g v %b koliduje s jiným blokem systému souborů.\n"
#. @-expanded: group %g's block bitmap (%b) is bad.
-#: e2fsck/problem.c:437
+#: e2fsck/problem.c:441
msgid "@g %g's @b @B (%b) is bad. "
msgstr "Bitmapa bloků skupiny %g (%b) je špatná. "
#. @-expanded: group %g's inode bitmap (%b) is bad.
-#: e2fsck/problem.c:442
+#: e2fsck/problem.c:446
msgid "@g %g's @i @B (%b) is bad. "
-msgstr "Bitmapa inode skupiny %g (%b) je špatná. "
+msgstr "Bitmapa iuzlů skupiny %g (%b) je špatná. "
#. @-expanded: inode %i, i_size is %Is, should be %N.
-#: e2fsck/problem.c:447
+#: e2fsck/problem.c:451
msgid "@i %i, i_size is %Is, @s %N. "
-msgstr "V inode %i je i_size %Is, měla by být %N. "
+msgstr "V iuzlu %i je i_size %Is, měla by být %N. "
#. @-expanded: inode %i, i_blocks is %Ib, should be %N.
-#: e2fsck/problem.c:452
+#: e2fsck/problem.c:456
msgid "@i %i, i_ at bs is %Ib, @s %N. "
-msgstr "V inode %i je i_blocks %Ib, mělo by být %N. "
+msgstr "V iuzlu %i je i_blocks %Ib, mělo by být %N. "
#. @-expanded: illegal block #%B (%b) in inode %i.
-#: e2fsck/problem.c:457
+#: e2fsck/problem.c:461
msgid "@I @b #%B (%b) in @i %i. "
-msgstr "Neplatný blok #%B (%b) v inode %i. "
+msgstr "Neplatný blok #%B (%b) v iuzlu %i. "
#. @-expanded: block #%B (%b) overlaps filesystem metadata in inode %i.
-#: e2fsck/problem.c:462
+#: e2fsck/problem.c:466
msgid "@b #%B (%b) overlaps @f metadata in @i %i. "
-msgstr "Blok #%B (%b) se překrývá s metadaty systému souborů v inode %i. "
+msgstr "Blok #%B (%b) se překrývá s metadaty systému souborů v iuzlu %i. "
#. @-expanded: inode %i has illegal block(s).
-#: e2fsck/problem.c:467
+#: e2fsck/problem.c:471
#, c-format
msgid "@i %i has illegal @b(s). "
msgstr "Iuzel %i má neplatný blok(y). "
#. @-expanded: Too many illegal blocks in inode %i.\n
-#: e2fsck/problem.c:472
+#: e2fsck/problem.c:476
#, c-format
msgid "Too many illegal @bs in @i %i.\n"
-msgstr "PÅ™ÃliÅ¡ mnoho neplatných bloků v inode %i.\n"
+msgstr "PÅ™ÃliÅ¡ mnoho neplatných bloků v iuzlu %i.\n"
#. @-expanded: illegal block #%B (%b) in bad block inode.
-#: e2fsck/problem.c:477
+#: e2fsck/problem.c:481
msgid "@I @b #%B (%b) in bad @b @i. "
-msgstr "Neplatný blok #%B (%b) v inode špatných bloků. "
+msgstr "Neplatný blok #%B (%b) v iuzlu špatných bloků. "
#. @-expanded: Bad block inode has illegal block(s).
-#: e2fsck/problem.c:482
+#: e2fsck/problem.c:486
msgid "Bad @b @i has illegal @b(s). "
msgstr "Iuzel špatných bloků má neplatný blok(y). "
#. @-expanded: Duplicate or bad block in use!\n
-#: e2fsck/problem.c:487
+#: e2fsck/problem.c:491
msgid "Duplicate or bad @b in use!\n"
msgstr "PoužÃvá se duplikátnà nebo Å¡patný blok!\n"
#. @-expanded: Bad block %b used as bad block inode indirect block.
-#: e2fsck/problem.c:492
+#: e2fsck/problem.c:496
msgid "Bad @b %b used as bad @b @i indirect @b. "
msgstr "Å patný blok %b použÃván jako nepÅ™Ãmý blok Å¡patných bloků. "
@@ -1225,7 +1229,7 @@ msgstr "Å patný blok %b použÃván jako nepÅ™Ãmý blok Å¡patných bloků. "
#. @-expanded: The bad block inode has probably been corrupted. You probably\n
#. @-expanded: should stop now and run e2fsck -c to scan for bad blocks\n
#. @-expanded: in the filesystem.\n
-#: e2fsck/problem.c:497
+#: e2fsck/problem.c:501
msgid ""
"\n"
"The bad @b @i has probably been corrupted. You probably\n"
@@ -1238,7 +1242,7 @@ msgstr ""
#. @-expanded: \n
#. @-expanded: If the block is really bad, the filesystem can not be fixed.\n
-#: e2fsck/problem.c:504
+#: e2fsck/problem.c:508
msgid ""
"\n"
"If the @b is really bad, the @f can not be fixed.\n"
@@ -1249,7 +1253,7 @@ msgstr ""
#. @-expanded: You can remove this block from the bad block list and hope\n
#. @-expanded: that the block is really OK. But there are no guarantees.\n
#. @-expanded: \n
-#: e2fsck/problem.c:509
+#: e2fsck/problem.c:513
msgid ""
"You can remove this @b from the bad @b list and hope\n"
"that the @b is really OK. But there are no guarantees.\n"
@@ -1260,276 +1264,276 @@ msgstr ""
"\n"
#. @-expanded: The primary superblock (%b) is on the bad block list.\n
-#: e2fsck/problem.c:515
+#: e2fsck/problem.c:519
msgid "The primary @S (%b) is on the bad @b list.\n"
msgstr "Primárnà superblok (%b) je na seznamu špatných bloků.\n"
#. @-expanded: Block %b in the primary group descriptors is on the bad block list\n
-#: e2fsck/problem.c:520
+#: e2fsck/problem.c:524
msgid "Block %b in the primary @g descriptors is on the bad @b list\n"
msgstr "Blok %b v primárnÃch deskriptorech skupin je na seznamu Å¡patných bloků\n"
#. @-expanded: Warning: Group %g's superblock (%b) is bad.\n
-#: e2fsck/problem.c:526
+#: e2fsck/problem.c:530
msgid "Warning: Group %g's @S (%b) is bad.\n"
msgstr "VarovánÃ: superblok skupiny %g (%b) je Å¡patný.\n"
#. @-expanded: Warning: Group %g's copy of the group descriptors has a bad block (%b).\n
-#: e2fsck/problem.c:531
+#: e2fsck/problem.c:535
msgid "Warning: Group %g's copy of the @g descriptors has a bad @b (%b).\n"
msgstr "VarovánÃ: Kopie deskriptorů skupin ve skupinÄ› %g má Å¡patný blok (%b).\n"
#. @-expanded: Programming error? block #%b claimed for no reason in process_bad_block.\n
-#: e2fsck/problem.c:537
+#: e2fsck/problem.c:541
msgid "Programming error? @b #%b claimed for no reason in process_bad_ at b.\n"
msgstr "Chyba při programován� Blok #%b bezdůvodně použit v process_bad_blocks.\n"
#. @-expanded: error allocating %N contiguous block(s) in block group %g for %s: %m\n
-#: e2fsck/problem.c:543
+#: e2fsck/problem.c:547
msgid "@A %N contiguous @b(s) in @b @g %g for %s: %m\n"
msgstr "Chyba při alokaci %N souvislých bloků ve skupině bloků %g pro %s: %m\n"
#. @-expanded: error allocating block buffer for relocating %s\n
-#: e2fsck/problem.c:548
+#: e2fsck/problem.c:552
#, c-format
msgid "@A @b buffer for relocating %s\n"
msgstr "Chyba pÅ™i alokaci vyrovnávacà pamÄ›ti bloků pro pÅ™emÃstÄ›nà %s\n"
#. @-expanded: Relocating group %g's %s from %b to %c...\n
-#: e2fsck/problem.c:553
+#: e2fsck/problem.c:557
msgid "Relocating @g %g's %s from %b to %c...\n"
msgstr "PÅ™emÃsÅ¥uji %s skupiny %g z %b do %c…\n"
# FIXME: no-c-format so that I can reorder it properly
#. @-expanded: Relocating group %g's %s to %c...\n
-#: e2fsck/problem.c:558
+#: e2fsck/problem.c:562
#, c-format
msgid "Relocating @g %g's %s to %c...\n"
msgstr "PÅ™emÃsÅ¥uji skupiny %g %s do %c…\n"
#. @-expanded: Warning: could not read block %b of %s: %m\n
-#: e2fsck/problem.c:563
+#: e2fsck/problem.c:567
msgid "Warning: could not read @b %b of %s: %m\n"
msgstr "VarovánÃ: nemohu naÄÃst blok %s %s: %m\n"
#. @-expanded: Warning: could not write block %b for %s: %m\n
-#: e2fsck/problem.c:568
+#: e2fsck/problem.c:572
msgid "Warning: could not write @b %b for %s: %m\n"
msgstr "VarovánÃ: nemohu zapsat blok %b pro %s: %m\n"
#. @-expanded: error allocating inode bitmap (%N): %m\n
-#: e2fsck/problem.c:573 e2fsck/problem.c:1369
+#: e2fsck/problem.c:577 e2fsck/problem.c:1383
msgid "@A @i @B (%N): %m\n"
-msgstr "Chyba při alokaci bitmapy inode (%N): %m\n"
+msgstr "Chyba při alokaci bitmapy iuzlů (%N): %m\n"
#. @-expanded: error allocating block bitmap (%N): %m\n
-#: e2fsck/problem.c:578
+#: e2fsck/problem.c:582
msgid "@A @b @B (%N): %m\n"
msgstr "Chyba při alokaci bitmapy bloků (%N): %m\n"
#. @-expanded: error allocating icount link information: %m\n
-#: e2fsck/problem.c:583
+#: e2fsck/problem.c:587
#, c-format
msgid "@A icount link information: %m\n"
msgstr "Chyba při alokaci informacà odkazů icount: %m\n"
#. @-expanded: error allocating directory block array: %m\n
-#: e2fsck/problem.c:588
+#: e2fsck/problem.c:592
#, c-format
msgid "@A @d @b array: %m\n"
msgstr "Chyba při alokaci pole bloků adresáře: %m\n"
#. @-expanded: Error while scanning inodes (%i): %m\n
-#: e2fsck/problem.c:593
+#: e2fsck/problem.c:597
#, c-format
msgid "Error while scanning @is (%i): %m\n"
-msgstr "Chyba při zkoumánà inode (%i): %m\n"
+msgstr "Chyba při zkoumánà iuzlů (%i): %m\n"
#. @-expanded: Error while iterating over blocks in inode %i: %m\n
-#: e2fsck/problem.c:598
+#: e2fsck/problem.c:602
#, c-format
msgid "Error while iterating over @bs in @i %i: %m\n"
-msgstr "Chyba při iteraci přes bloky v inode %i: %m\n"
+msgstr "Chyba při iteraci přes bloky v iuzlu %i: %m\n"
#. @-expanded: Error storing inode count information (inode=%i, count=%N): %m\n
-#: e2fsck/problem.c:603
+#: e2fsck/problem.c:607
msgid "Error storing @i count information (@i=%i, count=%N): %m\n"
-msgstr "Chyba pÅ™i ukládánà informace o poÄtu inode (inode=%i, poÄet=%N): %m\n"
+msgstr "Chyba pÅ™i ukládánà informace o Äetnosti iuzlu (iuzel=%i, poÄet=%N): %m\n"
#. @-expanded: Error storing directory block information (inode=%i, block=%b, num=%N): %m\n
-#: e2fsck/problem.c:608
+#: e2fsck/problem.c:612
msgid "Error storing @d @b information (@i=%i, @b=%b, num=%N): %m\n"
-msgstr "Chyba pÅ™i ukládánà informace o bloku adresáře (inode=%i, blok=%b, ÄÃs=%N): %m\n"
+msgstr "Chyba pÅ™i ukládánà informace o bloku adresáře (iuzel=%i, blok=%b, ÄÃs=%N): %m\n"
#. @-expanded: Error reading inode %i: %m\n
-#: e2fsck/problem.c:614
+#: e2fsck/problem.c:618
#, c-format
msgid "Error reading @i %i: %m\n"
-msgstr "Chyba pÅ™i Ätenà inode %i: %m\n"
+msgstr "Chyba pÅ™i Ätenà iuzlu %i: %m\n"
#. @-expanded: inode %i has imagic flag set.
-#: e2fsck/problem.c:622
+#: e2fsck/problem.c:626
#, c-format
msgid "@i %i has imagic flag set. "
msgstr "Iuzel %i má nastaven pÅ™Ãznak imagic. "
#. @-expanded: Special (device/socket/fifo/symlink) file (inode %i) has immutable\n
#. @-expanded: or append-only flag set.
-#: e2fsck/problem.c:627
+#: e2fsck/problem.c:631
#, c-format
msgid ""
"Special (@v/socket/fifo/symlink) file (@i %i) has immutable\n"
"or append-only flag set. "
msgstr ""
-"Speciálnà (zaÅ™ÃzenÃ/socket/fifo/symbolický odkaz) soubor (inode %i) má nastaven\n"
+"Speciálnà (zaÅ™ÃzenÃ/socket/fifo/symbolický odkaz) soubor (iuzel %i) má nastaven\n"
"pÅ™Ãznak immutable nebo append-only. "
#. @-expanded: inode %i has compression flag set on filesystem without compression support.
-#: e2fsck/problem.c:633
+#: e2fsck/problem.c:637
#, c-format
msgid "@i %i has @cion flag set on @f without @cion support. "
msgstr "Iuzel %i má nastaven pÅ™Ãznak komprimace na systému souborů bez podpory komprimace. "
#. @-expanded: Special (device/socket/fifo) inode %i has non-zero size.
-#: e2fsck/problem.c:638
+#: e2fsck/problem.c:642
#, c-format
msgid "Special (@v/socket/fifo) @i %i has non-zero size. "
msgstr "Speciálnà (zaÅ™ÃzenÃ/socket/fifo) iuzel %i má nenulovou délku. "
#. @-expanded: journal inode is not in use, but contains data.
-#: e2fsck/problem.c:648
+#: e2fsck/problem.c:652
msgid "@j @i is not in use, but contains data. "
msgstr "Iuzel žurnálu se nepoužÃvá, ale obsahuje data. "
#. @-expanded: journal is not regular file.
-#: e2fsck/problem.c:653
+#: e2fsck/problem.c:657
msgid "@j is not regular file. "
msgstr "Žurnál nenà obyÄejný soubor. "
#. @-expanded: inode %i was part of the orphaned inode list.
-#: e2fsck/problem.c:658
+#: e2fsck/problem.c:662
#, c-format
msgid "@i %i was part of the @o @i list. "
msgstr "Iuzel %i byl souÄástà seznamu osiÅ™elých iuzlů. "
#. @-expanded: inodes that were part of a corrupted orphan linked list found.
-#: e2fsck/problem.c:664
+#: e2fsck/problem.c:668
msgid "@is that were part of a corrupted orphan linked list found. "
-msgstr "Nalezeny inode, které byly souÄástà poÅ¡kozeného spojového seznamu osiÅ™elých. "
+msgstr "Nalezeny iuzly, které byly souÄástà poÅ¡kozeného spojového seznamu osiÅ™elých. "
#. @-expanded: error allocating refcount structure (%N): %m\n
-#: e2fsck/problem.c:669
+#: e2fsck/problem.c:673
msgid "@A refcount structure (%N): %m\n"
msgstr "Chyba při alokaci struktury refcount (%N): %m\n"
#. @-expanded: Error reading extended attribute block %b for inode %i.
-#: e2fsck/problem.c:674
+#: e2fsck/problem.c:678
msgid "Error reading @a @b %b for @i %i. "
-msgstr "Chyba pÅ™i Ätenà bloku rozÅ¡ÃÅ™ených atributů %b pro inode %i. "
+msgstr "Chyba pÅ™i Ätenà bloku rozÅ¡ÃÅ™ených atributů %b pro iuzel %i. "
#. @-expanded: inode %i has a bad extended attribute block %b.
-#: e2fsck/problem.c:679
+#: e2fsck/problem.c:683
msgid "@i %i has a bad @a @b %b. "
msgstr "Iuzel %i má Å¡patný blok rozÅ¡ÃÅ™ených atributů %b. "
#. @-expanded: Error reading extended attribute block %b (%m).
-#: e2fsck/problem.c:684
+#: e2fsck/problem.c:688
msgid "Error reading @a @b %b (%m). "
msgstr "Chyba pÅ™i Ätenà bloku rozÅ¡ÃÅ™ených atributů %b (%m). "
#. @-expanded: extended attribute block %b has reference count %B, should be %N.
-#: e2fsck/problem.c:689
+#: e2fsck/problem.c:693
msgid "@a @b %b has reference count %B, @s %N. "
msgstr "Blok rozÅ¡ÃÅ™ených atributů %b má poÄet odkazů %B, mÄ›l by být %N. "
#. @-expanded: Error writing extended attribute block %b (%m).
-#: e2fsck/problem.c:694
+#: e2fsck/problem.c:698
msgid "Error writing @a @b %b (%m). "
msgstr "Chyba pÅ™i zápisu bloku rozÅ¡ÃÅ™ených atributů %b (%m). "
#. @-expanded: extended attribute block %b has h_blocks > 1.
-#: e2fsck/problem.c:699
+#: e2fsck/problem.c:703
msgid "@a @b %b has h_ at bs > 1. "
msgstr "Blok rozÅ¡ÃÅ™ených atributů %b má h_blocks > 1. "
#. @-expanded: error allocating extended attribute block %b.
-#: e2fsck/problem.c:704
+#: e2fsck/problem.c:708
msgid "@A @a @b %b. "
msgstr "Chyba pÅ™i alokaci bloku rozÅ¡ÃÅ™ených atributů %b. "
#. @-expanded: extended attribute block %b is corrupt (allocation collision).
-#: e2fsck/problem.c:709
+#: e2fsck/problem.c:713
msgid "@a @b %b is corrupt (allocation collision). "
msgstr "Blok rozÅ¡ÃÅ™ených atributů %b je poÅ¡kozen (kolize alokace). "
#. @-expanded: extended attribute block %b is corrupt (invalid name).
-#: e2fsck/problem.c:714
+#: e2fsck/problem.c:718
msgid "@a @b %b is corrupt (@n name). "
msgstr "Blok rozÅ¡ÃÅ™ených atributů %b je poÅ¡kozen (neplatný název). "
#. @-expanded: extended attribute block %b is corrupt (invalid value).
-#: e2fsck/problem.c:719
+#: e2fsck/problem.c:723
msgid "@a @b %b is corrupt (@n value). "
msgstr "Blok rozÅ¡ÃÅ™ených atributů %b je poÅ¡kozen (neplatná hodnota). "
#. @-expanded: inode %i is too big.
-#: e2fsck/problem.c:724
+#: e2fsck/problem.c:728
#, c-format
msgid "@i %i is too big. "
msgstr "Iuzel %i je pÅ™ÃliÅ¡ velká. "
#. @-expanded: block #%B (%b) causes directory to be too big.
-#: e2fsck/problem.c:728
+#: e2fsck/problem.c:732
msgid "@b #%B (%b) causes @d to be too big. "
msgstr "Blok #%B (%b) působÃ, že adresář je pÅ™ÃliÅ¡ velký. "
#. @-expanded: block #%B (%b) causes file to be too big.
-#: e2fsck/problem.c:733
+#: e2fsck/problem.c:737
msgid "@b #%B (%b) causes file to be too big. "
msgstr "Blok #%B (%b) působÃ, že soubor je pÅ™ÃliÅ¡ velký. "
#. @-expanded: block #%B (%b) causes symlink to be too big.
-#: e2fsck/problem.c:738
+#: e2fsck/problem.c:742
msgid "@b #%B (%b) causes symlink to be too big. "
msgstr "Blok #%B (%b) působÃ, že symbolický odkaz je pÅ™ÃliÅ¡ velký. "
#. @-expanded: inode %i has INDEX_FL flag set on filesystem without htree support.\n
-#: e2fsck/problem.c:743
+#: e2fsck/problem.c:747
#, c-format
msgid "@i %i has INDEX_FL flag set on @f without htree support.\n"
msgstr "Iuzel %i má nastaven pÅ™Ãznak INDEX_FL na systému souborů bez podpory htree.\n"
#. @-expanded: inode %i has INDEX_FL flag set but is not a directory.\n
-#: e2fsck/problem.c:748
+#: e2fsck/problem.c:752
#, c-format
msgid "@i %i has INDEX_FL flag set but is not a @d.\n"
msgstr "Iuzel %i má nastaven pÅ™Ãznak INDEX_FL, ale nenà adresář.\n"
#. @-expanded: HTREE directory inode %i has an invalid root node.\n
-#: e2fsck/problem.c:753
+#: e2fsck/problem.c:757
#, c-format
msgid "@h %i has an @n root node.\n"
msgstr "Iuzel HTREE adresáře %i má neplatný kořenový uzel.\n"
#. @-expanded: HTREE directory inode %i has an unsupported hash version (%N)\n
-#: e2fsck/problem.c:758
+#: e2fsck/problem.c:762
msgid "@h %i has an unsupported hash version (%N)\n"
msgstr "Iuzel HTREE adresáře %i má nepodporovanou verzi hashe (%N)\n"
#. @-expanded: HTREE directory inode %i uses an incompatible htree root node flag.\n
-#: e2fsck/problem.c:763
+#: e2fsck/problem.c:767
#, c-format
msgid "@h %i uses an incompatible htree root node flag.\n"
msgstr "Iuzel HTREE adresáře %i použÃvá nekompatibilnà pÅ™Ãznak koÅ™enového uzlu htree.\n"
#. @-expanded: HTREE directory inode %i has a tree depth (%N) which is too big\n
-#: e2fsck/problem.c:768
+#: e2fsck/problem.c:772
msgid "@h %i has a tree depth (%N) which is too big\n"
msgstr "Iuzel HTREE adresáře %i má hloubku stromu (%N), která je pÅ™ÃliÅ¡ velká\n"
#. @-expanded: Bad block inode has an indirect block (%b) that conflicts with\n
#. @-expanded: filesystem metadata.
-#: e2fsck/problem.c:773
+#: e2fsck/problem.c:777
msgid ""
"Bad @b @i has an indirect @b (%b) that conflicts with\n"
"@f metadata. "
@@ -1538,60 +1542,65 @@ msgstr ""
"souborového systému. "
#. @-expanded: Resize inode (re)creation failed: %m.
-#: e2fsck/problem.c:779
+#: e2fsck/problem.c:783
#, c-format
msgid "Resize @i (re)creation failed: %m."
msgstr "(Znovu) vytvořenà iuzlu pro změny velikosti selhalo: %m."
#. @-expanded: inode %i has a extra size (%IS) which is invalid\n
-#: e2fsck/problem.c:784
+#: e2fsck/problem.c:788
msgid "@i %i has a extra size (%IS) which is @n\n"
msgstr "Iuzel %i má velikost navÃc (%IS), která nenà platná\n"
#. @-expanded: extended attribute in inode %i has a namelen (%N) which is invalid\n
-#: e2fsck/problem.c:789
+#: e2fsck/problem.c:793
msgid "@a in @i %i has a namelen (%N) which is @n\n"
msgstr "RozÅ¡ÃÅ™ený atribut v iuzlu %i má délku jména (%N), která nenà platná\n"
-#. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n
-#: e2fsck/problem.c:794
-msgid "@a in @i %i has a value size (%N) which is @n\n"
-msgstr "RozÅ¡ÃÅ™ený atribut v iuzlu %i má velikost hodnoty (%N), která nenà platná\n"
-
#. @-expanded: extended attribute in inode %i has a value offset (%N) which is invalid\n
-#: e2fsck/problem.c:799
+#: e2fsck/problem.c:798
msgid "@a in @i %i has a value offset (%N) which is @n\n"
msgstr "RozÅ¡ÃÅ™ený atribut v iuzlu %i má pozici hodnoty (%N), která nenà platná\n"
#. @-expanded: extended attribute in inode %i has a value block (%N) which is invalid (must be 0)\n
-#: e2fsck/problem.c:804
+#: e2fsck/problem.c:803
msgid "@a in @i %i has a value @b (%N) which is @n (must be 0)\n"
msgstr "RozÅ¡ÃÅ™ený atribut v iuzlu %i má blok hodnot (%N), který nenà platný (musà být 0)\n"
+#. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n
+#: e2fsck/problem.c:808
+msgid "@a in @i %i has a value size (%N) which is @n\n"
+msgstr "RozÅ¡ÃÅ™ený atribut v iuzlu %i má velikost hodnoty (%N), která nenà platná\n"
+
#. @-expanded: extended attribute in inode %i has a hash (%N) which is invalid\n
-#: e2fsck/problem.c:809
+#: e2fsck/problem.c:813
msgid "@a in @i %i has a hash (%N) which is @n\n"
msgstr "RozÅ¡ÃÅ™ený atribut v iuzlu %i má hash (%N), který nenà platný\n"
#. @-expanded: inode %i is a %It but it looks like it is really a directory.\n
-#: e2fsck/problem.c:814
+#: e2fsck/problem.c:818
msgid "@i %i is a %It but it looks like it is really a directory.\n"
msgstr "Iuzel %i je %It, ale ve skuteÄnosti vypadá na adresář.\n"
#. @-expanded: Error while reading over extent tree in inode %i: %m\n
-#: e2fsck/problem.c:819
+#: e2fsck/problem.c:823
#, c-format
msgid "Error while reading over @x tree in @i %i: %m\n"
msgstr "Chyba pÅ™i proÄÃtánà stromu @x v iuzlu %i: %m\n"
-#: e2fsck/problem.c:824
-#, c-format
-msgid "Error while deleting extent: %m\n"
-msgstr "Chyba při mazánà rozsahu: %m\n"
+#. @-expanded: Failed to iterate extents in inode %i\n
+#. @-expanded: \t(op %s, blk %b, lblk %c): %m\n
+#: e2fsck/problem.c:828
+msgid ""
+"Failed to iterate extents in @i %i\n"
+"\t(op %s, blk %b, lblk %c): %m\n"
+msgstr ""
+"Průchod rozsahy iuzlu %i selhal\n"
+"\t(op %s, blk %b, lblk %c): %m\n"
#. @-expanded: inode %i has an invalid extent\n
#. @-expanded: \t(logical block %c, invalid physical block %b, len %N)\n
-#: e2fsck/problem.c:829
+#: e2fsck/problem.c:834
msgid ""
"@i %i has an @n extent\n"
"\t(logical @b %c, @n physical @b %b, len %N)\n"
@@ -1601,7 +1610,7 @@ msgstr ""
#. @-expanded: inode %i has an invalid extent\n
#. @-expanded: \t(logical block %c, physical block %b, invalid len %N)\n
-#: e2fsck/problem.c:834
+#: e2fsck/problem.c:839
msgid ""
"@i %i has an @n extent\n"
"\t(logical @b %c, physical @b %b, @n len %N)\n"
@@ -1610,31 +1619,31 @@ msgstr ""
"\t(logický blok %c, fyzický blok %b, neplatná délka %N)\n"
#. @-expanded: inode %i has EXTENTS_FL flag set on filesystem without extents support.\n
-#: e2fsck/problem.c:839
+#: e2fsck/problem.c:844
#, c-format
msgid "@i %i has EXTENTS_FL flag set on @f without extents support.\n"
msgstr "Iuzel %i má nastaven pÅ™Ãznak EXTENTS_FL na systému souborů bez podpory rozsahů.\n"
#. @-expanded: inode %i is in extent format, but superblock is missing EXTENTS feature\n
-#: e2fsck/problem.c:844
+#: e2fsck/problem.c:849
#, c-format
msgid "@i %i is in extent format, but @S is missing EXTENTS feature\n"
msgstr "Iuzel %i rozsahový formát, ale superbloku chybà vlastnost EXTENTS\n"
#. @-expanded: inode %i missing EXTENT_FL, but is in extents format\n
-#: e2fsck/problem.c:849
+#: e2fsck/problem.c:854
#, c-format
msgid "@i %i missing EXTENT_FL, but is in extents format\n"
msgstr "Iuzlu %i chybà EXTENT_FL, ale je v rozsahovém formátu\n"
-#: e2fsck/problem.c:854
+#: e2fsck/problem.c:859
#, c-format
msgid "Fast symlink %i has EXTENT_FL set. "
msgstr "Rychlý symbolický odkaz %i na nastaveno EXTENT_FL. "
#. @-expanded: inode %i has out of order extents\n
#. @-expanded: \t(invalid logical block %c, physical block %b, len %N)\n
-#: e2fsck/problem.c:859
+#: e2fsck/problem.c:864
msgid ""
"@i %i has out of order extents\n"
"\t(@n logical @b %c, physical @b %b, len %N)\n"
@@ -1642,10 +1651,15 @@ msgstr ""
"Iuzel %i má zpřeházené rozsahy\n"
"\t(neplatný logický blok %c, fyzický blok %b, délka %N)\n"
+#. @-expanded: inode %i has an invalid extent node (blk %b, lblk %c)\n
+#: e2fsck/problem.c:868
+msgid "@i %i has an invalid extent node (blk %b, lblk %c)\n"
+msgstr "Iuzel %i má neplatný uzel rozsahů (op %s, blk %b, lblk %c): %m\n"
+
#. @-expanded: \n
#. @-expanded: Running additional passes to resolve blocks claimed by more than one inode...\n
#. @-expanded: Pass 1B: Rescanning for multiply-claimed blocks\n
-#: e2fsck/problem.c:866
+#: e2fsck/problem.c:875
msgid ""
"\n"
"Running additional passes to resolve @bs claimed by more than one @i...\n"
@@ -1657,66 +1671,66 @@ msgstr ""
"Průchod 1B: Znovu vyÅ¡etÅ™uji vÃce krát alokované bloky\n"
#. @-expanded: multiply-claimed block(s) in inode %i:
-#: e2fsck/problem.c:872
+#: e2fsck/problem.c:881
#, c-format
msgid "@m @b(s) in @i %i:"
msgstr "VÃce krát alokovaný(é) blok(y) v iuzlu %i:"
-#: e2fsck/problem.c:887
+#: e2fsck/problem.c:896
#, c-format
msgid "Error while scanning inodes (%i): %m\n"
-msgstr "Chyba při zkoumánà inode (%i): %m\n"
+msgstr "Chyba při zkoumánà iuzlů (%i): %m\n"
#. @-expanded: error allocating inode bitmap (inode_dup_map): %m\n
-#: e2fsck/problem.c:892
+#: e2fsck/problem.c:901
#, c-format
msgid "@A @i @B (@i_dup_map): %m\n"
msgstr "Chyba při alokaci bitmapy iuzlů (inode_dup_map): %m\n"
#. @-expanded: Error while iterating over blocks in inode %i (%s): %m\n
-#: e2fsck/problem.c:897
+#: e2fsck/problem.c:906
#, c-format
msgid "Error while iterating over @bs in @i %i (%s): %m\n"
-msgstr "Chyba při iteraci přes bloky v inode %i (%s): %m\n"
+msgstr "Chyba při iteraci přes bloky v iuzlu %i (%s): %m\n"
#. @-expanded: Error adjusting refcount for extended attribute block %b (inode %i): %m\n
-#: e2fsck/problem.c:902 e2fsck/problem.c:1218
+#: e2fsck/problem.c:911 e2fsck/problem.c:1227
msgid "Error adjusting refcount for @a @b %b (@i %i): %m\n"
msgstr "Chyba pÅ™i úpravÄ› poÄtu odkazů bloku rozÅ¡ÃÅ™ených atributů %b (iuzel %i): %m\n"
#. @-expanded: Pass 1C: Scanning directories for inodes with multiply-claimed blocks\n
-#: e2fsck/problem.c:908
+#: e2fsck/problem.c:917
msgid "Pass 1C: Scanning directories for @is with @m @bs\n"
msgstr "Průchod 1C: Hledánà iuzlů s duplikovanými bloky v adresářÃch.\n"
#. @-expanded: Pass 1D: Reconciling multiply-claimed blocks\n
-#: e2fsck/problem.c:914
+#: e2fsck/problem.c:923
msgid "Pass 1D: Reconciling @m @bs\n"
msgstr "Průchod 1D: Opravuji duplikátnà bloky\n"
#. @-expanded: File %Q (inode #%i, mod time %IM) \n
#. @-expanded: has %B multiply-claimed block(s), shared with %N file(s):\n
-#: e2fsck/problem.c:919
+#: e2fsck/problem.c:928
msgid ""
"File %Q (@i #%i, mod time %IM) \n"
" has %B @m @b(s), shared with %N file(s):\n"
msgstr ""
-"Soubor %Q (inode #%i, Äas zmÄ›ny %IM) \n"
+"Soubor %Q (iuzel %i, Äas zmÄ›ny %IM) \n"
" má %B duplikovaných bloků sdÃlených mezi %N soubory:\n"
#. @-expanded: \t%Q (inode #%i, mod time %IM)\n
-#: e2fsck/problem.c:925
+#: e2fsck/problem.c:934
msgid "\t%Q (@i #%i, mod time %IM)\n"
-msgstr " %Q (inode #%i, Äas zmÄ›ny %IM)\n"
+msgstr " %Q (iuzel %i, Äas zmÄ›ny %IM)\n"
#. @-expanded: \t<filesystem metadata>\n
-#: e2fsck/problem.c:930
+#: e2fsck/problem.c:939
msgid "\t<@f metadata>\n"
msgstr "\t<metadata systému souborů>\n"
#. @-expanded: (There are %N inodes containing multiply-claimed blocks.)\n
#. @-expanded: \n
-#: e2fsck/problem.c:935
+#: e2fsck/problem.c:944
msgid ""
"(There are %N @is containing @m @bs.)\n"
"\n"
@@ -1726,7 +1740,7 @@ msgstr ""
#. @-expanded: multiply-claimed blocks already reassigned or cloned.\n
#. @-expanded: \n
-#: e2fsck/problem.c:940
+#: e2fsck/problem.c:949
msgid ""
"@m @bs already reassigned or cloned.\n"
"\n"
@@ -1734,317 +1748,317 @@ msgstr ""
"Duplikátnà bloky již přiřazeny nebo naklonovány.\n"
"\n"
-#: e2fsck/problem.c:953
+#: e2fsck/problem.c:962
#, c-format
msgid "Couldn't clone file: %m\n"
msgstr "Nemohu klonovat soubor: %m\n"
#. @-expanded: Pass 2: Checking directory structure\n
-#: e2fsck/problem.c:959
+#: e2fsck/problem.c:968
msgid "Pass 2: Checking @d structure\n"
msgstr "Průchod 2: Kontroluji strukturu adresářů\n"
#. @-expanded: invalid inode number for '.' in directory inode %i.\n
-#: e2fsck/problem.c:964
+#: e2fsck/problem.c:973
#, c-format
msgid "@n @i number for '.' in @d @i %i.\n"
msgstr "Å patné ÄÃslo iuzlu pro „.“ v iuzlu adresáře %i.\n"
#. @-expanded: entry '%Dn' in %p (%i) has invalid inode #: %Di.\n
-#: e2fsck/problem.c:969
+#: e2fsck/problem.c:978
msgid "@E has @n @i #: %Di.\n"
msgstr "Položka „%Dn“ v %p (%i) má Å¡patné ÄÃslo iuzlu: %Di.\n"
#. @-expanded: entry '%Dn' in %p (%i) has deleted/unused inode %Di.
-#: e2fsck/problem.c:974
+#: e2fsck/problem.c:983
msgid "@E has @D/unused @i %Di. "
-msgstr "Položka „%Dn“ v %p (%i) má odstranÄ›nou/nepoužÃvanou inode %Di. "
+msgstr "Položka „%Dn“ v %p (%i) má odstranÄ›ný/nepoužÃvaný iuzel %Di. "
#. @-expanded: entry '%Dn' in %p (%i) is a link to '.'
-#: e2fsck/problem.c:979
+#: e2fsck/problem.c:988
msgid "@E @L to '.' "
msgstr "Položka „%Dn“ v %p (%i) je odkaz na „.“ "
#. @-expanded: entry '%Dn' in %p (%i) points to inode (%Di) located in a bad block.\n
-#: e2fsck/problem.c:984
+#: e2fsck/problem.c:993
msgid "@E points to @i (%Di) located in a bad @b.\n"
-msgstr "Položka „%Dn“ v %p (%i) ukazuje na inode (%Di) umÃstÄ›nou ve Å¡patném bloku.\n"
+msgstr "Položka „%Dn“ v %p (%i) ukazuje na iuzel (%Di) umÃstÄ›ný ve Å¡patném bloku.\n"
#. @-expanded: entry '%Dn' in %p (%i) is a link to directory %P (%Di).\n
-#: e2fsck/problem.c:989
+#: e2fsck/problem.c:998
msgid "@E @L to @d %P (%Di).\n"
msgstr "Položka „%Dn“ v %p (%i) je odkaz na adresář %P (%Di).\n"
#. @-expanded: entry '%Dn' in %p (%i) is a link to the root inode.\n
-#: e2fsck/problem.c:994
+#: e2fsck/problem.c:1003
msgid "@E @L to the @r.\n"
-msgstr "Položka „%Dn“ v %p (%i) je odkaz na kořenovou inode.\n"
+msgstr "Položka „%Dn“ v %p (%i) je odkaz na kořenový iuzel.\n"
#. @-expanded: entry '%Dn' in %p (%i) has illegal characters in its name.\n
-#: e2fsck/problem.c:999
+#: e2fsck/problem.c:1008
msgid "@E has illegal characters in its name.\n"
msgstr "Položka „%Dn“ v %p (%i) má ve svém jméně neplatné znaky.\n"
#. @-expanded: Missing '.' in directory inode %i.\n
-#: e2fsck/problem.c:1004
+#: e2fsck/problem.c:1013
#, c-format
msgid "Missing '.' in @d @i %i.\n"
-msgstr "Chybà „.“ v inode adresáře %i.\n"
+msgstr "Chybà „.“ v iuzlu adresáře %i.\n"
#. @-expanded: Missing '..' in directory inode %i.\n
-#: e2fsck/problem.c:1009
+#: e2fsck/problem.c:1018
#, c-format
msgid "Missing '..' in @d @i %i.\n"
-msgstr "Chybà „..“ v inode adresáře %i.\n"
+msgstr "Chybà „..“ v iuzlu adresáře %i.\n"
#. @-expanded: First entry '%Dn' (inode=%Di) in directory inode %i (%p) should be '.'\n
-#: e2fsck/problem.c:1014
+#: e2fsck/problem.c:1023
msgid "First @e '%Dn' (@i=%Di) in @d @i %i (%p) @s '.'\n"
-msgstr "Prvnà položka „%Dn“ (inode=%Di) v iuzlu adresáře %i (%p) by měla být „.“\n"
+msgstr "Prvnà položka „%Dn“ (iuzel=%Di) v iuzlu adresáře %i (%p) by měla být „.“\n"
#. @-expanded: Second entry '%Dn' (inode=%Di) in directory inode %i should be '..'\n
-#: e2fsck/problem.c:1019
+#: e2fsck/problem.c:1028
msgid "Second @e '%Dn' (@i=%Di) in @d @i %i @s '..'\n"
-msgstr "Druhá položka „%Dn“ (inode=%Di) v iuzlu adresáře %i by měla být „..“\n"
+msgstr "Druhá položka „%Dn“ (iuzel=%Di) v iuzlu adresáře %i by měla být „..“\n"
#. @-expanded: i_faddr for inode %i (%Q) is %IF, should be zero.\n
-#: e2fsck/problem.c:1024
+#: e2fsck/problem.c:1033
msgid "i_faddr @F %IF, @s zero.\n"
-msgstr "i_faddr pro inode %i (%Q) je %IF, měla by být nula.\n"
+msgstr "i_faddr pro iuzel %i (%Q) je %IF, měla by být nula.\n"
#. @-expanded: i_file_acl for inode %i (%Q) is %If, should be zero.\n
-#: e2fsck/problem.c:1029
+#: e2fsck/problem.c:1038
msgid "i_file_acl @F %If, @s zero.\n"
-msgstr "i_file_acl pro inode %i (%Q) je %If, mělo by být nula.\n"
+msgstr "i_file_acl pro iuzel %i (%Q) je %If, mělo by být nula.\n"
#. @-expanded: i_dir_acl for inode %i (%Q) is %Id, should be zero.\n
-#: e2fsck/problem.c:1034
+#: e2fsck/problem.c:1043
msgid "i_dir_acl @F %Id, @s zero.\n"
-msgstr "i_dir_acl pro inode %i (%Q) je %N, mělo by být nula.\n"
+msgstr "i_dir_acl pro iuzel %i (%Q) je %N, mělo by být nula.\n"
#. @-expanded: i_frag for inode %i (%Q) is %N, should be zero.\n
-#: e2fsck/problem.c:1039
+#: e2fsck/problem.c:1048
msgid "i_frag @F %N, @s zero.\n"
-msgstr "i_frag pro inode %i (%Q) je %N, mělo by být nula.\n"
+msgstr "i_frag pro iuzel %i (%Q) je %N, mělo by být nula.\n"
#. @-expanded: i_fsize for inode %i (%Q) is %N, should be zero.\n
-#: e2fsck/problem.c:1044
+#: e2fsck/problem.c:1053
msgid "i_fsize @F %N, @s zero.\n"
-msgstr "i_fsize pro inode %i (%Q) je %N, měla by být nula.\n"
+msgstr "i_fsize pro iuzel %i (%Q) je %N, měla by být nula.\n"
#. @-expanded: inode %i (%Q) has invalid mode (%Im).\n
-#: e2fsck/problem.c:1049
+#: e2fsck/problem.c:1058
msgid "@i %i (%Q) has @n mode (%Im).\n"
msgstr "Iuzel %i (%Q) má špatný mód (%Im).\n"
#. @-expanded: directory inode %i, block %B, offset %N: directory corrupted\n
-#: e2fsck/problem.c:1054
+#: e2fsck/problem.c:1063
msgid "@d @i %i, @b %B, offset %N: @d corrupted\n"
-msgstr "inode adresáře %i, blok %B, posun %N: adresář poškozen\n"
+msgstr "Iuzel adresáře %i, blok %B, posun %N: adresář poškozen\n"
#. @-expanded: directory inode %i, block %B, offset %N: filename too long\n
-#: e2fsck/problem.c:1059
+#: e2fsck/problem.c:1068
msgid "@d @i %i, @b %B, offset %N: filename too long\n"
-msgstr "inode adresáře %i, blok %B, posun %N: název souboru pÅ™ÃliÅ¡ dlouhý\n"
+msgstr "Iuzel adresáře %i, blok %B, posun %N: název souboru pÅ™ÃliÅ¡ dlouhý\n"
#. @-expanded: directory inode %i has an unallocated block #%B.
-#: e2fsck/problem.c:1064
+#: e2fsck/problem.c:1073
msgid "@d @i %i has an unallocated @b #%B. "
-msgstr "inode adresáře %i má nealokovaný blok #%B. "
+msgstr "Iuzel adresáře %i má nealokovaný blok #%B. "
#. @-expanded: '.' directory entry in directory inode %i is not NULL terminated\n
-#: e2fsck/problem.c:1069
+#: e2fsck/problem.c:1078
#, c-format
msgid "'.' @d @e in @d @i %i is not NULL terminated\n"
-msgstr "Položka adresáře „.“ v inode adresáře %i nenà ukonÄena NULL\n"
+msgstr "Položka adresáře „.“ v iuzlu adresáře %i nenà ukonÄena NULL\n"
#. @-expanded: '..' directory entry in directory inode %i is not NULL terminated\n
-#: e2fsck/problem.c:1074
+#: e2fsck/problem.c:1083
#, c-format
msgid "'..' @d @e in @d @i %i is not NULL terminated\n"
-msgstr "Položka adresáře „..“ v inode adresáře %i nenà ukonÄena NULL\n"
+msgstr "Položka adresáře „..“ v iuzlu adresáře %i nenà ukonÄena NULL\n"
#. @-expanded: inode %i (%Q) is an illegal character device.\n
-#: e2fsck/problem.c:1079
+#: e2fsck/problem.c:1088
msgid "@i %i (%Q) is an @I character @v.\n"
msgstr "Iuzel %i (%q) je neplatné znakové zaÅ™ÃzenÃ.\n"
#. @-expanded: inode %i (%Q) is an illegal block device.\n
-#: e2fsck/problem.c:1084
+#: e2fsck/problem.c:1093
msgid "@i %i (%Q) is an @I @b @v.\n"
msgstr "Iuzel %i (%Q) je neplatné blokové zaÅ™ÃzenÃ.\n"
#. @-expanded: entry '%Dn' in %p (%i) is duplicate '.' entry.\n
-#: e2fsck/problem.c:1089
+#: e2fsck/problem.c:1098
msgid "@E is duplicate '.' @e.\n"
msgstr "Položka „%Dn“ v %p (%i) je duplikátnà položka „.“.\n"
#. @-expanded: entry '%Dn' in %p (%i) is duplicate '..' entry.\n
-#: e2fsck/problem.c:1094
+#: e2fsck/problem.c:1103
msgid "@E is duplicate '..' @e.\n"
msgstr "Položka „%Dn“ v %p (%i) je duplikátnà položka „..“.\n"
-#: e2fsck/problem.c:1099 e2fsck/problem.c:1394
+#: e2fsck/problem.c:1108 e2fsck/problem.c:1408
#, c-format
msgid "Internal error: couldn't find dir_info for %i.\n"
msgstr "Internà chyba: nemohu najÃt dir_info pro %i.\n"
#. @-expanded: entry '%Dn' in %p (%i) has rec_len of %Dr, should be %N.\n
-#: e2fsck/problem.c:1104
+#: e2fsck/problem.c:1113
msgid "@E has rec_len of %Dr, @s %N.\n"
msgstr "Položka „%Dn“ v %p (%i) má rec_len %Dr, měla by být %N.\n"
#. @-expanded: error allocating icount structure: %m\n
-#: e2fsck/problem.c:1109
+#: e2fsck/problem.c:1118
#, c-format
msgid "@A icount structure: %m\n"
msgstr "Chyba při alokaci struktury icount: %m\n"
#. @-expanded: Error iterating over directory blocks: %m\n
-#: e2fsck/problem.c:1114
+#: e2fsck/problem.c:1123
#, c-format
msgid "Error iterating over @d @bs: %m\n"
msgstr "Chyba při iterovánà přes bloky adresáře: %m\n"
#. @-expanded: Error reading directory block %b (inode %i): %m\n
-#: e2fsck/problem.c:1119
+#: e2fsck/problem.c:1128
msgid "Error reading @d @b %b (@i %i): %m\n"
-msgstr "Chyba pÅ™i Ätenà bloku adresáře %b (inode %i): %m\n"
+msgstr "Chyba pÅ™i Ätenà bloku adresáře %b (iuzel %i): %m\n"
#. @-expanded: Error writing directory block %b (inode %i): %m\n
-#: e2fsck/problem.c:1124
+#: e2fsck/problem.c:1133
msgid "Error writing @d @b %b (@i %i): %m\n"
-msgstr "Chyba při zápisu bloku adresáře %b (inode %i): %m\n"
+msgstr "Chyba při zápisu bloku adresáře %b (iuzel %i): %m\n"
#. @-expanded: error allocating new directory block for inode %i (%s): %m\n
-#: e2fsck/problem.c:1129
+#: e2fsck/problem.c:1138
#, c-format
msgid "@A new @d @b for @i %i (%s): %m\n"
-msgstr "Chyba při alokaci nového bloku adresáře pro inode %i (%s): %m\n"
+msgstr "Chyba při alokaci nového bloku adresáře pro iuzel %i (%s): %m\n"
#. @-expanded: Error deallocating inode %i: %m\n
-#: e2fsck/problem.c:1134
+#: e2fsck/problem.c:1143
#, c-format
msgid "Error deallocating @i %i: %m\n"
-msgstr "Chyba při dealokaci inode %i: %m\n"
+msgstr "Chyba při dealokaci iuzlu %i: %m\n"
#. @-expanded: directory entry for '.' in %p (%i) is big.\n
-#: e2fsck/problem.c:1139
+#: e2fsck/problem.c:1148
#, c-format
msgid "@d @e for '.' in %p (%i) is big.\n"
msgstr "Položka adresáře pro „.“ v %p (%i) je velká.\n"
#. @-expanded: inode %i (%Q) is an illegal FIFO.\n
-#: e2fsck/problem.c:1144
+#: e2fsck/problem.c:1153
msgid "@i %i (%Q) is an @I FIFO.\n"
msgstr "Iuzel %i (%Q) je neplatná FIFO.\n"
#. @-expanded: inode %i (%Q) is an illegal socket.\n
-#: e2fsck/problem.c:1149
+#: e2fsck/problem.c:1158
msgid "@i %i (%Q) is an @I socket.\n"
msgstr "Iuzel %i (%Q) je neplatný socket.\n"
#. @-expanded: Setting filetype for entry '%Dn' in %p (%i) to %N.\n
-#: e2fsck/problem.c:1154
+#: e2fsck/problem.c:1163
msgid "Setting filetype for @E to %N.\n"
msgstr "Nastavuji filetype pro položku „%Dn“ v %p (%i) na %N.\n"
#. @-expanded: entry '%Dn' in %p (%i) has an incorrect filetype (was %Dt, should be %N).\n
-#: e2fsck/problem.c:1159
+#: e2fsck/problem.c:1168
msgid "@E has an incorrect filetype (was %Dt, @s %N).\n"
msgstr "Položka „%Dn“ v %p (%i) má chybný filetype (byl %Dt, měl by být %N).\n"
#. @-expanded: entry '%Dn' in %p (%i) has filetype set.\n
-#: e2fsck/problem.c:1164
+#: e2fsck/problem.c:1173
msgid "@E has filetype set.\n"
msgstr "Položka „%Dn“ v %p (%i) má nastaven filetype.\n"
#. @-expanded: entry '%Dn' in %p (%i) has a zero-length name.\n
-#: e2fsck/problem.c:1169
+#: e2fsck/problem.c:1178
msgid "@E has a @z name.\n"
msgstr "Položka „%Dn“ v %p (%i) má název nulové délky.\n"
#. @-expanded: Symlink %Q (inode #%i) is invalid.\n
-#: e2fsck/problem.c:1174
+#: e2fsck/problem.c:1183
msgid "Symlink %Q (@i #%i) is @n.\n"
msgstr "Symbolický odkaz %Q (iuzel #%i) nenà platný.\n"
# FIXME: @F already ends with 'is'
#. @-expanded: extended attribute block for inode %i (%Q) is invalid (%If).\n
-#: e2fsck/problem.c:1179
+#: e2fsck/problem.c:1188
msgid "@a @b @F @n (%If).\n"
msgstr "Blok rozÅ¡ÃÅ™ených atributů pro iuzel %i (%Q) nenà platný (%If).\n"
#. @-expanded: filesystem contains large files, but lacks LARGE_FILE flag in superblock.\n
-#: e2fsck/problem.c:1184
+#: e2fsck/problem.c:1193
msgid "@f contains large files, but lacks LARGE_FILE flag in @S.\n"
msgstr "Systém souborů obsahuje velké soubory, ale v superbloku nemá pÅ™Ãznak LARGE_FILE.\n"
#. @-expanded: problem in HTREE directory inode %d: node (%B) not referenced\n
-#: e2fsck/problem.c:1189
+#: e2fsck/problem.c:1198
msgid "@p @h %d: node (%B) not referenced\n"
-msgstr "Problém v inode HTREE adresáře %d: na uzel (%B) neexistuje odkaz\n"
+msgstr "Problém v iuzlu HTREE adresáře %d: na uzel (%B) neexistuje odkaz\n"
#. @-expanded: problem in HTREE directory inode %d: node (%B) referenced twice\n
-#: e2fsck/problem.c:1194
+#: e2fsck/problem.c:1203
msgid "@p @h %d: node (%B) referenced twice\n"
-msgstr "Problém v inode HTREE adresáře %d: na uzel (%B) existujà dva odkazy\n"
+msgstr "Problém v iuzlu HTREE adresáře %d: na uzel (%B) existujà dva odkazy\n"
#. @-expanded: problem in HTREE directory inode %d: node (%B) has bad min hash\n
-#: e2fsck/problem.c:1199
+#: e2fsck/problem.c:1208
msgid "@p @h %d: node (%B) has bad min hash\n"
-msgstr "Problém v inode HTREE adresáře %d: uzel (%B) má špatný min hash\n"
+msgstr "Problém v iuzlu HTREE adresáře %d: uzel (%B) má špatný min hash\n"
#. @-expanded: problem in HTREE directory inode %d: node (%B) has bad max hash\n
-#: e2fsck/problem.c:1204
+#: e2fsck/problem.c:1213
msgid "@p @h %d: node (%B) has bad max hash\n"
-msgstr "Problém v inode HTREE adresáře %d: uzel (%B) má špatný max hash\n"
+msgstr "Problém v iuzlu HTREE adresáře %d: uzel (%B) má špatný max hash\n"
#. @-expanded: invalid HTREE directory inode %d (%q).
-#: e2fsck/problem.c:1209
+#: e2fsck/problem.c:1218
msgid "@n @h %d (%q). "
msgstr "Neplatný iuzel HTREE adresáře %d (%q). "
#. @-expanded: problem in HTREE directory inode %d (%q): bad block number %b.\n
-#: e2fsck/problem.c:1213
+#: e2fsck/problem.c:1222
msgid "@p @h %d (%q): bad @b number %b.\n"
-msgstr "Problém v inode HTREE adresáře %d (%q): Å¡patné ÄÃslo bloku %b.\n"
+msgstr "Problém v iuzlu HTREE adresáře %d (%q): Å¡patné ÄÃslo bloku %b.\n"
#. @-expanded: problem in HTREE directory inode %d: root node is invalid\n
-#: e2fsck/problem.c:1223
+#: e2fsck/problem.c:1232
#, c-format
msgid "@p @h %d: root node is @n\n"
msgstr "Problém v iuzlu HTREE adresáře %d: kořenový uzel nenà platný\n"
#. @-expanded: problem in HTREE directory inode %d: node (%B) has invalid limit (%N)\n
-#: e2fsck/problem.c:1228
+#: e2fsck/problem.c:1237
msgid "@p @h %d: node (%B) has @n limit (%N)\n"
msgstr "Problém v iuzlu HTREE adresáře %d: uzel (%B) má špatný limit (%N)\n"
#. @-expanded: problem in HTREE directory inode %d: node (%B) has invalid count (%N)\n
-#: e2fsck/problem.c:1233
+#: e2fsck/problem.c:1242
msgid "@p @h %d: node (%B) has @n count (%N)\n"
msgstr "Problém v iuzlu HTREE adresáře %d: uzel (%B) má Å¡patný poÄet (%N)\n"
#. @-expanded: problem in HTREE directory inode %d: node (%B) has an unordered hash table\n
-#: e2fsck/problem.c:1238
+#: e2fsck/problem.c:1247
msgid "@p @h %d: node (%B) has an unordered hash table\n"
-msgstr "Problém v inode HTREE adresáře %d: uzel (%B) má nesetÅ™ÃdÄ›nou hash tabulku\n"
+msgstr "Problém v iuzlu HTREE adresáře %d: uzel (%B) má nesetÅ™ÃdÄ›nou hash tabulku\n"
#. @-expanded: problem in HTREE directory inode %d: node (%B) has invalid depth (%N)\n
-#: e2fsck/problem.c:1243
+#: e2fsck/problem.c:1252
msgid "@p @h %d: node (%B) has @n depth (%N)\n"
msgstr "Problém v iuzlu HTREE adresáře %d: uzel (%B) má špatnou hloubku (%N)\n"
#. @-expanded: Duplicate entry '%Dn' in %p (%i) found.
-#: e2fsck/problem.c:1248
+#: e2fsck/problem.c:1257
msgid "Duplicate @E found. "
msgstr "Nalezena duplikátnà položka „%Dn“ v %p (%i). "
# FIXME: no-c-format
#. @-expanded: entry '%Dn' in %p (%i) has a non-unique filename.\n
#. @-expanded: Rename to %s
-#: e2fsck/problem.c:1253
+#: e2fsck/problem.c:1262
#, no-c-format
msgid ""
"@E has a non-unique filename.\n"
@@ -2056,7 +2070,7 @@ msgstr ""
#. @-expanded: Duplicate entry '%Dn' found.\n
#. @-expanded: \tMarking %p (%i) to be rebuilt.\n
#. @-expanded: \n
-#: e2fsck/problem.c:1258
+#: e2fsck/problem.c:1267
msgid ""
"Duplicate @e '%Dn' found.\n"
"\tMarking %p (%i) to be rebuilt.\n"
@@ -2067,124 +2081,127 @@ msgstr ""
"\n"
#. @-expanded: i_blocks_hi for inode %i (%Q) is %N, should be zero.\n
-#: e2fsck/problem.c:1263
+#: e2fsck/problem.c:1272
msgid "i_blocks_hi @F %N, @s zero.\n"
msgstr "i_blocks_hi pro iuzel %i (%Q) je %N, měl by být nula.\n"
#. @-expanded: Unexpected block in HTREE directory inode %d (%q).\n
-#: e2fsck/problem.c:1268
+#: e2fsck/problem.c:1277
msgid "Unexpected @b in @h %d (%q).\n"
msgstr "NeoÄekávaný blok v iuzlu HTREE adresáře %d (%q).\n"
-#. @-expanded: inode %i found in group %g where _INODE_UNINIT is set.
-#: e2fsck/problem.c:1272
-#, c-format
-msgid "@i %i found in @g %g where _INODE_UNINIT is set. "
-msgstr "Iuzel %i nalezen ve skupinÄ› %g, kde je nastaveno _INODE_UNINIT. "
+#. @-expanded: entry '%Dn' in %p (%i) references inode %Di in group %g where _INODE_UNINIT is set.\n
+#: e2fsck/problem.c:1281
+msgid "@E references @i %Di in @g %g where _INODE_UNINIT is set.\n"
+msgstr "Položka „%Di“ v %p (%i) odkazuje na iuzel %Di ve skupině %g, kde je nastaveno _INODE_UNINIT.\n"
-#. @-expanded: inode %i found in group %g unused inodes area.
-#: e2fsck/problem.c:1277
-#, c-format
-msgid "@i %i found in @g %g unused inodes area. "
-msgstr "Iuzel %i nalezen ve skupině %g oblasti nepoužitých iuzlů. "
+#. @-expanded: entry '%Dn' in %p (%i) references inode %Di found in group %g's unused inodes area.\n
+#: e2fsck/problem.c:1286
+msgid "@E references @i %Di found in @g %g's unused inodes area.\n"
+msgstr "Položka „%Dn“ v %p (%i) odkazuje na iuzel %Di nalezený ve skupině %g oblasti nepoužitých iuzlů.\n"
+
+#. @-expanded: i_file_acl_hi for inode %i (%Q) is %N, should be zero.\n
+#: e2fsck/problem.c:1291
+msgid "i_file_acl_hi @F %N, @s zero.\n"
+msgstr "i_file_acl_hi pro iuzel %i (%Q) je %N, mělo by být nula.\n"
#. @-expanded: Pass 3: Checking directory connectivity\n
-#: e2fsck/problem.c:1284
+#: e2fsck/problem.c:1298
msgid "Pass 3: Checking @d connectivity\n"
msgstr "Průchod 3: Kontroluji dosažitelnost adresářů\n"
#. @-expanded: root inode not allocated.
-#: e2fsck/problem.c:1289
+#: e2fsck/problem.c:1303
msgid "@r not allocated. "
-msgstr "Kořenová inode nealokována. "
+msgstr "Kořenový iuzel nealokován. "
#. @-expanded: No room in lost+found directory.
-#: e2fsck/problem.c:1294
+#: e2fsck/problem.c:1308
msgid "No room in @l @d. "
msgstr "Nenà mÃsto v adresáři lost+found. "
#. @-expanded: Unconnected directory inode %i (%p)\n
-#: e2fsck/problem.c:1299
+#: e2fsck/problem.c:1313
#, c-format
msgid "Unconnected @d @i %i (%p)\n"
-msgstr "Nepřipojený adresář inode %i (%p)\n"
+msgstr "Nepřipojený adresářový iuzel %i (%p)\n"
#. @-expanded: /lost+found not found.
-#: e2fsck/problem.c:1304
+#: e2fsck/problem.c:1318
msgid "/@l not found. "
msgstr "/lost+found nenalezeno. "
#. @-expanded: '..' in %Q (%i) is %P (%j), should be %q (%d).\n
-#: e2fsck/problem.c:1309
+#: e2fsck/problem.c:1323
msgid "'..' in %Q (%i) is %P (%j), @s %q (%d).\n"
msgstr "„..“ v %Q (%i) je %P (%j), mělo by být %q (%d).\n"
#. @-expanded: Bad or non-existent /lost+found. Cannot reconnect.\n
-#: e2fsck/problem.c:1314
+#: e2fsck/problem.c:1328
msgid "Bad or non-existent /@l. Cannot reconnect.\n"
msgstr "Å patné nebo neexistujÃcà /lost+found. Nemohu znovu pÅ™ipojit.\n"
#. @-expanded: Could not expand /lost+found: %m\n
-#: e2fsck/problem.c:1319
+#: e2fsck/problem.c:1333
#, c-format
msgid "Could not expand /@l: %m\n"
msgstr "Nemohu zvětšit /lost+found: %m\n"
-#: e2fsck/problem.c:1324
+#: e2fsck/problem.c:1338
#, c-format
msgid "Could not reconnect %i: %m\n"
msgstr "Nemohu znovu připojit %i: %m\n"
#. @-expanded: Error while trying to find /lost+found: %m\n
-#: e2fsck/problem.c:1329
+#: e2fsck/problem.c:1343
#, c-format
msgid "Error while trying to find /@l: %m\n"
msgstr "Chyba pÅ™i pokusu najÃt /lost+found: %m\n"
#. @-expanded: ext2fs_new_block: %m while trying to create /lost+found directory\n
-#: e2fsck/problem.c:1334
+#: e2fsck/problem.c:1348
#, c-format
msgid "ext2fs_new_ at b: %m while trying to create /@l @d\n"
msgstr "ext2fs_new_block: %m při pokusu vytvořit adresář /lost+found\n"
#. @-expanded: ext2fs_new_inode: %m while trying to create /lost+found directory\n
-#: e2fsck/problem.c:1339
+#: e2fsck/problem.c:1353
#, c-format
msgid "ext2fs_new_ at i: %m while trying to create /@l @d\n"
msgstr "ext2fs_new_inode: %m při pokusu vytvořit adresář /lost+found\n"
#. @-expanded: ext2fs_new_dir_block: %m while creating new directory block\n
-#: e2fsck/problem.c:1344
+#: e2fsck/problem.c:1358
#, c-format
msgid "ext2fs_new_dir_ at b: %m while creating new @d @b\n"
msgstr "ext2fs_new_dir_block: %m při pokusu vytvářenà nového adresáře /lost+found\n"
#. @-expanded: ext2fs_write_dir_block: %m while writing the directory block for /lost+found\n
-#: e2fsck/problem.c:1349
+#: e2fsck/problem.c:1363
#, c-format
msgid "ext2fs_write_dir_ at b: %m while writing the @d @b for /@l\n"
msgstr "ext2fs_write_dir_block: %m při zápisu bloku adresáře pro /lost+found\n"
#. @-expanded: Error while adjusting inode count on inode %i\n
-#: e2fsck/problem.c:1354
+#: e2fsck/problem.c:1368
#, c-format
msgid "Error while adjusting @i count on @i %i\n"
-msgstr "Chyba pÅ™i úpravÄ› poÄtu inode v inode %i\n"
+msgstr "Chyba pÅ™i úpravÄ› Äetnosti iuzlu v iuzlu %i\n"
#. @-expanded: Couldn't fix parent of inode %i: %m\n
#. @-expanded: \n
-#: e2fsck/problem.c:1359
+#: e2fsck/problem.c:1373
#, c-format
msgid ""
"Couldn't fix parent of @i %i: %m\n"
"\n"
msgstr ""
-"Nemohu opravit rodiÄe inode %i: %m\n"
+"Nemohu opravit rodiÄe iuzlu %i: %m\n"
"\n"
#. @-expanded: Couldn't fix parent of inode %i: Couldn't find parent directory entry\n
#. @-expanded: \n
-#: e2fsck/problem.c:1364
+#: e2fsck/problem.c:1378
#, c-format
msgid ""
"Couldn't fix parent of @i %i: Couldn't find parent @d @e\n"
@@ -2194,75 +2211,75 @@ msgstr ""
"\n"
#. @-expanded: Error creating root directory (%s): %m\n
-#: e2fsck/problem.c:1374
+#: e2fsck/problem.c:1388
#, c-format
msgid "Error creating root @d (%s): %m\n"
msgstr "Chyba při vytvářenà kořenového adresáře (%s): %m\n"
#. @-expanded: Error creating /lost+found directory (%s): %m\n
-#: e2fsck/problem.c:1379
+#: e2fsck/problem.c:1393
#, c-format
msgid "Error creating /@l @d (%s): %m\n"
msgstr "Chyba při vytvářenà adresáře /lost+found (%s): %m\n"
#. @-expanded: root inode is not a directory; aborting.\n
-#: e2fsck/problem.c:1384
+#: e2fsck/problem.c:1398
msgid "@r is not a @d; aborting.\n"
-msgstr "KoÅ™enová inode nenà adresář; konÄÃm.\n"
+msgstr "KoÅ™enový iuzel nenà adresář; konÄÃm.\n"
#. @-expanded: Cannot proceed without a root inode.\n
-#: e2fsck/problem.c:1389
+#: e2fsck/problem.c:1403
msgid "Cannot proceed without a @r.\n"
-msgstr "Nemohu pokraÄovat bez koÅ™enové inode.\n"
+msgstr "Nemohu pokraÄovat bez koÅ™enového iuzlu.\n"
#. @-expanded: /lost+found is not a directory (ino=%i)\n
-#: e2fsck/problem.c:1399
+#: e2fsck/problem.c:1413
#, c-format
msgid "/@l is not a @d (ino=%i)\n"
msgstr "/lost+found nenà adresář (ino=%i)\n"
-#: e2fsck/problem.c:1406
+#: e2fsck/problem.c:1420
msgid "Pass 3A: Optimizing directories\n"
msgstr "Průchod 3A: Optimalizuji adresáře\n"
-#: e2fsck/problem.c:1411
+#: e2fsck/problem.c:1425
#, c-format
-msgid "Failed to create dirs_to_hash iterator: %m"
-msgstr "Nemohu vytvořit iterátor dirs_to_hash: %m"
+msgid "Failed to create dirs_to_hash iterator: %m\n"
+msgstr "Nemohu vytvořit iterátor dirs_to_hash: %m\n"
-#: e2fsck/problem.c:1416
-msgid "Failed to optimize directory %q (%d): %m"
-msgstr "Nemohu optimalizovat adresář %q (%d): %m"
+#: e2fsck/problem.c:1430
+msgid "Failed to optimize directory %q (%d): %m\n"
+msgstr "Nemohu optimalizovat adresář %q (%d): %m\n"
-#: e2fsck/problem.c:1421
+#: e2fsck/problem.c:1435
msgid "Optimizing directories: "
msgstr "Optimalizuji adresáře: "
-#: e2fsck/problem.c:1438
+#: e2fsck/problem.c:1452
msgid "Pass 4: Checking reference counts\n"
msgstr "Průchod 4: Kontroluji poÄty odkazů\n"
#. @-expanded: unattached zero-length inode %i.
-#: e2fsck/problem.c:1443
+#: e2fsck/problem.c:1457
#, c-format
msgid "@u @z @i %i. "
msgstr "Osiřelý iuzel %i s nulovou délkou. "
#. @-expanded: unattached inode %i\n
-#: e2fsck/problem.c:1448
+#: e2fsck/problem.c:1462
#, c-format
msgid "@u @i %i\n"
msgstr "Osiřelý iuzel %i\n"
#. @-expanded: inode %i ref count is %Il, should be %N.
-#: e2fsck/problem.c:1453
+#: e2fsck/problem.c:1467
msgid "@i %i ref count is %Il, @s %N. "
-msgstr "PoÄet odkazů inode %i je %Il, mÄ›l by být %N. "
+msgstr "PoÄet odkazů na iuzel %i je %Il, mÄ›l by být %N. "
#. @-expanded: WARNING: PROGRAMMING BUG IN E2FSCK!\n
#. @-expanded: \tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n
#. @-expanded: inode_link_info[%i] is %N, inode.i_links_count is %Il. They should be the same!\n
-#: e2fsck/problem.c:1457
+#: e2fsck/problem.c:1471
msgid ""
"WARNING: PROGRAMMING BUG IN E2FSCK!\n"
"\tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n"
@@ -2274,99 +2291,100 @@ msgstr ""
"inode_link_info[%i] je %N, inode.i_links_count je %Il. Měly by být stejné!\n"
#. @-expanded: Pass 5: Checking group summary information\n
-#: e2fsck/problem.c:1467
+#: e2fsck/problem.c:1481
msgid "Pass 5: Checking @g summary information\n"
msgstr "Průchod 5: Kontroluji souhrnné informace skupin\n"
#. @-expanded: Padding at end of inode bitmap is not set.
-#: e2fsck/problem.c:1472
+#: e2fsck/problem.c:1486
msgid "Padding at end of @i @B is not set. "
-msgstr "Výplň na konci bitmapy inode nenà nastavena. "
+msgstr "Výplň na konci bitmapy iuzlů nenà nastavena. "
#. @-expanded: Padding at end of block bitmap is not set.
-#: e2fsck/problem.c:1477
+#: e2fsck/problem.c:1491
msgid "Padding at end of @b @B is not set. "
msgstr "Výplň na konci bitmapy bloků nenà nastavena. "
#. @-expanded: block bitmap differences:
-#: e2fsck/problem.c:1482
+#: e2fsck/problem.c:1496
msgid "@b @B differences: "
msgstr "RozdÃly v bitmapÄ› bloků: "
#. @-expanded: inode bitmap differences:
-#: e2fsck/problem.c:1502
+#: e2fsck/problem.c:1516
msgid "@i @B differences: "
-msgstr "RozdÃly v bitmapÄ› inode: "
+msgstr "RozdÃly v bitmapÄ› iuzlů: "
#. @-expanded: Free inodes count wrong for group #%g (%i, counted=%j).\n
-#: e2fsck/problem.c:1522
+#: e2fsck/problem.c:1536
msgid "Free @is count wrong for @g #%g (%i, counted=%j).\n"
-msgstr "PoÄet volných inode Å¡patný ve skupinÄ› #%g (%i, spoÄteno=%j).\n"
+msgstr "PoÄet volných iuzlů ve skupinÄ› #%g Å¡patnÄ› (%i, spoÄteno=%j).\n"
#. @-expanded: Directories count wrong for group #%g (%i, counted=%j).\n
-#: e2fsck/problem.c:1527
+#: e2fsck/problem.c:1541
msgid "Directories count wrong for @g #%g (%i, counted=%j).\n"
-msgstr "PoÄet adresářů Å¡patný ve skupinÄ› #%g (%i, spoÄteno=%j).\n"
+msgstr "PoÄet adresářů ve skupinÄ› #%g Å¡patnÄ› (%i, spoÄteno=%j).\n"
#. @-expanded: Free inodes count wrong (%i, counted=%j).\n
-#: e2fsck/problem.c:1532
+#: e2fsck/problem.c:1546
msgid "Free @is count wrong (%i, counted=%j).\n"
-msgstr "PoÄet volných inode Å¡patný (%i, spoÄteno=%j).\n"
+msgstr "PoÄet volných iuzlů Å¡patnÄ› (%i, spoÄteno=%j).\n"
#. @-expanded: Free blocks count wrong for group #%g (%b, counted=%c).\n
-#: e2fsck/problem.c:1537
+#: e2fsck/problem.c:1551
msgid "Free @bs count wrong for @g #%g (%b, counted=%c).\n"
-msgstr "PoÄet volných bloků Å¡patný ve skupinÄ› #%g (%b, spoÄteno=%c).\n"
+msgstr "PoÄet volných bloků ve skupinÄ› #%g Å¡patnÄ› (%b, spoÄteno=%c).\n"
#. @-expanded: Free blocks count wrong (%b, counted=%c).\n
-#: e2fsck/problem.c:1542
+#: e2fsck/problem.c:1556
msgid "Free @bs count wrong (%b, counted=%c).\n"
-msgstr "PoÄet volných bloků Å¡patný (%b, spoÄteno=%c).\n"
+msgstr "PoÄet volných bloků Å¡patnÄ› (%b, spoÄteno=%c).\n"
#. @-expanded: PROGRAMMING ERROR: filesystem (#%N) bitmap endpoints (%b, %c) don't match calculated bitmap
#. @-expanded: endpoints (%i, %j)\n
-#: e2fsck/problem.c:1547
+#: e2fsck/problem.c:1561
msgid "PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B endpoints (%i, %j)\n"
msgstr "CHYBA PŘI PROGRAMOVÃNÃ: hranice (%b, %c) bitmapy systému souborů (#%N) neodpovÃdajà vypoÄteným hranicÃm bitmapy (%i, %j)\n"
-#: e2fsck/problem.c:1553
+#: e2fsck/problem.c:1567
msgid "Internal error: fudging end of bitmap (%N)\n"
msgstr "Internà chyba: pokažený konec bitmapy (%N)\n"
#. @-expanded: Error copying in replacement inode bitmap: %m\n
-#: e2fsck/problem.c:1558
+#: e2fsck/problem.c:1572
#, c-format
msgid "Error copying in replacement @i @B: %m\n"
msgstr "Chyba pÅ™i kopÃrovánà do náhradnà bitmapy iuzlů: %m\n"
#. @-expanded: Error copying in replacement block bitmap: %m\n
-#: e2fsck/problem.c:1563
+#: e2fsck/problem.c:1577
#, c-format
msgid "Error copying in replacement @b @B: %m\n"
msgstr "Chyba pÅ™i kopÃrovánà do náhradnà bitmapy bloků: %m\n"
-#: e2fsck/problem.c:1588
-msgid "Recreate journal to make the filesystem ext3 again?\n"
-msgstr "Znovu vytvoÅ™it žurnál, aby se zÃskal zpÄ›t souborový systém ext3?\n"
-
#. @-expanded: group %g block(s) in use but group is marked BLOCK_UNINIT\n
-#: e2fsck/problem.c:1593
+#: e2fsck/problem.c:1602
#, c-format
msgid "@g %g @b(s) in use but @g is marked BLOCK_UNINIT\n"
msgstr "Blok(y) skupiny %g je/jsou použÃván(y), ale skupina je oznaÄena jako BLOCK_UNINIT\n"
#. @-expanded: group %g inode(s) in use but group is marked INODE_UNINIT\n
-#: e2fsck/problem.c:1598
+#: e2fsck/problem.c:1607
#, c-format
msgid "@g %g @i(s) in use but @g is marked INODE_UNINIT\n"
msgstr "Iuzel/iuzly skupiny %g je/jsou použÃván(y), ale skupina je oznaÄena jako INODE_UNINIT\n"
-#: e2fsck/problem.c:1716
+#. @-expanded: Recreate journal
+#: e2fsck/problem.c:1614
+msgid "Recreate @j"
+msgstr "Znovu vytvořit žurnál"
+
+#: e2fsck/problem.c:1732
#, c-format
msgid "Unhandled error code (0x%x)!\n"
msgstr "Neobsloužený kód chyby (0x%x)!\n"
-#: e2fsck/problem.c:1810
+#: e2fsck/problem.c:1827
msgid "IGNORED"
msgstr "IGNOROVÃNO"
@@ -2378,20 +2396,20 @@ msgstr "Použitá paměť: %d, strávený Äas: %6.3f/%6.3f/%6.3f\n"
#: e2fsck/scantest.c:100
#, c-format
msgid "size of inode=%d\n"
-msgstr "velikost inode=%d\n"
+msgstr "velikost iuzlu=%d\n"
#: e2fsck/scantest.c:121
msgid "while starting inode scan"
-msgstr "při spouštěnà průchodu inode"
+msgstr "pÅ™i spouÅ¡tÄ›nà prohlÃdky iuzlů"
#: e2fsck/scantest.c:132
msgid "while doing inode scan"
-msgstr "při prováděnà průchodu inode"
+msgstr "pÅ™i provádÄ›nà prohlÃdky iuzlů"
#: e2fsck/super.c:187
#, c-format
msgid "while calling ext2fs_block_iterate for inode %d"
-msgstr "při volánà ext2fs_block_iterate pro inode %d"
+msgstr "při volánà ext2fs_block_iterate pro iuzel %d"
#: e2fsck/super.c:209
#, c-format
@@ -2457,38 +2475,38 @@ msgstr ""
" -L soubor_špatných_bloků\n"
" Nastavit seznam špatných bloků\n"
-#: e2fsck/unix.c:124
+#: e2fsck/unix.c:132
#, c-format
msgid "%s: %u/%u files (%0d.%d%% non-contiguous), %u/%u blocks\n"
msgstr "%s: %'u/%'u souborů (%0d,%d %% nesouvislých), %'u/%'u bloků\n"
-#: e2fsck/unix.c:136
+#: e2fsck/unix.c:150
#, c-format
msgid " # of inodes with ind/dind/tind blocks: %u/%u/%u\n"
msgstr " PoÄet iuzlů s ind/dind/tind bloky: %'u/%'u/%'u\n"
-#: e2fsck/unix.c:143
+#: e2fsck/unix.c:157
#, c-format
msgid " Extent depth histogram: "
msgstr " Histogram hloubky rozsahu: "
-#: e2fsck/unix.c:193 misc/badblocks.c:871 misc/tune2fs.c:1501 misc/util.c:151
-#: resize/main.c:245
+#: e2fsck/unix.c:207 misc/badblocks.c:928 misc/tune2fs.c:1584 misc/util.c:151
+#: resize/main.c:249
#, c-format
msgid "while determining whether %s is mounted."
msgstr "pÅ™i zjiÅ¡Å¥ovánÃ, jestli je %s pÅ™ipojen."
-#: e2fsck/unix.c:211
+#: e2fsck/unix.c:225
#, c-format
msgid "Warning! %s is mounted.\n"
msgstr "VarovánÃ! %s je pÅ™ipojen.\n"
-#: e2fsck/unix.c:215
+#: e2fsck/unix.c:229
#, c-format
msgid "%s is mounted. "
msgstr "%s je připojen. "
-#: e2fsck/unix.c:217
+#: e2fsck/unix.c:231
msgid ""
"Cannot continue, aborting.\n"
"\n"
@@ -2496,7 +2514,7 @@ msgstr ""
"Nemohu pokraÄovat, konÄÃm.\n"
"\n"
-#: e2fsck/unix.c:218
+#: e2fsck/unix.c:232
#, c-format
msgid ""
"\n"
@@ -2511,79 +2529,79 @@ msgstr ""
"způsobit VÃŽNÉ poÅ¡kozenà systému souborů.\a\a\a\n"
"\n"
-#: e2fsck/unix.c:221
+#: e2fsck/unix.c:235
msgid "Do you really want to continue"
msgstr "Chcete opravdu pokraÄovat"
-#: e2fsck/unix.c:223
+#: e2fsck/unix.c:237
#, c-format
msgid "check aborted.\n"
msgstr "kontrola přerušena.\n"
-#: e2fsck/unix.c:296
+#: e2fsck/unix.c:310
msgid " contains a file system with errors"
msgstr " obsahuje systém souborů s chybami"
-#: e2fsck/unix.c:298
+#: e2fsck/unix.c:312
msgid " was not cleanly unmounted"
msgstr " nebyl ÄistÄ› odpojen"
-#: e2fsck/unix.c:300
+#: e2fsck/unix.c:314
msgid " primary superblock features different from backup"
msgstr " vlastnosti primárnÃho superbloku se liÅ¡Ã od záložnÃho"
-#: e2fsck/unix.c:304
+#: e2fsck/unix.c:318
#, c-format
msgid " has been mounted %u times without being checked"
msgstr " byl připojen %ukrát bez kontroly"
-#: e2fsck/unix.c:310
+#: e2fsck/unix.c:324
msgid " has filesystem last checked time in the future"
msgstr " má Äas poslednà kontroly systému souborů v budoucnosti"
-#: e2fsck/unix.c:316
+#: e2fsck/unix.c:330
#, c-format
msgid " has gone %u days without being checked"
msgstr " nebyl kontrolován %u dnÃ"
-#: e2fsck/unix.c:325
+#: e2fsck/unix.c:339
msgid ", check forced.\n"
msgstr ", kontrola vynucena.\n"
-#: e2fsck/unix.c:328
+#: e2fsck/unix.c:342
#, c-format
msgid "%s: clean, %u/%u files, %u/%u blocks"
msgstr "%s: Äistý, %'u/%'u souborů, %'u/%'u bloků"
-#: e2fsck/unix.c:345
+#: e2fsck/unix.c:359
msgid " (check deferred; on battery)"
msgstr " (kontrola odložena, běžÃm na baterii)"
-#: e2fsck/unix.c:348
+#: e2fsck/unix.c:362
msgid " (check after next mount)"
msgstr " (kontrola po pÅ™ÃÅ¡tÃm pÅ™ipojenÃ)"
-#: e2fsck/unix.c:350
+#: e2fsck/unix.c:364
#, c-format
msgid " (check in %ld mounts)"
msgstr " (kontrola za %ld pÅ™ipojenÃ)"
-#: e2fsck/unix.c:497
+#: e2fsck/unix.c:511
#, c-format
msgid "ERROR: Couldn't open /dev/null (%s)\n"
msgstr "CHYBA: Nemohu otevÅ™Ãt /dev/null (%s)\n"
-#: e2fsck/unix.c:567
+#: e2fsck/unix.c:581
#, c-format
msgid "Invalid EA version.\n"
msgstr "Neplatná verze EA.\n"
-#: e2fsck/unix.c:576
+#: e2fsck/unix.c:590
#, c-format
msgid "Unknown extended option: %s\n"
msgstr "Neznámý rozÅ¡ÃÅ™ený pÅ™epÃnaÄ: %s\n"
-#: e2fsck/unix.c:598
+#: e2fsck/unix.c:612
#, c-format
msgid ""
"Syntax error in e2fsck config file (%s, line #%d)\n"
@@ -2592,35 +2610,35 @@ msgstr ""
"Syntaktická chyba v konfiguraÄnÃm souboru e2fsck (%s, řádek Ä. %d)\n"
"\t%s\n"
-#: e2fsck/unix.c:666
+#: e2fsck/unix.c:680
#, c-format
msgid "Error validating file descriptor %d: %s\n"
msgstr "Chyba při ověřovánà platnosti deskriptoru souboru %d: %s\n"
-#: e2fsck/unix.c:670
+#: e2fsck/unix.c:684
msgid "Invalid completion information file descriptor"
msgstr "Neplatný deskriptor souborů informace o dokonÄenÃ"
-#: e2fsck/unix.c:685
+#: e2fsck/unix.c:699
msgid "Only one of the options -p/-a, -n or -y may be specified."
msgstr "Může být zadán jen jeden z pÅ™epÃnaÄů -p/-a, -n nebo -y."
-#: e2fsck/unix.c:706
+#: e2fsck/unix.c:720
#, c-format
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr "PÅ™epÃnaÄ -t nenà v této verzi e2fsck podporován.\n"
-#: e2fsck/unix.c:787 misc/tune2fs.c:545 misc/tune2fs.c:830 misc/tune2fs.c:847
+#: e2fsck/unix.c:801 misc/tune2fs.c:550 misc/tune2fs.c:835 misc/tune2fs.c:853
#, c-format
msgid "Unable to resolve '%s'"
msgstr "Nelze vyřešit „%s“"
-#: e2fsck/unix.c:817
+#: e2fsck/unix.c:830
#, c-format
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
msgstr "PÅ™epÃnaÄe -c a -l/-L nemohou být použity zároveň.\n"
-#: e2fsck/unix.c:865
+#: e2fsck/unix.c:878
#, c-format
msgid ""
"E2FSCK_JBD_DEBUG \"%s\" not an integer\n"
@@ -2629,7 +2647,7 @@ msgstr ""
"E2FSCK_JBD_DEBUG „%s“ nenà celým ÄÃslem\n"
"\n"
-#: e2fsck/unix.c:874
+#: e2fsck/unix.c:887
#, c-format
msgid ""
"\n"
@@ -2640,38 +2658,43 @@ msgstr ""
"Neplatný neÄÃselný argument u -%c („%s“)\n"
"\n"
-#: e2fsck/unix.c:915
+#: e2fsck/unix.c:961
#, c-format
msgid "Error: ext2fs library version out of date!\n"
msgstr "Chyba: stará verze knihovny ext2fs!\n"
-#: e2fsck/unix.c:923
+#: e2fsck/unix.c:969
msgid "while trying to initialize program"
msgstr "při pokusu inicializovat program"
-#: e2fsck/unix.c:937
+#: e2fsck/unix.c:980
#, c-format
msgid "\tUsing %s, %s\n"
msgstr "\tPoužÃvám %s, %s\n"
-#: e2fsck/unix.c:949
+#: e2fsck/unix.c:992
msgid "need terminal for interactive repairs"
msgstr "pro interaktivnà opravy potřebuji terminál"
-#: e2fsck/unix.c:993
+#: e2fsck/unix.c:1021
#, c-format
msgid "%s: %s trying backup blocks...\n"
msgstr "%s: %s zkouÅ¡Ãm záložnà bloky…\n"
-#: e2fsck/unix.c:995
+#: e2fsck/unix.c:1023
msgid "Superblock invalid,"
msgstr "Neplatný superblok,"
-#: e2fsck/unix.c:996
+#: e2fsck/unix.c:1024
msgid "Group descriptors look bad..."
msgstr "Deskriptory skupin vypadajà špatně…"
-#: e2fsck/unix.c:1023
+#: e2fsck/unix.c:1034
+#, c-format
+msgid "%s: going back to original superblock\n"
+msgstr "%s: návrat k původnÃmu superbloku\n"
+
+#: e2fsck/unix.c:1060
#, c-format
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
@@ -2682,27 +2705,27 @@ msgstr ""
"(Nebo je superblok systému souborů poškozen)\n"
"\n"
-#: e2fsck/unix.c:1029
+#: e2fsck/unix.c:1066
#, c-format
msgid "Could this be a zero-length partition?\n"
msgstr "Mohl by toto být oddÃl nulové délky?\n"
-#: e2fsck/unix.c:1031
+#: e2fsck/unix.c:1068
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr "MusÃte mÃt pÅ™Ãstup %s k systému souborů nebo být root\n"
-#: e2fsck/unix.c:1036
+#: e2fsck/unix.c:1073
#, c-format
msgid "Possibly non-existent or swap device?\n"
msgstr "PravdÄ›podobnÄ› neexistujÃcà nebo odkládacà zaÅ™ÃzenÃ?\n"
-#: e2fsck/unix.c:1038
+#: e2fsck/unix.c:1075
#, c-format
msgid "Filesystem mounted or opened exclusively by another program?\n"
msgstr "Systém souborů pÅ™ipojen nebo otevÅ™en výluÄnÄ› jiným programem?\n"
-#: e2fsck/unix.c:1042
+#: e2fsck/unix.c:1079
#, c-format
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
@@ -2711,42 +2734,42 @@ msgstr ""
"Disk chránÄ›n proti zápisu; použijte pÅ™epÃnaÄ -n pro provedenÃ\n"
"kontroly zaÅ™Ãzenà jen pro ÄtenÃ.\n"
-#: e2fsck/unix.c:1106
+#: e2fsck/unix.c:1143
msgid "Get a newer version of e2fsck!"
msgstr "Sežeňte novějšà verzi e2fsck!"
-#: e2fsck/unix.c:1130
+#: e2fsck/unix.c:1173
#, c-format
msgid "while checking ext3 journal for %s"
msgstr "při kontrole žurnálu ext3 pro %s"
-#: e2fsck/unix.c:1141
+#: e2fsck/unix.c:1184
#, c-format
msgid "Warning: skipping journal recovery because doing a read-only filesystem check.\n"
msgstr ""
"VarovánÃ: pÅ™eskakuji obnovu žurnálu, protože provádÃm kontrolu systému\n"
"souborů jen pro ÄtenÃ.\n"
-#: e2fsck/unix.c:1154
+#: e2fsck/unix.c:1197
#, c-format
msgid "unable to set superblock flags on %s\n"
msgstr "nemohu nastavit pÅ™Ãznaky superbloku na %s\n"
-#: e2fsck/unix.c:1160
+#: e2fsck/unix.c:1203
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr "při obnově žurnálu ext3 %s"
-#: e2fsck/unix.c:1184
+#: e2fsck/unix.c:1228
#, c-format
msgid "%s has unsupported feature(s):"
msgstr "%s má nepodporovanou vlastnost(i):"
-#: e2fsck/unix.c:1200
+#: e2fsck/unix.c:1244
msgid "Warning: compression support is experimental.\n"
msgstr "VarovánÃ: podpora komprese je experimentálnÃ.\n"
-#: e2fsck/unix.c:1205
+#: e2fsck/unix.c:1249
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
@@ -2755,25 +2778,25 @@ msgstr ""
"E2fsck nepřeložen s podporou HTREE,\n"
"\tale systém souborů %s má adresáře HTREE.\n"
-#: e2fsck/unix.c:1259
+#: e2fsck/unix.c:1302
msgid "while reading bad blocks inode"
-msgstr "pÅ™i Ätenà inode Å¡patných bloků"
+msgstr "pÅ™i Ätenà iuzlu Å¡patných bloků"
-#: e2fsck/unix.c:1261
+#: e2fsck/unix.c:1304
#, c-format
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr "Toto nevypadá dobÅ™e, ale zkusÃme pokraÄovat…\n"
-#: e2fsck/unix.c:1287
+#: e2fsck/unix.c:1330
msgid "Couldn't determine journal size"
msgstr "Velikost žurnálu nelze urÄit"
-#: e2fsck/unix.c:1290
+#: e2fsck/unix.c:1333
#, c-format
msgid "Creating journal (%d blocks): "
msgstr "VytvářÃm žurnál (%d bloků): "
-#: e2fsck/unix.c:1297 misc/mke2fs.c:2059
+#: e2fsck/unix.c:1340 misc/mke2fs.c:2113
msgid ""
"\n"
"\twhile trying to create journal"
@@ -2781,12 +2804,12 @@ msgstr ""
"\n"
"\tpři pokusu vytvořit žurnál"
-#: e2fsck/unix.c:1300
+#: e2fsck/unix.c:1343
#, c-format
msgid " Done.\n"
msgstr " Hotovo.\n"
-#: e2fsck/unix.c:1301
+#: e2fsck/unix.c:1344
#, c-format
msgid ""
"\n"
@@ -2795,25 +2818,25 @@ msgstr ""
"\n"
"*** žurnál by znovu vytvořen – souborový systém se opět stal ext3 ***\n"
-#: e2fsck/unix.c:1308
+#: e2fsck/unix.c:1351
#, c-format
msgid "Restarting e2fsck from the beginning...\n"
msgstr "SpouÅ¡tÃm e2fsck od zaÄátku…\n"
-#: e2fsck/unix.c:1312
+#: e2fsck/unix.c:1355
msgid "while resetting context"
msgstr "při nulovánà kontextu"
-#: e2fsck/unix.c:1319
+#: e2fsck/unix.c:1362
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr "%s: e2fsck přerušen.\n"
-#: e2fsck/unix.c:1324
+#: e2fsck/unix.c:1367
msgid "aborted"
msgstr "přerušen"
-#: e2fsck/unix.c:1336
+#: e2fsck/unix.c:1379
#, c-format
msgid ""
"\n"
@@ -2822,12 +2845,12 @@ msgstr ""
"\n"
"%s: ***** SYSTÉM SOUBORŮ BYL ZMĚNĚN *****\n"
-#: e2fsck/unix.c:1339
+#: e2fsck/unix.c:1382
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr "%s: ***** ZNOVU ZAVEÄŽTE LINUX *****\n"
-#: e2fsck/unix.c:1347
+#: e2fsck/unix.c:1390
#, c-format
msgid ""
"\n"
@@ -2838,43 +2861,43 @@ msgstr ""
"%s: ********** VAROVÃNÃ: Systém souborů má stále chyby **********\n"
"\n"
-#: e2fsck/unix.c:1383
+#: e2fsck/unix.c:1426
msgid "while setting block group checksum info"
msgstr "pÅ™i nastavovánà informace o kontrolnÃm souÄtu skupiny bloků"
-#: e2fsck/util.c:135 misc/util.c:68
+#: e2fsck/util.c:138 misc/util.c:68
msgid "yY"
msgstr "aA"
-#: e2fsck/util.c:136
+#: e2fsck/util.c:139
msgid "nN"
msgstr "nN"
-#: e2fsck/util.c:150
+#: e2fsck/util.c:153
msgid "<y>"
msgstr "<a>"
-#: e2fsck/util.c:152
+#: e2fsck/util.c:155
msgid "<n>"
msgstr "<n>"
-#: e2fsck/util.c:154
+#: e2fsck/util.c:157
msgid " (y/n)"
msgstr " (a/n)"
-#: e2fsck/util.c:169
+#: e2fsck/util.c:172
msgid "cancelled!\n"
msgstr "přerušeno!\n"
-#: e2fsck/util.c:184
+#: e2fsck/util.c:187
msgid "yes\n"
msgstr "ano\n"
-#: e2fsck/util.c:186
+#: e2fsck/util.c:189
msgid "no\n"
msgstr "ne\n"
-#: e2fsck/util.c:196
+#: e2fsck/util.c:199
#, c-format
msgid ""
"%s? no\n"
@@ -2883,7 +2906,7 @@ msgstr ""
"%s? ne\n"
"\n"
-#: e2fsck/util.c:200
+#: e2fsck/util.c:203
#, c-format
msgid ""
"%s? yes\n"
@@ -2892,38 +2915,38 @@ msgstr ""
"%s? ano\n"
"\n"
-#: e2fsck/util.c:204
+#: e2fsck/util.c:207
msgid "yes"
msgstr "ano"
-#: e2fsck/util.c:204
+#: e2fsck/util.c:207
msgid "no"
msgstr "ne"
-#: e2fsck/util.c:218
+#: e2fsck/util.c:221
#, c-format
msgid "e2fsck_read_bitmaps: illegal bitmap block(s) for %s"
msgstr "e2fsck_read_bitmaps: neplatný blok(y) bitmapy pro %s"
-#: e2fsck/util.c:223
+#: e2fsck/util.c:226
msgid "reading inode and block bitmaps"
-msgstr "Ätenà bitmap inode a bloků"
+msgstr "Ätenà bitmap iuzlů a bloků"
-#: e2fsck/util.c:228
+#: e2fsck/util.c:231
#, c-format
msgid "while retrying to read bitmaps for %s"
msgstr "pÅ™i opakovaném pokusu naÄÃst bitmapy pro %s"
-#: e2fsck/util.c:240
+#: e2fsck/util.c:243
msgid "writing block and inode bitmaps"
msgstr "zápisu bitmap bloků a iuzlů"
-#: e2fsck/util.c:245
+#: e2fsck/util.c:248
#, c-format
msgid "while rewriting block and inode bitmaps for %s"
msgstr "při přepisu bitmap bloků a iuzlů pro %s"
-#: e2fsck/util.c:257
+#: e2fsck/util.c:260
#, c-format
msgid ""
"\n"
@@ -2936,45 +2959,45 @@ msgstr ""
"%s: NEOÄŒEKÃVANà NEKONZISTENCE; SPUSŤTE fsck RUÄŒNÄš.\n"
"\t(tj. bez pÅ™epÃnaÄů -a nebo -p)\n"
-#: e2fsck/util.c:332
+#: e2fsck/util.c:341
#, c-format
-msgid "Memory used: %dk/%dk (%dk/%dk), "
-msgstr "Použitá paměť: %dk/%dk (%dk/%dk), "
+msgid "Memory used: %luk/%luk (%luk/%luk), "
+msgstr "Použitá paměť: %luk/%luk (%luk/%luk), "
-#: e2fsck/util.c:336
+#: e2fsck/util.c:345
#, c-format
-msgid "Memory used: %d, "
-msgstr "Použitá paměť: %d, "
+msgid "Memory used: %lu, "
+msgstr "Použitá paměť: %lu, "
-#: e2fsck/util.c:342
+#: e2fsck/util.c:352
#, c-format
msgid "time: %5.2f/%5.2f/%5.2f\n"
msgstr "Äas: %5.2f/%5.2f/%5.2f\n"
-#: e2fsck/util.c:347
+#: e2fsck/util.c:357
#, c-format
msgid "elapsed time: %6.3f\n"
msgstr "strávený Äas: %6.3f\n"
-#: e2fsck/util.c:381 e2fsck/util.c:395
+#: e2fsck/util.c:391 e2fsck/util.c:405
#, c-format
-msgid "while reading inode %ld in %s"
-msgstr "pÅ™i Ätenà inode %ld v %s"
+msgid "while reading inode %lu in %s"
+msgstr "pÅ™i Ätenà iuzlu %lu v %s"
-#: e2fsck/util.c:409 e2fsck/util.c:422
+#: e2fsck/util.c:419 e2fsck/util.c:432
#, c-format
-msgid "while writing inode %ld in %s"
-msgstr "při zápisu inode %ld v %s"
+msgid "while writing inode %lu in %s"
+msgstr "při zápisu iuzlu %lu v %s"
-#: e2fsck/util.c:571
+#: e2fsck/util.c:581
msgid "while allocating zeroizing buffer"
msgstr "Při alokaci nulovacà vyrovnávacà paměti"
-#: misc/badblocks.c:63
+#: misc/badblocks.c:66
msgid "done \n"
msgstr "hotovo \n"
-#: misc/badblocks.c:85
+#: misc/badblocks.c:89
#, c-format
msgid ""
"Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnf]\n"
@@ -2988,7 +3011,7 @@ msgstr ""
" [-t zkuÅ¡ebnÃ_vzorek [-t zkuÅ¡ebnÃ_vzorek […]]]\n"
" zaÅ™Ãzenà [poslednÃ_blok [prvnÃ_blok]]\n"
-#: misc/badblocks.c:96
+#: misc/badblocks.c:100
#, c-format
msgid ""
"%s: The -n and -w options are mutually exclusive.\n"
@@ -2997,75 +3020,80 @@ msgstr ""
"%s: PÅ™epÃnaÄe „-n“ a „-w“ se vzájemnÄ› vyluÄujÃ.\n"
"\n"
-#: misc/badblocks.c:244
+#: misc/badblocks.c:202
+#, c-format
+msgid "%6.2f%% done, %s elapsed"
+msgstr "%6.2f %% hotovo, %s uplynulo"
+
+#: misc/badblocks.c:293
msgid "Testing with random pattern: "
msgstr "ZkouÅ¡Ãm s náhodným vzorkem: "
-#: misc/badblocks.c:262
+#: misc/badblocks.c:311
msgid "Testing with pattern 0x"
msgstr "ZkouÅ¡Ãm se vzorkem 0x"
-#: misc/badblocks.c:290 misc/badblocks.c:359
+#: misc/badblocks.c:339 misc/badblocks.c:408
msgid "during seek"
msgstr "při posunu"
-#: misc/badblocks.c:301
+#: misc/badblocks.c:350
#, c-format
msgid "Weird value (%ld) in do_read\n"
msgstr "Divná hodnota (%ld) v do_read\n"
-#: misc/badblocks.c:379
+#: misc/badblocks.c:428
msgid "during ext2fs_sync_device"
msgstr "při ext2fs_sync_device"
-#: misc/badblocks.c:395 misc/badblocks.c:654
+#: misc/badblocks.c:447 misc/badblocks.c:711
msgid "while beginning bad block list iteration"
msgstr "pÅ™i zaÄátku iterace v seznamu Å¡patných bloků"
-#: misc/badblocks.c:409 misc/badblocks.c:506 misc/badblocks.c:664
+#: misc/badblocks.c:461 misc/badblocks.c:563 misc/badblocks.c:721
msgid "while allocating buffers"
msgstr "pÅ™i alokaci vyrovnávacÃch pamÄ›ti"
-#: misc/badblocks.c:413
+#: misc/badblocks.c:465
#, c-format
msgid "Checking blocks %lu to %lu\n"
msgstr "Ověřuji bloky %lu až %lu\n"
-#: misc/badblocks.c:418
+#: misc/badblocks.c:470
msgid "Checking for bad blocks in read-only mode\n"
msgstr "Hledám Å¡patné bloky v režimu jen pro ÄtenÃ\n"
-#: misc/badblocks.c:427
+#: misc/badblocks.c:479
msgid "Checking for bad blocks (read-only test): "
msgstr "Hledám Å¡patné bloky (test jen pro ÄtenÃ): "
-#: misc/badblocks.c:435 misc/badblocks.c:538 misc/badblocks.c:583
-#: misc/badblocks.c:727
+#: misc/badblocks.c:487 misc/badblocks.c:595 misc/badblocks.c:640
+#: misc/badblocks.c:784
msgid "Too many bad blocks, aborting test\n"
msgstr "PÅ™ÃliÅ¡ mnoho Å¡patných bloků, pÅ™eruÅ¡uji test\n"
-#: misc/badblocks.c:513
+#: misc/badblocks.c:570
msgid "Checking for bad blocks in read-write mode\n"
msgstr "Hledám Å¡patné bloky v režimu Ätenà i zápis\n"
-#: misc/badblocks.c:515 misc/badblocks.c:677
+#: misc/badblocks.c:572 misc/badblocks.c:734
#, c-format
msgid "From block %lu to %lu\n"
msgstr "Od bloku %lu do %lu\n"
-#: misc/badblocks.c:573
+#: misc/badblocks.c:630
msgid "Reading and comparing: "
msgstr "Čtu a porovnávám: "
-#: misc/badblocks.c:676
+#: misc/badblocks.c:733
msgid "Checking for bad blocks in non-destructive read-write mode\n"
msgstr "Hledám Å¡patné bloky v nedestruktivnÃm režimu Ätenà i zápis\n"
-#: misc/badblocks.c:682
+#: misc/badblocks.c:739
msgid "Checking for bad blocks (non-destructive read-write test)\n"
msgstr "Hledám Å¡patné bloky (nedestruktivnà test Ätenà i zápisu)\n"
-#: misc/badblocks.c:689
+#: misc/badblocks.c:746
msgid ""
"\n"
"Interrupt caught, cleaning up\n"
@@ -3073,57 +3101,52 @@ msgstr ""
"\n"
"Zachyceno pÅ™eruÅ¡enÃ, uklÃzÃm\n"
-#: misc/badblocks.c:765
+#: misc/badblocks.c:822
#, c-format
msgid "during test data write, block %lu"
msgstr "pÅ™i testovacÃm zápisu dat, blok %lu"
-#: misc/badblocks.c:876 misc/util.c:156
+#: misc/badblocks.c:933 misc/util.c:156
#, c-format
msgid "%s is mounted; "
msgstr "%s je připojen; "
-#: misc/badblocks.c:878
+#: misc/badblocks.c:935
msgid "badblocks forced anyway. Hope /etc/mtab is incorrect.\n"
msgstr "badblocks přesto vynucen. Doufám, že /etc/mtab je nesprávná.\n"
-#: misc/badblocks.c:883
+#: misc/badblocks.c:940
msgid "it's not safe to run badblocks!\n"
msgstr "nenà bezpeÄné spouÅ¡tÄ›t badblocks!\n"
-#: misc/badblocks.c:888 misc/util.c:167
+#: misc/badblocks.c:945 misc/util.c:167
#, c-format
msgid "%s is apparently in use by the system; "
msgstr "%s je zjevnÄ› systémem právÄ› použÃván; "
-#: misc/badblocks.c:891
+#: misc/badblocks.c:948
msgid "badblocks forced anyway.\n"
msgstr "badblocks přesto vynucen.\n"
-#: misc/badblocks.c:911
+#: misc/badblocks.c:968
#, c-format
msgid "invalid %s - %s"
msgstr "neplatný %s – %s"
-#: misc/badblocks.c:970
-#, c-format
-msgid "bad block size - %s"
-msgstr "špatná velikost bloku – %s"
-
-#: misc/badblocks.c:1025
+#: misc/badblocks.c:1077
#, c-format
msgid "can't allocate memory for test_pattern - %s"
msgstr "Nemohu alokovat paměť pro zkuÅ¡ebnÃ_vzorek – %s"
-#: misc/badblocks.c:1052
+#: misc/badblocks.c:1104
msgid "Maximum of one test_pattern may be specified in read-only mode"
msgstr "V režimu pouhého Ätenà lze zadat nejvýše jeden zkuÅ¡ebnÃ_vzorek"
-#: misc/badblocks.c:1058
+#: misc/badblocks.c:1110
msgid "Random test_pattern is not allowed in read-only mode"
msgstr "V režimu pouhého Ätenà nenà náhodný zkuÅ¡ebnÃ_vzorek pÅ™Ãpustný"
-#: misc/badblocks.c:1072
+#: misc/badblocks.c:1124
msgid ""
"Couldn't determine device size; you must specify\n"
"the size manually\n"
@@ -3131,86 +3154,91 @@ msgstr ""
"Nemohu zjistit velikost zaÅ™ÃzenÃ; musÃte velikost\n"
"zadat ruÄnÄ›\n"
-#: misc/badblocks.c:1078
+#: misc/badblocks.c:1130
msgid "while trying to determine device size"
msgstr "pÅ™i pokusu zjistit velikost zaÅ™ÃzenÃ"
-#: misc/badblocks.c:1083
+#: misc/badblocks.c:1135
msgid "last block"
msgstr "poslednà blok"
-#: misc/badblocks.c:1089
+#: misc/badblocks.c:1141
msgid "first block"
msgstr "prvnà blok"
-#: misc/badblocks.c:1092
+#: misc/badblocks.c:1144
#, c-format
msgid "invalid starting block (%lu): must be less than %lu"
msgstr "Å¡patný poÄáteÄnà blok (%lu): musà být menÅ¡Ã než %lu"
-#: misc/badblocks.c:1147
+#: misc/badblocks.c:1200
msgid "while creating in-memory bad blocks list"
msgstr "při vytvářenà seznam špatných bloků v paměti"
-#: misc/badblocks.c:1162
+#: misc/badblocks.c:1215
msgid "while adding to in-memory bad block list"
msgstr "při přidávánà do seznamu špatných bloků v paměti"
-#: misc/badblocks.c:1186
+#: misc/badblocks.c:1239
#, c-format
msgid "Pass completed, %u bad blocks found.\n"
msgstr "Průchod dokonÄen, nalezeno %u Å¡patných bloků.\n"
#: misc/chattr.c:85
#, c-format
-msgid "Usage: %s [-RVf] [-+=AacDdijsSu] [-v version] files...\n"
-msgstr "PoužitÃ: %s [-RVf] [-+=AacDdijsSu] [-v verze] soubory…\n"
+msgid "Usage: %s [-RVf] [-+=AacDdeijsSu] [-v version] files...\n"
+msgstr "PoužitÃ: %s [-RVf] [-+=AacDdeijsSu] [-v verze] soubory…\n"
-#: misc/chattr.c:152
+#: misc/chattr.c:153
#, c-format
msgid "bad version - %s\n"
msgstr "špatná verze – %s\n"
-#: misc/chattr.c:198 misc/lsattr.c:113
+#: misc/chattr.c:200 misc/lsattr.c:115
#, c-format
msgid "while trying to stat %s"
msgstr "při pokusu stat %s"
-#: misc/chattr.c:204 misc/chattr.c:222
-#, c-format
-msgid "Flags of %s set as "
-msgstr "PÅ™Ãznaky %s nastaveny na "
-
-#: misc/chattr.c:214
+#: misc/chattr.c:207
#, c-format
msgid "while reading flags on %s"
msgstr "pÅ™i Ätenà pÅ™Ãznaků %s"
-#: misc/chattr.c:231
+#: misc/chattr.c:216 misc/chattr.c:235
+#, c-format
+msgid "Clearing extent flag not supported on %s"
+msgstr "OdstranÄ›nà pÅ™Ãznaku rozsahu nenà na %s podporováno"
+
+#: misc/chattr.c:221 misc/chattr.c:240
+#, c-format
+msgid "Flags of %s set as "
+msgstr "PÅ™Ãznaky %s nastaveny na "
+
+#: misc/chattr.c:249
#, c-format
msgid "while setting flags on %s"
msgstr "pÅ™i nastavovánà pÅ™Ãznaků %s"
-#: misc/chattr.c:239
+#: misc/chattr.c:257
#, c-format
msgid "Version of %s set as %lu\n"
msgstr "Verze %s nastavena na %lu\n"
-#: misc/chattr.c:243
+#: misc/chattr.c:261
#, c-format
msgid "while setting version on %s"
msgstr "při nastavovánà verze %s"
-#: misc/chattr.c:263
+#: misc/chattr.c:281
#, c-format
msgid "Couldn't allocate path variable in chattr_dir_proc"
msgstr "Nemohu alokovat proměnou path v chattr_dir_proc"
-#: misc/chattr.c:302
+#: misc/chattr.c:320
msgid "= is incompatible with - and +\n"
msgstr "= je nesluÄitelné s - a +\n"
-#: misc/chattr.c:310
+#: misc/chattr.c:328
msgid "Must use '-v', =, - or +\n"
msgstr "MusÃte použÃt '-v', =, - nebo +\n"
@@ -3267,7 +3295,7 @@ msgstr " Bitmapa bloků v "
#: misc/dumpe2fs.c:205
msgid ", Inode bitmap at "
-msgstr ", Bitmapa inode v "
+msgstr ", Bitmapa iuzlů v "
#: misc/dumpe2fs.c:210
msgid ""
@@ -3275,7 +3303,7 @@ msgid ""
" Inode table at "
msgstr ""
"\n"
-" Tabulka inode v "
+" Tabulka iuzlů v "
#: misc/dumpe2fs.c:217
#, c-format
@@ -3297,34 +3325,34 @@ msgstr " Volné bloky: "
#: misc/dumpe2fs.c:237
msgid " Free inodes: "
-msgstr " Volné inode: "
+msgstr " Volné iuzly: "
-#: misc/dumpe2fs.c:264
+#: misc/dumpe2fs.c:268
msgid "while printing bad block list"
msgstr "při tisku seznamu špatných bloků"
-#: misc/dumpe2fs.c:270
+#: misc/dumpe2fs.c:274
#, c-format
msgid "Bad blocks: %u"
msgstr "Špatné bloky: %u"
-#: misc/dumpe2fs.c:292 misc/tune2fs.c:276
+#: misc/dumpe2fs.c:297 misc/tune2fs.c:281
msgid "while reading journal inode"
-msgstr "pÅ™i Ätenà inode žurnálu"
+msgstr "pÅ™i Ätenà iuzlu žurnálu"
-#: misc/dumpe2fs.c:295
+#: misc/dumpe2fs.c:300
msgid "Journal size: "
msgstr "Velikost žurnálu "
-#: misc/dumpe2fs.c:319 misc/tune2fs.c:197
+#: misc/dumpe2fs.c:324 misc/tune2fs.c:202
msgid "while reading journal superblock"
msgstr "pÅ™i Ätenà superbloku žurnálu"
-#: misc/dumpe2fs.c:327
+#: misc/dumpe2fs.c:332
msgid "Couldn't find journal superblock magic numbers"
msgstr "Nemohu najÃt magická ÄÃsla superbloku žurnálu"
-#: misc/dumpe2fs.c:331
+#: misc/dumpe2fs.c:336
#, c-format
msgid ""
"\n"
@@ -3343,27 +3371,27 @@ msgstr ""
"ZaÄátek žurnálu: %u\n"
"PoÄet uživatelů žurnálu: %u\n"
-#: misc/dumpe2fs.c:344
+#: misc/dumpe2fs.c:349
#, c-format
msgid "Journal users: %s\n"
msgstr "Uživatelé žurnálu: %s\n"
-#: misc/dumpe2fs.c:360 misc/mke2fs.c:692 misc/tune2fs.c:865
+#: misc/dumpe2fs.c:365 misc/mke2fs.c:693 misc/tune2fs.c:872
#, c-format
msgid "Couldn't allocate memory to parse options!\n"
msgstr "Nemohu alokovat paměť pro zpracovánà pÅ™epÃnaÄů!\n"
-#: misc/dumpe2fs.c:386
+#: misc/dumpe2fs.c:391
#, c-format
msgid "Invalid superblock parameter: %s\n"
msgstr "Neplatný parametr superblok: %s\n"
-#: misc/dumpe2fs.c:401
+#: misc/dumpe2fs.c:406
#, c-format
msgid "Invalid blocksize parameter: %s\n"
msgstr "Neplatný parametr blocksize (velikost_bloku): %s\n"
-#: misc/dumpe2fs.c:412
+#: misc/dumpe2fs.c:417
#, c-format
msgid ""
"\n"
@@ -3386,18 +3414,18 @@ msgstr ""
"\tsuperblock=<ÄÃslo superbloku>\n"
"\tblocksize=<velikost bloku>\n"
-#: misc/dumpe2fs.c:471 misc/mke2fs.c:1348
+#: misc/dumpe2fs.c:476 misc/mke2fs.c:1355
#, c-format
msgid "\tUsing %s\n"
msgstr "\tPoužÃvám %s\n"
-#: misc/dumpe2fs.c:507 misc/e2image.c:671 misc/tune2fs.c:1452
-#: resize/main.c:306
+#: misc/dumpe2fs.c:512 misc/e2image.c:681 misc/tune2fs.c:1535
+#: resize/main.c:312
#, c-format
msgid "Couldn't find valid filesystem superblock.\n"
msgstr "Nemohu najÃt platný superblok systému souborů.\n"
-#: misc/dumpe2fs.c:531
+#: misc/dumpe2fs.c:537
#, c-format
msgid ""
"\n"
@@ -3406,35 +3434,35 @@ msgstr ""
"\n"
"%s: %s: chyba pÅ™i Ätenà bitmap: %s\n"
-#: misc/e2image.c:50
+#: misc/e2image.c:52
#, c-format
msgid "Usage: %s [-rsI] device image_file\n"
msgstr "PoužitÃ: %s [-rSI] zaÅ™Ãzenà soubor_s_obrazem\n"
-#: misc/e2image.c:62
+#: misc/e2image.c:64
msgid "Couldn't allocate header buffer\n"
msgstr "Nemohu alokovat vyrovnávacà paměť hlaviÄky\n"
-#: misc/e2image.c:81
+#: misc/e2image.c:83
#, c-format
msgid "short write (only %d bytes) for writing image header"
msgstr "krátký zápis (jen %d bajtů) pÅ™i zápisu hlaviÄky obrazu"
-#: misc/e2image.c:100
+#: misc/e2image.c:102
msgid "while writing superblock"
msgstr "při zápisu superbloku"
-#: misc/e2image.c:108
+#: misc/e2image.c:110
msgid "while writing inode table"
-msgstr "při zápisu tabulky inode"
+msgstr "při zápisu tabulky iuzlů"
-#: misc/e2image.c:115
+#: misc/e2image.c:117
msgid "while writing block bitmap"
msgstr "při zápisu bitmapy bloků"
-#: misc/e2image.c:122
+#: misc/e2image.c:124
msgid "while writing inode bitmap"
-msgstr "při zápisu bitmapy inode"
+msgstr "při zápisu bitmapy iuzlů"
#: misc/e2label.c:57
#, c-format
@@ -3456,7 +3484,7 @@ msgstr "e2label: chyba pÅ™i Ätenà superbloku\n"
msgid "e2label: not an ext2 filesystem\n"
msgstr "e2label: nenà systém souborů ext2\n"
-#: misc/e2label.c:96 misc/tune2fs.c:1585
+#: misc/e2label.c:96 misc/tune2fs.c:1670
#, c-format
msgid "Warning: label too long, truncating.\n"
msgstr "VarovánÃ: jmenovka pÅ™ÃliÅ¡ dlouhá, zkracuji.\n"
@@ -3471,7 +3499,7 @@ msgstr "e2label: nemohu se zase posunout na superblok\n"
msgid "e2label: error writing superblock\n"
msgstr "e2label: chyba při zápisu superbloku\n"
-#: misc/e2label.c:116 misc/tune2fs.c:537
+#: misc/e2label.c:116 misc/tune2fs.c:542
#, c-format
msgid "Usage: e2label device [newlabel]\n"
msgstr "PoužitÃ: e2label zaÅ™Ãzenà [novájmenovka]\n"
@@ -3526,19 +3554,19 @@ msgstr "Přehraná transakce o velikosti %zd na pozici %ld\n"
#: misc/e2undo.c:214
#, c-format
msgid "Failed write %s\n"
-msgstr "Sehlal zápis %s\n"
+msgstr "Selhal zápis %s\n"
-#: misc/fsck.c:347
+#: misc/fsck.c:343
#, c-format
msgid "WARNING: couldn't open %s: %s\n"
msgstr "VAROVÃNÃ: nemohu otevÅ™Ãt %s: %s\n"
-#: misc/fsck.c:357
+#: misc/fsck.c:353
#, c-format
msgid "WARNING: bad format on line %d of %s\n"
msgstr "VAROVÃNÃ: Å¡patný formát na řádku %d %s\n"
-#: misc/fsck.c:372
+#: misc/fsck.c:368
msgid ""
"\a\a\aWARNING: Your /etc/fstab does not contain the fsck passno\n"
"\tfield. I will kludge around things for you, but you\n"
@@ -3550,37 +3578,37 @@ msgstr ""
"\tsvou /etc/fstab, jak nejdÅ™Ãv budete moci.\n"
"\n"
-#: misc/fsck.c:481
+#: misc/fsck.c:477
#, c-format
msgid "fsck: %s: not found\n"
msgstr "fsck: %s: nenalezen\n"
-#: misc/fsck.c:597
+#: misc/fsck.c:593
#, c-format
msgid "%s: wait: No more child process?!?\n"
msgstr "%s: wait: Žádný dalšà synovský proces?!?\n"
-#: misc/fsck.c:619
+#: misc/fsck.c:615
#, c-format
msgid "Warning... %s for device %s exited with signal %d.\n"
msgstr "VarovánÃ… %s pro zaÅ™Ãzenà %s skonÄil se signálem %d.\n"
-#: misc/fsck.c:625
+#: misc/fsck.c:621
#, c-format
msgid "%s %s: status is %x, should never happen.\n"
msgstr "%s %s: stav je %x, nemělo by se nikdy stát.\n"
-#: misc/fsck.c:664
+#: misc/fsck.c:660
#, c-format
msgid "Finished with %s (exit status %d)\n"
msgstr "DokonÄen s %s (stav ukonÄenà %d)\n"
-#: misc/fsck.c:724
+#: misc/fsck.c:720
#, c-format
msgid "%s: Error %d while executing fsck.%s for %s\n"
msgstr "%s: Chyba %d při spouštěnà fsck.%s pro %s\n"
-#: misc/fsck.c:745
+#: misc/fsck.c:741
msgid ""
"Either all or none of the filesystem types passed to -t must be prefixed\n"
"with 'no' or '!'.\n"
@@ -3588,41 +3616,41 @@ msgstr ""
"BuÄ vÅ¡echny nebo žádný typ systému souborů pÅ™edaný -t musà mÃt pÅ™edponu\n"
"„no“ nebo „!“.\n"
-#: misc/fsck.c:764
+#: misc/fsck.c:760
msgid "Couldn't allocate memory for filesystem types\n"
msgstr "Nemohu alokovat paměť pro typy systému souborů\n"
-#: misc/fsck.c:887
+#: misc/fsck.c:883
#, c-format
msgid "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number\n"
msgstr ""
"%s: přeskakuji chybný řádek v /etc/fstab: připojenà typu bind s nenulovým\n"
"poÅ™adÃm průchodu skrze fsck\n"
-#: misc/fsck.c:914
+#: misc/fsck.c:910
#, c-format
msgid "fsck: cannot check %s: fsck.%s not found\n"
msgstr "fsck: nemohu zkontrolovat %s: fsck.%s nenalezen\n"
-#: misc/fsck.c:970
+#: misc/fsck.c:966
msgid "Checking all file systems.\n"
msgstr "Kontroluji všechny systémy souborů.\n"
-#: misc/fsck.c:1061
+#: misc/fsck.c:1057
#, c-format
msgid "--waiting-- (pass %d)\n"
msgstr "--Äekám-- (průchod %d)\n"
-#: misc/fsck.c:1081
+#: misc/fsck.c:1077
msgid "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
msgstr "PoužitÃ: fsck [-AMNPRTV] [-C [fd]] [-t typss] [pÅ™epÃnaÄe-ss] [systémsouborů…]\n"
-#: misc/fsck.c:1123
+#: misc/fsck.c:1119
#, c-format
msgid "%s: too many devices\n"
msgstr "%s: pÅ™ÃliÅ¡ mnoho zaÅ™ÃzenÃ\n"
-#: misc/fsck.c:1156 misc/fsck.c:1242
+#: misc/fsck.c:1152 misc/fsck.c:1238
#, c-format
msgid "%s: too many arguments\n"
msgstr "%s: pÅ™ÃliÅ¡ mnoho argumentů\n"
@@ -3642,7 +3670,7 @@ msgstr "PÅ™i Ätenà pÅ™Ãznaků %s"
msgid "While reading version on %s"
msgstr "PÅ™i Ätenà verze %s"
-#: misc/mke2fs.c:103
+#: misc/mke2fs.c:104
#, c-format
msgid ""
"Usage: %s [-c|-l filename] [-b block-size] [-f fragment-size]\n"
@@ -3651,7 +3679,7 @@ msgid ""
"\t[-m reserved-blocks-percentage] [-o creator-os]\n"
"\t[-g blocks-per-group] [-L volume-label] [-M last-mounted-directory]\n"
"\t[-O feature[,...]] [-r fs-revision] [-E extended-option[,...]]\n"
-"\t[-T fs-type] [-jnqvFSV] device [blocks-count]\n"
+"\t[-T fs-type] [-U UUID] [-jnqvFSV] device [blocks-count]\n"
msgstr ""
"PoužitÃ: %s [-c|-l názevsouboru] [-b velikost-bloku] [-f velkost-fragmentu]\n"
"\t[-i bajtů-na-iuzel] [-I velikost-iuzlu] [-J pÅ™epÃnaÄe-žurnálu]\n"
@@ -3659,38 +3687,38 @@ msgstr ""
"\t[-m procenta-rezervovaných-bloků] [-o tvoÅ™ÃcÃ-os]\n"
"\t[-g bloků-ve-skupině] [-L jmenovka-svazku]\n"
"\t[-M adresář-poslednÃho-pÅ™ipojenÃ] [-O vlastnost[,…]] [-r revize-ss]\n"
-"\t[-E rozÅ¡ÃÅ™ený-pÅ™epÃnaÄ[,…]] [-T druh-ss] [-jnqvFSV]\n"
+"\t[-E rozÅ¡ÃÅ™ený-pÅ™epÃnaÄ[,…]] [-T druh-ss] [-U UUID] [-jnqvFSV]\n"
"\tzaÅ™Ãzenà [poÄet-bloků]\n"
-#: misc/mke2fs.c:205
+#: misc/mke2fs.c:206
#, c-format
msgid "Running command: %s\n"
msgstr "SpouÅ¡tÃm pÅ™Ãkaz: %s\n"
-#: misc/mke2fs.c:209
+#: misc/mke2fs.c:210
#, c-format
msgid "while trying to run '%s'"
msgstr "při pokusu spustit „%s“"
-#: misc/mke2fs.c:216
+#: misc/mke2fs.c:217
msgid "while processing list of bad blocks from program"
msgstr "při zpracovávánà seznamu špatných bloků z programu"
-#: misc/mke2fs.c:243
+#: misc/mke2fs.c:244
#, c-format
msgid "Block %d in primary superblock/group descriptor area bad.\n"
msgstr "Blok %d v oblasti primárnÃho superbloku/deskriptorů skupin Å¡patný.\n"
-#: misc/mke2fs.c:245
+#: misc/mke2fs.c:246
#, c-format
msgid "Blocks %u through %u must be good in order to build a filesystem.\n"
msgstr "Bloky %u až %u musà být pro vytvořenà systému souborů v pořádku.\n"
-#: misc/mke2fs.c:248
+#: misc/mke2fs.c:249
msgid "Aborting....\n"
msgstr "KonÄÃm…\n"
-#: misc/mke2fs.c:268
+#: misc/mke2fs.c:269
#, c-format
msgid ""
"Warning: the backup superblock/group descriptors at block %u contain\n"
@@ -3701,19 +3729,19 @@ msgstr ""
"\tšpatné bloky.\n"
"\n"
-#: misc/mke2fs.c:287
+#: misc/mke2fs.c:288
msgid "while marking bad blocks as used"
msgstr "pÅ™i oznaÄovánà špatných bloků jako použité"
-#: misc/mke2fs.c:345
+#: misc/mke2fs.c:346
msgid "done \n"
msgstr "hotovo \n"
-#: misc/mke2fs.c:359
+#: misc/mke2fs.c:360
msgid "Writing inode tables: "
-msgstr "Zapisuji tabulky inode: "
+msgstr "Zapisuji tabulky iuzlů: "
-#: misc/mke2fs.c:382
+#: misc/mke2fs.c:383
#, c-format
msgid ""
"\n"
@@ -3722,67 +3750,67 @@ msgstr ""
"\n"
"Nemohu zapsat %d bloků do tabulky iuzlů zaÄÃnajÃcà v %u: %s\n"
-#: misc/mke2fs.c:406
+#: misc/mke2fs.c:407
msgid "while creating root dir"
msgstr "při vytvářenà kořenového adresáře"
-#: misc/mke2fs.c:413
+#: misc/mke2fs.c:414
msgid "while reading root inode"
-msgstr "pÅ™i Ätenà koÅ™enové inode"
+msgstr "pÅ™i Ätenà koÅ™enového iuzlu"
-#: misc/mke2fs.c:427
+#: misc/mke2fs.c:428
msgid "while setting root inode ownership"
-msgstr "při nastavovánà vlastnictvà kořenové inode"
+msgstr "při nastavovánà vlastnictvà kořenového iuzlu"
-#: misc/mke2fs.c:445
+#: misc/mke2fs.c:446
msgid "while creating /lost+found"
msgstr "při vytvářenà /lost+found"
-#: misc/mke2fs.c:452
+#: misc/mke2fs.c:453
msgid "while looking up /lost+found"
msgstr "při vyhledávánà /lost+found"
-#: misc/mke2fs.c:465
+#: misc/mke2fs.c:466
msgid "while expanding /lost+found"
msgstr "při zvětšovánà /lost+found"
-#: misc/mke2fs.c:480
+#: misc/mke2fs.c:481
msgid "while setting bad block inode"
-msgstr "při nastavovánà inode špatných bloků"
+msgstr "při nastavovánà iuzlu špatných bloků"
-#: misc/mke2fs.c:507
+#: misc/mke2fs.c:508
#, c-format
msgid "Out of memory erasing sectors %d-%d\n"
msgstr "Nedostatek paměti při mazánà sektorů %d-%d\n"
-#: misc/mke2fs.c:517
+#: misc/mke2fs.c:518
#, c-format
msgid "Warning: could not read block 0: %s\n"
msgstr "VarovánÃ: nemohu naÄÃst blok 0: %s\n"
-#: misc/mke2fs.c:533
+#: misc/mke2fs.c:534
#, c-format
msgid "Warning: could not erase sector %d: %s\n"
msgstr "VarovánÃ: nemohu vymazat sektor %d: %s\n"
-#: misc/mke2fs.c:549
+#: misc/mke2fs.c:550
msgid "while initializing journal superblock"
msgstr "při inicializaci superbloku žurnálu"
-#: misc/mke2fs.c:555
+#: misc/mke2fs.c:556
msgid "Zeroing journal device: "
msgstr "Nuluji zaÅ™Ãzenà žurnálu: "
-#: misc/mke2fs.c:568
+#: misc/mke2fs.c:569
#, c-format
msgid "while zeroing journal device (block %u, count %d)"
msgstr "pÅ™i nulovánà zaÅ™Ãzenà žurnálu (blok %u, poÄet %d)"
-#: misc/mke2fs.c:584
+#: misc/mke2fs.c:585
msgid "while writing journal superblock"
msgstr "při zápisu superbloku žurnálu"
-#: misc/mke2fs.c:600
+#: misc/mke2fs.c:601
#, c-format
msgid ""
"warning: %u blocks unused.\n"
@@ -3791,96 +3819,96 @@ msgstr ""
"varovánÃ: nepoužito %u bloků.\n"
"\n"
-#: misc/mke2fs.c:605
+#: misc/mke2fs.c:606
#, c-format
msgid "Filesystem label=%s\n"
msgstr "Jmenovka systému souborů=%s\n"
-#: misc/mke2fs.c:606
+#: misc/mke2fs.c:607
msgid "OS type: "
msgstr "Typ OS: "
-#: misc/mke2fs.c:611
+#: misc/mke2fs.c:612
#, c-format
msgid "Block size=%u (log=%u)\n"
msgstr "Velikost bloku=%u (log=%u)\n"
-#: misc/mke2fs.c:613
+#: misc/mke2fs.c:614
#, c-format
msgid "Fragment size=%u (log=%u)\n"
msgstr "Velikost fragmentu=%u (log=%u)\n"
-#: misc/mke2fs.c:615
+#: misc/mke2fs.c:616
#, c-format
msgid "%u inodes, %u blocks\n"
msgstr "%u iuzlů, %u bloků\n"
-#: misc/mke2fs.c:617
+#: misc/mke2fs.c:618
#, c-format
msgid "%u blocks (%2.2f%%) reserved for the super user\n"
msgstr "%u bloků (%2.2f %%) rezervováno pro superuživatele\n"
-#: misc/mke2fs.c:620
+#: misc/mke2fs.c:621
#, c-format
msgid "First data block=%u\n"
msgstr "Prvnà blok dat=%u\n"
-#: misc/mke2fs.c:622
+#: misc/mke2fs.c:623
#, c-format
msgid "Maximum filesystem blocks=%lu\n"
msgstr "Maximum bloků v systému souborů=%'lu\n"
-#: misc/mke2fs.c:626
+#: misc/mke2fs.c:627
#, c-format
msgid "%u block groups\n"
msgstr "%u skupin bloků\n"
-#: misc/mke2fs.c:628
+#: misc/mke2fs.c:629
#, c-format
msgid "%u block group\n"
msgstr "%u skupina bloků\n"
-#: misc/mke2fs.c:629
+#: misc/mke2fs.c:630
#, c-format
msgid "%u blocks per group, %u fragments per group\n"
msgstr "%u bloků ve skupině, %u fragmentů ve skupině\n"
-#: misc/mke2fs.c:631
+#: misc/mke2fs.c:632
#, c-format
msgid "%u inodes per group\n"
msgstr "%u iuzlů ve skupině\n"
-#: misc/mke2fs.c:638
+#: misc/mke2fs.c:639
#, c-format
msgid "Superblock backups stored on blocks: "
msgstr "Zálohy superbloku uloženy v blocÃch: "
-#: misc/mke2fs.c:717
+#: misc/mke2fs.c:718
#, c-format
msgid "Invalid stride parameter: %s\n"
msgstr "Neplatný parametr kroku (stride): %s\n"
-#: misc/mke2fs.c:732
+#: misc/mke2fs.c:733
#, c-format
msgid "Invalid stripe-width parameter: %s\n"
msgstr "Neplatný parametr Å¡ÃÅ™ka-pásu (stripe-width): %s\n"
-#: misc/mke2fs.c:754
+#: misc/mke2fs.c:755
#, c-format
msgid "Invalid resize parameter: %s\n"
msgstr "Neplatný parametr změny velikosti: %s\n"
-#: misc/mke2fs.c:761
+#: misc/mke2fs.c:762
#, c-format
msgid "The resize maximum must be greater than the filesystem size.\n"
msgstr "Maximum změny velkosti musà být většà než velikost systému souborů.\n"
-#: misc/mke2fs.c:785
+#: misc/mke2fs.c:786
#, c-format
msgid "On-line resizing not supported with revision 0 filesystems\n"
msgstr "Revize 0 souborového systému nepodporuje změnu velikosti za běhu\n"
-#: misc/mke2fs.c:807
+#: misc/mke2fs.c:808
#, c-format
msgid ""
"\n"
@@ -3911,7 +3939,7 @@ msgstr ""
"\ttest_fs\n"
"\n"
-#: misc/mke2fs.c:823
+#: misc/mke2fs.c:824
#, c-format
msgid ""
"\n"
@@ -3922,7 +3950,7 @@ msgstr ""
"VarovánÃ: Å¡ÃÅ™ka pruhu RAIDu %u nenà sudý násobek kroku (stride) %u.\n"
"\n"
-#: misc/mke2fs.c:855
+#: misc/mke2fs.c:856
#, c-format
msgid ""
"Syntax error in mke2fs config file (%s, line #%d)\n"
@@ -3931,12 +3959,12 @@ msgstr ""
"Chyba syntaxe v konfiguraÄnÃm souboru mke2fs (%s, řádek Ä. %d)\n"
"\t%s\n"
-#: misc/mke2fs.c:868 misc/tune2fs.c:350
+#: misc/mke2fs.c:869 misc/tune2fs.c:355
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr "Neplatný sada pÅ™epÃnaÄů systému souborů: %s\n"
-#: misc/mke2fs.c:976
+#: misc/mke2fs.c:979
#, c-format
msgid ""
"\n"
@@ -3945,7 +3973,7 @@ msgstr ""
"\n"
"VarovánÃ! Váš soubor mke2fs.conf nedefinuje druh souborového systému %s.\n"
-#: misc/mke2fs.c:979
+#: misc/mke2fs.c:982
#, c-format
msgid ""
"You probably need to install an updated mke2fs.conf file.\n"
@@ -3954,106 +3982,106 @@ msgstr ""
"Pravděpodobně potřebujete nainstalovat aktualizovaný soubor mke2fs.conf.\n"
"\n"
-#: misc/mke2fs.c:1173
+#: misc/mke2fs.c:1176
#, c-format
msgid "invalid block size - %s"
msgstr "špatná velikost bloku – %s"
-#: misc/mke2fs.c:1177
+#: misc/mke2fs.c:1180
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr "VarovánÃ: velikost bloku %d nenà na vÄ›tÅ¡inÄ› systémů použitelná.\n"
-#: misc/mke2fs.c:1193
+#: misc/mke2fs.c:1196
#, c-format
msgid "invalid fragment size - %s"
msgstr "špatná velikost fragmentu – %s"
-#: misc/mke2fs.c:1199
+#: misc/mke2fs.c:1202
#, c-format
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr "VarovánÃ: fragmenty nepodporovány. Ignoruji pÅ™epÃnaÄ -f\n"
-#: misc/mke2fs.c:1206
+#: misc/mke2fs.c:1209
msgid "Illegal number for blocks per group"
msgstr "Neplatný poÄet bloků ve skupinÄ›"
-#: misc/mke2fs.c:1211
+#: misc/mke2fs.c:1214
msgid "blocks per group must be multiple of 8"
msgstr "bloky ve skupině musà být násobek 8"
-#: misc/mke2fs.c:1219
+#: misc/mke2fs.c:1222
msgid "Illegal number for flex_bg size"
msgstr "Neplatné ÄÃslo pro velikost flex_bg"
-#: misc/mke2fs.c:1225
+#: misc/mke2fs.c:1228
msgid "flex_bg size must be a power of 2"
msgstr "Velikost flex_bg musà být mocninou 2"
-#: misc/mke2fs.c:1235
+#: misc/mke2fs.c:1238
#, c-format
msgid "invalid inode ratio %s (min %d/max %d)"
msgstr "Å¡patný podÃl iuzlů %s (min %d/max %d)"
-#: misc/mke2fs.c:1252
+#: misc/mke2fs.c:1255
msgid "in malloc for bad_blocks_filename"
msgstr "v malloc pro bad_blocks_filename"
-#: misc/mke2fs.c:1261
+#: misc/mke2fs.c:1265
#, c-format
msgid "invalid reserved blocks percent - %s"
msgstr "špatné procento rezervovaných bloků – %s"
-#: misc/mke2fs.c:1279
+#: misc/mke2fs.c:1283
#, c-format
msgid "bad revision level - %s"
msgstr "Å¡patné ÄÃslo revize – %s"
-#: misc/mke2fs.c:1291
+#: misc/mke2fs.c:1295
#, c-format
msgid "invalid inode size - %s"
msgstr "špatná velikost iuzlu – %s"
-#: misc/mke2fs.c:1311
+#: misc/mke2fs.c:1315
#, c-format
msgid "bad num inodes - %s"
msgstr "chybný poÄet iuzlů – %s"
-#: misc/mke2fs.c:1372 misc/mke2fs.c:2020
+#: misc/mke2fs.c:1380 misc/mke2fs.c:2068
#, c-format
msgid "while trying to open journal device %s\n"
msgstr "pÅ™i pokusu otevÅ™Ãt zaÅ™Ãzenà žurnálu %s\n"
-#: misc/mke2fs.c:1378
+#: misc/mke2fs.c:1386
#, c-format
msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n"
msgstr "Velikost bloku zaÅ™Ãzenà žurnálu (%d) menÅ¡Ã než minimálnà velikost bloku %d\n"
-#: misc/mke2fs.c:1384
+#: misc/mke2fs.c:1392
#, c-format
msgid "Using journal device's blocksize: %d\n"
msgstr "Použiji velikost bloku žurnálovacÃho zaÅ™ÃzenÃ: %d\n"
-#: misc/mke2fs.c:1393
+#: misc/mke2fs.c:1401
#, c-format
msgid "%d-byte blocks too big for system (max %d)"
msgstr "%d-bajtové bloky pÅ™ÃliÅ¡ velké pro systém (max %d)"
-#: misc/mke2fs.c:1397
+#: misc/mke2fs.c:1405
#, c-format
msgid "Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
msgstr "VarovánÃ: %d-bajtové bloky pÅ™ÃliÅ¡ velké pro systém (max %d), donucen pokraÄovat\n"
-#: misc/mke2fs.c:1405
+#: misc/mke2fs.c:1413
#, c-format
msgid "invalid blocks count - %s"
msgstr "Å¡patný poÄet bloků - %s"
-#: misc/mke2fs.c:1415
+#: misc/mke2fs.c:1423
msgid "filesystem"
msgstr "systém souborů"
-#: misc/mke2fs.c:1437
+#: misc/mke2fs.c:1459
#, c-format
msgid ""
"%s: Size of device %s too big to be expressed in 32 bits\n"
@@ -4062,11 +4090,11 @@ msgstr ""
"%s: Velikost zaÅ™Ãzenà %s je pÅ™ÃliÅ¡ velká na reprezentaci v 32 bitech\n"
"\tpoužiji velikost bloku %d.\n"
-#: misc/mke2fs.c:1445 resize/main.c:366
+#: misc/mke2fs.c:1468 resize/main.c:374
msgid "while trying to determine filesystem size"
msgstr "při pokusu zjistit velikost systému souborů"
-#: misc/mke2fs.c:1451
+#: misc/mke2fs.c:1475
msgid ""
"Couldn't determine device size; you must specify\n"
"the size of the filesystem\n"
@@ -4074,7 +4102,7 @@ msgstr ""
"Nemohu zjistit velikost zaÅ™ÃzenÃ; musÃte zadat\n"
"velikost systému souborů\n"
-#: misc/mke2fs.c:1458
+#: misc/mke2fs.c:1482
msgid ""
"Device size reported to be zero. Invalid partition specified, or\n"
"\tpartition table wasn't reread after running fdisk, due to\n"
@@ -4086,35 +4114,35 @@ msgstr ""
" oddÃl se použÃvá. Možná budete muset pro opÄ›tovné naÄtenÃ\n"
" své tabulky oddÃlů znovu zavést systém.\n"
-#: misc/mke2fs.c:1476
+#: misc/mke2fs.c:1500
msgid "Filesystem larger than apparent device size."
msgstr "Systém souborů vÄ›tÅ¡Ã než velikost zaÅ™ÃzenÃ."
-#: misc/mke2fs.c:1482
+#: misc/mke2fs.c:1506
#, c-format
msgid "Failed to parse fs types list\n"
msgstr "Seznam druhů souborových systému se nezdařilo rozebrat\n"
-#: misc/mke2fs.c:1518
+#: misc/mke2fs.c:1540
msgid "fs_types for mke2fs.conf resolution: "
msgstr "fs_types (druhy SS) pro řešenà v mke2fs.conf: "
-#: misc/mke2fs.c:1525
+#: misc/mke2fs.c:1547
#, c-format
msgid "Filesystem features not supported with revision 0 filesystems\n"
msgstr "Vlastnosti systému souborů nejsou v revizi 0 podporovány\n"
-#: misc/mke2fs.c:1532
+#: misc/mke2fs.c:1554
#, c-format
msgid "Sparse superblocks not supported with revision 0 filesystems\n"
msgstr "ŘÃdké superbloky systému souborů nejsou v revizi 0 podporovány\n"
-#: misc/mke2fs.c:1544
+#: misc/mke2fs.c:1566
#, c-format
msgid "Journals not supported with revision 0 filesystems\n"
msgstr "Revize 0 systému souborů žurnály nepodporuje\n"
-#: misc/mke2fs.c:1562
+#: misc/mke2fs.c:1584
#, c-format
msgid ""
"The resize_inode and meta_bg features are not compatible.\n"
@@ -4123,40 +4151,40 @@ msgstr ""
"Vlastnosti resize_inode a meta_bg nejsou sluÄitelné.\n"
"ObÄ› nemohou být zapnuty souÄasnÄ›.\n"
-#: misc/mke2fs.c:1579
+#: misc/mke2fs.c:1601
msgid "while trying to determine hardware sector size"
msgstr "při pokusu zjistit velikost hardwarového sektoru"
-#: misc/mke2fs.c:1637
+#: misc/mke2fs.c:1658
msgid "reserved online resize blocks not supported on non-sparse filesystem"
msgstr ""
"bloky vyhrazené pro zmÄ›nu velikosti za bÄ›hu nejsou podporovány na neÅ™Ãdkém\n"
"\tsystému souborů"
-#: misc/mke2fs.c:1646
+#: misc/mke2fs.c:1667
msgid "blocks per group count out of range"
msgstr "poÄet bloků ve skupinÄ› mimo rozsah"
-#: misc/mke2fs.c:1661
+#: misc/mke2fs.c:1682
msgid "Flex_bg feature not enabled, so flex_bg size may not be specified"
msgstr "Vlastnost flex_bg nenà povolena, takže jejà velikost nemůže být zadána"
-#: misc/mke2fs.c:1673
+#: misc/mke2fs.c:1694
#, c-format
msgid "invalid inode size %d (min %d/max %d)"
msgstr "špatná velikost iuzlu %d (min %d/max %d)"
-#: misc/mke2fs.c:1687
+#: misc/mke2fs.c:1708
#, c-format
msgid "too many inodes (%llu), raise inode ratio?"
msgstr "pÅ™ÃliÅ¡ mnoho iuzlů (%'llu), zvýšit pomÄ›r iuzlu?"
-#: misc/mke2fs.c:1692
+#: misc/mke2fs.c:1713
#, c-format
msgid "too many inodes (%llu), specify < 2^32 inodes"
msgstr "pÅ™ÃliÅ¡ mnoho iuzlů (%'llu), zadejte < 2^32 iuzlů"
-#: misc/mke2fs.c:1707
+#: misc/mke2fs.c:1728
#, c-format
msgid ""
"inode_size (%u) * inodes_count (%u) too big for a\n"
@@ -4167,12 +4195,16 @@ msgstr ""
"\tsystém souborů s %'lu bloky, zadejte vyššà poměr_iuzlu (-i)\n"
"\tnebo snižte poÄet iuzlů (-N).\n"
-#: misc/mke2fs.c:1804 misc/tune2fs.c:1398
+#: misc/mke2fs.c:1821 misc/tune2fs.c:1453
+msgid "Couldn't allocate memory for tdb filename\n"
+msgstr "Nemohu alokovat paměť pro název souboru TDB\n"
+
+#: misc/mke2fs.c:1834 misc/tune2fs.c:1475
#, c-format
msgid "while trying to delete %s"
msgstr "při pokusu smazat %s"
-#: misc/mke2fs.c:1813
+#: misc/mke2fs.c:1844
#, c-format
msgid ""
"Overwriting existing filesystem; this can be undone using the command:\n"
@@ -4182,38 +4214,38 @@ msgstr ""
"PÅ™episuji existujÃcà systém souborů, toto může být odÄinÄ›no pÅ™Ãkazem:\n"
" e2undo %s %s\n"
-#: misc/mke2fs.c:1860
+#: misc/mke2fs.c:1893
msgid "while setting up superblock"
msgstr "při nastavovánà superbloku"
-#: misc/mke2fs.c:1904
+#: misc/mke2fs.c:1952
#, c-format
msgid "unknown os - %s"
msgstr "neznámý os – %s"
-#: misc/mke2fs.c:1958
+#: misc/mke2fs.c:2006
msgid "while trying to allocate filesystem tables"
msgstr "při pokusu alokovat tabulky systému souborů"
-#: misc/mke2fs.c:1989
+#: misc/mke2fs.c:2037
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr "při nulovánà bloku %u na konci systému souborů"
-#: misc/mke2fs.c:2002
+#: misc/mke2fs.c:2050
msgid "while reserving blocks for online resize"
msgstr "při rezervaci bloků pro změnu velikosti za běhu"
-#: misc/mke2fs.c:2013 misc/tune2fs.c:474
+#: misc/mke2fs.c:2061 misc/tune2fs.c:479
msgid "journal"
msgstr "žurnál"
-#: misc/mke2fs.c:2025
+#: misc/mke2fs.c:2073
#, c-format
msgid "Adding journal to device %s: "
msgstr "PÅ™idávám žurnál k zaÅ™Ãzenà %s: "
-#: misc/mke2fs.c:2032
+#: misc/mke2fs.c:2080
#, c-format
msgid ""
"\n"
@@ -4222,22 +4254,27 @@ msgstr ""
"\n"
"\tpÅ™i pokusu pÅ™idat žurnál k zaÅ™Ãzenà %s"
-#: misc/mke2fs.c:2037 misc/mke2fs.c:2063 misc/tune2fs.c:502 misc/tune2fs.c:516
+#: misc/mke2fs.c:2085 misc/mke2fs.c:2117 misc/tune2fs.c:508 misc/tune2fs.c:522
#, c-format
msgid "done\n"
msgstr "hotovo\n"
-#: misc/mke2fs.c:2051
+#: misc/mke2fs.c:2094
+#, c-format
+msgid "Skipping journal creation in super-only mode\n"
+msgstr "V režimu jen-superdata bude vynechána tvorba žurnálu\n"
+
+#: misc/mke2fs.c:2105
#, c-format
msgid "Creating journal (%u blocks): "
msgstr "VytvářÃm žurnál (%'u bloků): "
-#: misc/mke2fs.c:2068
+#: misc/mke2fs.c:2122
#, c-format
msgid "Writing superblocks and filesystem accounting information: "
msgstr "Zapisuji superbloky a úÄtovacà informace systému souborů: "
-#: misc/mke2fs.c:2073
+#: misc/mke2fs.c:2127
#, c-format
msgid ""
"\n"
@@ -4246,7 +4283,7 @@ msgstr ""
"\n"
"VarovánÃ, mÄ›l jsem problémy pÅ™i zápisu superbloků."
-#: misc/mke2fs.c:2076
+#: misc/mke2fs.c:2130
#, c-format
msgid ""
"done\n"
@@ -4295,11 +4332,11 @@ msgstr "Nelze zÃskat velikost %s: %s"
msgid "%s: h=%3d s=%3d c=%4d start=%8d size=%8lu end=%8d\n"
msgstr "%s: h=%3d s=%3d c=%4d zaÄátek=%8d velikost=%8lu konec=%8d\n"
-#: misc/tune2fs.c:94
+#: misc/tune2fs.c:96
msgid "Please run e2fsck on the filesystem.\n"
msgstr "SpusÅ¥te prosÃm na tomto systému souborů e2fsck.\n"
-#: misc/tune2fs.c:101
+#: misc/tune2fs.c:105
#, c-format
msgid ""
"Usage: %s [-c max_mounts_count] [-e errors_behavior] [-g group]\n"
@@ -4319,59 +4356,59 @@ msgstr ""
"\t[-T Äas_poslednÃ_kontroly] [-U UUID]\n"
"\t[-I nová_velikost_iuzlu] zaÅ™ÃzenÃ\n"
-#: misc/tune2fs.c:185
+#: misc/tune2fs.c:190
msgid "while trying to open external journal"
msgstr "pÅ™i pokusu otevÅ™Ãt externà žurnál"
-#: misc/tune2fs.c:189
+#: misc/tune2fs.c:194
#, c-format
msgid "%s is not a journal device.\n"
msgstr "%s nenà zaÅ™Ãzenà žurnálu.\n"
-#: misc/tune2fs.c:204
+#: misc/tune2fs.c:209
msgid "Journal superblock not found!\n"
msgstr "Superblok žurnálu nenalezen!\n"
-#: misc/tune2fs.c:216
+#: misc/tune2fs.c:221
msgid "Filesystem's UUID not found on journal device.\n"
msgstr "UUID systému souborů nenalezeno na zaÅ™Ãzenà žurnálu.\n"
-#: misc/tune2fs.c:237
+#: misc/tune2fs.c:242
msgid "Journal NOT removed\n"
msgstr "Žurnál NEODSTRANĚN\n"
-#: misc/tune2fs.c:243
+#: misc/tune2fs.c:248
msgid "Journal removed\n"
msgstr "Žurnál odstraněn\n"
-#: misc/tune2fs.c:283
+#: misc/tune2fs.c:288
msgid "while reading bitmaps"
msgstr "pÅ™i Ätenà bitmap"
-#: misc/tune2fs.c:291
+#: misc/tune2fs.c:296
msgid "while clearing journal inode"
-msgstr "při mazánà inode žurnálu"
+msgstr "pÅ™i ÄiÅ¡tÄ›nà iuzlu žurnálu"
-#: misc/tune2fs.c:302
+#: misc/tune2fs.c:307
msgid "while writing journal inode"
-msgstr "při zápisu inode žurnálu"
+msgstr "při zápisu iuzlu žurnálu"
-#: misc/tune2fs.c:317
+#: misc/tune2fs.c:322
#, c-format
msgid "Invalid mount option set: %s\n"
msgstr "Nastaven neplatný pÅ™epÃnaÄ pÅ™ipojenÃ: %s\n"
-#: misc/tune2fs.c:353
+#: misc/tune2fs.c:358
#, c-format
msgid "Clearing filesystem feature '%s' not supported.\n"
msgstr "Odstraněnà vlastnosti systému souborů „%s“ nenà podporováno.\n"
-#: misc/tune2fs.c:359
+#: misc/tune2fs.c:364
#, c-format
msgid "Setting filesystem feature '%s' not supported.\n"
msgstr "Nastavená vlastnosti systému souborů „%s“ nenà podporováno.\n"
-#: misc/tune2fs.c:368
+#: misc/tune2fs.c:373
msgid ""
"The has_journal feature may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
@@ -4379,7 +4416,7 @@ msgstr ""
"PÅ™Ãznak has_journal může být vymazán jen, když je systém souborů\n"
"odpojen nebo pÅ™ipojen jen pro ÄtenÃ.\n"
-#: misc/tune2fs.c:376
+#: misc/tune2fs.c:381
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
@@ -4387,7 +4424,7 @@ msgstr ""
"PÅ™Ãznak needs_recovery je nastaven. PÅ™ed vymazánÃm pÅ™Ãznaku has_journal\n"
"prosÃm spusÅ¥te e2fsck.\n"
-#: misc/tune2fs.c:409
+#: misc/tune2fs.c:414
msgid ""
"Clearing the flex_bg flag would cause the the filesystem to be\n"
"inconsistent.\n"
@@ -4395,7 +4432,7 @@ msgstr ""
"OdstranÄ›nà pÅ™Ãznaku flex_bg by mohlo způsobit nekonzistenci systému\n"
"souborů.\n"
-#: misc/tune2fs.c:420
+#: misc/tune2fs.c:425
msgid ""
"The huge_file feature may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
@@ -4403,16 +4440,16 @@ msgstr ""
"PÅ™Ãznak huge_file může být vymazán jen, když je systém souborů\n"
"odpojen nebo pÅ™ipojen jen pro ÄtenÃ.\n"
-#: misc/tune2fs.c:448
+#: misc/tune2fs.c:453
#, c-format
msgid "(and reboot afterwards!)\n"
msgstr "(a po té rebootujte!)\n"
-#: misc/tune2fs.c:469
+#: misc/tune2fs.c:474
msgid "The filesystem already has a journal.\n"
msgstr "Systém souborů již žurnál má.\n"
-#: misc/tune2fs.c:486
+#: misc/tune2fs.c:492
#, c-format
msgid ""
"\n"
@@ -4421,21 +4458,21 @@ msgstr ""
"\n"
"\tpÅ™i pokusu otevÅ™Ãt žurnál na %s\n"
-#: misc/tune2fs.c:490
+#: misc/tune2fs.c:496
#, c-format
msgid "Creating journal on device %s: "
msgstr "VytvářÃm žurnál na zaÅ™Ãzenà %s: "
-#: misc/tune2fs.c:498
+#: misc/tune2fs.c:504
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr "při přidávánà systému souborů do žurnálu na %s"
-#: misc/tune2fs.c:504
+#: misc/tune2fs.c:510
msgid "Creating journal inode: "
-msgstr "VytvářÃm inode žurnálu: "
+msgstr "VytvářÃm iuzel žurnálu: "
-#: misc/tune2fs.c:513
+#: misc/tune2fs.c:519
msgid ""
"\n"
"\twhile trying to create journal file"
@@ -4443,85 +4480,85 @@ msgstr ""
"\n"
"\tpři pokusu vytvořit soubor žurnálu"
-#: misc/tune2fs.c:580
+#: misc/tune2fs.c:585
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr "Nemohu zpracovat urÄenà data/Äasu: %s"
-#: misc/tune2fs.c:605 misc/tune2fs.c:618
+#: misc/tune2fs.c:609 misc/tune2fs.c:622
#, c-format
msgid "bad mounts count - %s"
msgstr "Å¡patný poÄet pÅ™ipojenà - %s"
-#: misc/tune2fs.c:634
+#: misc/tune2fs.c:638
#, c-format
msgid "bad error behavior - %s"
msgstr "špatné chovánà při chybách - %s"
-#: misc/tune2fs.c:661
+#: misc/tune2fs.c:665
#, c-format
msgid "bad gid/group name - %s"
msgstr "špatné gid/jméno skupiny - %s"
-#: misc/tune2fs.c:694
+#: misc/tune2fs.c:698
#, c-format
msgid "bad interval - %s"
msgstr "Špatný interval - %s"
-#: misc/tune2fs.c:722
+#: misc/tune2fs.c:727
#, c-format
msgid "bad reserved block ratio - %s"
msgstr "Å¡patný podÃl rezervovaných bloků - %s"
-#: misc/tune2fs.c:737
+#: misc/tune2fs.c:742
msgid "-o may only be specified once"
msgstr "-o může být zadáno jen jednou"
-#: misc/tune2fs.c:747
+#: misc/tune2fs.c:752
msgid "-O may only be specified once"
msgstr "-O může být zadáno jen jednou"
-#: misc/tune2fs.c:757
+#: misc/tune2fs.c:762
#, c-format
msgid "bad reserved blocks count - %s"
msgstr "Å¡patný poÄet rezervovaných bloků - %s"
-#: misc/tune2fs.c:786
+#: misc/tune2fs.c:791
#, c-format
msgid "bad uid/user name - %s"
msgstr "špatné uid/jméno uživatele - %s"
-#: misc/tune2fs.c:803
+#: misc/tune2fs.c:808
#, c-format
msgid "bad inode size - %s"
msgstr "špatná velikost iuzlu – %s"
-#: misc/tune2fs.c:810
+#: misc/tune2fs.c:815
#, c-format
msgid "Inode size must be a power of two- %s"
-msgstr "Velikost iuzlu musà být pocnita dvou – %s"
+msgstr "Velikost iuzlu musà být mocnina dvou – %s"
-#: misc/tune2fs.c:897
+#: misc/tune2fs.c:904
#, c-format
msgid "Invalid RAID stride: %s\n"
msgstr "Neplatný kroku (stride) RAIDu: %s\n"
-#: misc/tune2fs.c:912
+#: misc/tune2fs.c:919
#, c-format
msgid "Invalid RAID stripe-width: %s\n"
msgstr "Neplatná Å¡ÃÅ™ka pruhu RAIDu (stripe-width): %s\n"
-#: misc/tune2fs.c:927
+#: misc/tune2fs.c:934
#, c-format
msgid "Invalid hash algorithm: %s\n"
msgstr "Neplatný hashovacà algoritmus: %s\n"
-#: misc/tune2fs.c:933
+#: misc/tune2fs.c:940
#, c-format
msgid "Setting default hash algorithm to %s (%d)\n"
msgstr "Nastavuji implicitnà hashovacà algoritmus na %s (%d)\n"
-#: misc/tune2fs.c:941
+#: misc/tune2fs.c:948
#, c-format
msgid ""
"\n"
@@ -4550,72 +4587,72 @@ msgstr ""
"\ttest_fs\n"
"\t^test_fs\n"
-#: misc/tune2fs.c:1330 resize/resize2fs.c:724
+#: misc/tune2fs.c:1388 misc/tune2fs.c:1393 resize/resize2fs.c:790
msgid "blocks to be moved"
msgstr "bloky pro přesun"
-#: misc/tune2fs.c:1407
+#: misc/tune2fs.c:1485
#, c-format
msgid ""
-"To undo the tune2fs operations please run the command\n"
+"To undo the tune2fs operation please run the command\n"
" e2undo %s %s\n"
"\n"
msgstr ""
"ZmÄ›ny způsobené tune2fs lze zvrátit tÃmto pÅ™Ãkazem\n"
-" e2undo %s %s\n"
+" e2undo %s %s\n"
"\n"
-#: misc/tune2fs.c:1463
+#: misc/tune2fs.c:1546
#, c-format
-msgid "The inode size is already %d\n"
-msgstr "Velikost iuzlu již je %d\n"
+msgid "The inode size is already %lu\n"
+msgstr "Velikost iuzlu již je %lu\n"
-#: misc/tune2fs.c:1468
+#: misc/tune2fs.c:1551
#, c-format
msgid "Shrinking the inode size is not supported\n"
msgstr "Zmenšovánà velikosti iuzlu nenà podporováno\n"
-#: misc/tune2fs.c:1511
+#: misc/tune2fs.c:1594
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr "Nastavuji maximálnà poÄet pÅ™ipojenà na %d\n"
-#: misc/tune2fs.c:1517
+#: misc/tune2fs.c:1600
#, c-format
msgid "Setting current mount count to %d\n"
msgstr "Nastavuji aktuálnà poÄet pÅ™ipojenà na %d\n"
-#: misc/tune2fs.c:1522
+#: misc/tune2fs.c:1605
#, c-format
msgid "Setting error behavior to %d\n"
msgstr "Nastavuji chovánà při chybách na %d\n"
-#: misc/tune2fs.c:1527
+#: misc/tune2fs.c:1610
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr "Nastavuji gid rezervovaných bloků na %lu\n"
-#: misc/tune2fs.c:1532
+#: misc/tune2fs.c:1615
#, c-format
msgid "Setting interval between checks to %lu seconds\n"
msgstr "Nastavuji interval mezi kontrolami na %'lu sekund\n"
-#: misc/tune2fs.c:1538
+#: misc/tune2fs.c:1622
#, c-format
msgid "Setting reserved blocks percentage to %g%% (%u blocks)\n"
msgstr "Nastavuji procento rezervovaných bloků na %g %% (%'u bloků)\n"
-#: misc/tune2fs.c:1544
+#: misc/tune2fs.c:1629
#, c-format
msgid "reserved blocks count is too big (%lu)"
msgstr "poÄet rezervovaných bloků je pÅ™ÃliÅ¡ velký (%'lu)"
-#: misc/tune2fs.c:1550
+#: misc/tune2fs.c:1635
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr "Nastavuji poÄet rezervovaných bloků na %'lu\n"
-#: misc/tune2fs.c:1556
+#: misc/tune2fs.c:1641
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
@@ -4623,7 +4660,7 @@ msgstr ""
"\n"
"Systém souborů již má Å™Ãdké superbloky.\n"
-#: misc/tune2fs.c:1563
+#: misc/tune2fs.c:1648
#, c-format
msgid ""
"\n"
@@ -4632,7 +4669,7 @@ msgstr ""
"\n"
"PÅ™Ãznak Å™Ãdkých superbloků nastaven. %s"
-#: misc/tune2fs.c:1568
+#: misc/tune2fs.c:1653
msgid ""
"\n"
"Clearing the sparse superflag not supported.\n"
@@ -4640,25 +4677,33 @@ msgstr ""
"\n"
"OdstranÄ›nà superpÅ™Ãznaku Å™Ãdkosti nenà podporováno.\n"
-#: misc/tune2fs.c:1575
+#: misc/tune2fs.c:1660
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr "Nastavuji Äas poslednà kontroly systému souborů na %s\n"
-#: misc/tune2fs.c:1581
+#: misc/tune2fs.c:1666
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr "Nastavuji uid rezervovaných bloků na %lu\n"
-#: misc/tune2fs.c:1616
+#: misc/tune2fs.c:1717
msgid "Invalid UUID format\n"
msgstr "Neplatný formát UUID\n"
-#: misc/tune2fs.c:1623
+#: misc/tune2fs.c:1729
msgid "The inode size may only be changed when the filesystem is unmounted.\n"
msgstr "Velikost iuzlu smà být změněna, jen když je systém souborů odpojen.\n"
-#: misc/tune2fs.c:1634
+#: misc/tune2fs.c:1736
+msgid ""
+"Changing the inode size not supported for filesystems with the flex_bg\n"
+"feature enabled.\n"
+msgstr ""
+"Na souborových systémech se zapnutou vlastnostà flex_bg nenà změna velikosti\n"
+"iuzlu podporována.\n"
+
+#: misc/tune2fs.c:1748
msgid ""
"Error in resizing the inode size.\n"
"Run e2undo to undo the file system changes. \n"
@@ -4666,17 +4711,17 @@ msgstr ""
"Chyba při měněnà velikost iuzlu.\n"
"Spusťte e2undo, abyste vrátili změny provedené na systému souborů.\n"
-#: misc/tune2fs.c:1638
+#: misc/tune2fs.c:1752
#, c-format
msgid "Setting inode size %lu\n"
msgstr "Nastavuji velikost iuzlu %lu\n"
-#: misc/tune2fs.c:1648
+#: misc/tune2fs.c:1762
#, c-format
msgid "Setting stride size to %d\n"
msgstr "Nastavuji velikost kroku (stride) na %d\n"
-#: misc/tune2fs.c:1653
+#: misc/tune2fs.c:1767
#, c-format
msgid "Setting stripe width to %d\n"
msgstr "Nastavuji Å¡ÃÅ™ku pruhu (stripe width) na %d\n"
@@ -4808,7 +4853,7 @@ msgstr "#\tÄŒÃs=%d, Velikost=%d, Kurzor=%d, SeÅ™azeno=%d\n"
msgid "#\t\t %u -> %u (%d)\n"
msgstr "#\t\t %u -> %u (%d)\n"
-#: resize/main.c:39
+#: resize/main.c:42
#, c-format
msgid ""
"Usage: %s [-d debug_flags] [-f] [-F] [-M] [-P] [-p] device [new_size]\n"
@@ -4818,46 +4863,46 @@ msgstr ""
" zaÅ™Ãzenà [nová_velikost]\n"
"\n"
-#: resize/main.c:61
+#: resize/main.c:64
msgid "Extending the inode table"
-msgstr "Zvětšuji tabulku inode"
+msgstr "Zvětšuji tabulku iuzlů"
-#: resize/main.c:64
+#: resize/main.c:67
msgid "Relocating blocks"
msgstr "Přesouvám bloky"
-#: resize/main.c:67
+#: resize/main.c:70
msgid "Scanning inode table"
-msgstr "ProcházÃm tabulku inode"
+msgstr "ProcházÃm tabulku iuzlů"
-#: resize/main.c:70
+#: resize/main.c:73
msgid "Updating inode references"
-msgstr "Aktualizuji odkazy na inode"
+msgstr "Aktualizuji odkazy na iuzly"
-#: resize/main.c:73
+#: resize/main.c:76
msgid "Moving inode table"
-msgstr "Přesouvám tabulku inode"
+msgstr "Přesouvám tabulku iuzlů"
-#: resize/main.c:76
+#: resize/main.c:79
msgid "Unknown pass?!?"
msgstr "Neznámý průchod?!?"
-#: resize/main.c:79
+#: resize/main.c:82
#, c-format
msgid "Begin pass %d (max = %lu)\n"
msgstr "ZaÄátek průchodu %d (max = %lu)\n"
-#: resize/main.c:261
+#: resize/main.c:265
#, c-format
msgid "while opening %s"
msgstr "pÅ™i otevÃránà %s"
-#: resize/main.c:273
+#: resize/main.c:277
#, c-format
msgid "while getting stat information for %s"
msgstr "při zjišťovánà stat informacà o %s"
-#: resize/main.c:332
+#: resize/main.c:338
#, c-format
msgid ""
"%s: The combination of flex_bg and\n"
@@ -4866,27 +4911,37 @@ msgstr ""
"%s: Kombinace vlastnostà flex_bg a\n"
"\t!resize_inode nenà podporována nástrojem resize2fs.\n"
-#: resize/main.c:340
+#: resize/main.c:348
#, c-format
msgid "Estimated minimum size of the filesystem: %u\n"
msgstr "Odhadovaná minimálnà velikost systému souborů: %u\n"
#: resize/main.c:384
+#, c-format
+msgid "Invalid new size: %s\n"
+msgstr "Chybná nová velikost: %s\n"
+
+#: resize/main.c:396
+#, c-format
+msgid "New size smaller than minimum (%u)\n"
+msgstr "Nová velikost je menšà než minimum (%u)\n"
+
+#: resize/main.c:402
msgid "Invalid stride length"
msgstr "Neplatná délka kroku"
-#: resize/main.c:408
+#: resize/main.c:426
#, c-format
msgid ""
"The containing partition (or device) is only %u (%dk) blocks.\n"
"You requested a new size of %u blocks.\n"
"\n"
msgstr ""
-"DotÄený oddÃl (nebo zaÅ™ÃzenÃ) je jen %'u (%'d k) bloků velké.\n"
+"DotÄený oddÃl (nebo zaÅ™ÃzenÃ) je jen %'u (%dk) bloků velké.\n"
"Požadovali jste novou velikost %'u bloků.\n"
"\n"
-#: resize/main.c:415
+#: resize/main.c:433
#, c-format
msgid ""
"The filesystem is already %u blocks long. Nothing to do!\n"
@@ -4895,7 +4950,7 @@ msgstr ""
"Souborový systém již je dlouhý %'u bloků. Nenà co dělat!\n"
"\n"
-#: resize/main.c:426
+#: resize/main.c:444
#, c-format
msgid ""
"Please run 'e2fsck -f %s' first.\n"
@@ -4904,12 +4959,26 @@ msgstr ""
"SpusÅ¥te prosÃm nejdÅ™Ãve „e2fsck -f %s“.\n"
"\n"
-#: resize/main.c:437
+#: resize/main.c:448
+#, c-format
+msgid "Resizing the filesystem on %s to %u (%dk) blocks.\n"
+msgstr "Velikost systému souborů %s se měnà na %'u (%dk) bloků.\n"
+
+#: resize/main.c:457
#, c-format
msgid "while trying to resize %s"
msgstr "při pokusu změnit velikost %s"
-#: resize/main.c:442
+#: resize/main.c:460
+#, c-format
+msgid ""
+"Please run 'e2fsck -fy %s' to fix the filesystem\n"
+"after the aborted resize operation.\n"
+msgstr ""
+"Po pÅ™eruÅ¡ené zmÄ›nÄ› velikosti, prosÃm, opravte souborový systém pomocÃ\n"
+"„e2fsck -fy %s“\n"
+
+#: resize/main.c:466
#, c-format
msgid ""
"The filesystem on %s is now %u blocks long.\n"
@@ -4918,6 +4987,11 @@ msgstr ""
"Systém souborů na %s je nynà %'u bloků dlouhý.\n"
"\n"
+#: resize/main.c:481
+#, c-format
+msgid "while trying to truncate %s"
+msgstr "při pokusu zkrátit %s"
+
#: resize/online.c:37
#, c-format
msgid "Filesystem at %s is mounted on %s; on-line resizing required\n"
@@ -4954,7 +5028,7 @@ msgstr "Při zjišťovánà podpory změny velikosti za běhu"
#: resize/online.c:111
#, c-format
msgid "Performing an on-line resize of %s to %u (%dk) blocks.\n"
-msgstr "ProvádÃm zmÄ›nu velikosti za bÄ›hu %s na %'u (%'d k) bloků.\n"
+msgstr "ProvádÃm zmÄ›nu velikosti za bÄ›hu %s na %'u (%dk) bloků.\n"
#: resize/online.c:121
msgid "While trying to extend the last group"
@@ -4970,24 +5044,36 @@ msgstr "PÅ™i pokusu pÅ™idat skupinu Ä. %d"
msgid "Filesystem at %s is mounted on %s, and on-line resizing is not supported on this system.\n"
msgstr "Systém souborů v %s je připojen do %s a změna velikost za běhu nenà na tomto systému podporována.\n"
-#: resize/resize2fs.c:294
+#: resize/resize2fs.c:350
#, c-format
msgid "inodes (%llu) must be less than %u"
msgstr "iuzlů (%'llu) musà být méně než %'u"
-#: resize/resize2fs.c:719
+#: resize/resize2fs.c:582
msgid "reserved blocks"
msgstr "rezervované bloky"
-#: resize/resize2fs.c:729
+#: resize/resize2fs.c:795
msgid "meta-data blocks"
msgstr "bloky meta-dat"
-#: resize/resize2fs.c:1667
+#: resize/resize2fs.c:1752
#, c-format
msgid "Should never happen: resize inode corrupt!\n"
msgstr "Toto by se nikdy nemělo stát: iuzly pro změnu velikosti jsou poškozeny!\n"
+#~ msgid "@S doesn't have has_ at j flag, but has ext3 @j %s.\n"
+#~ msgstr "Superblok nemá pÅ™Ãznak has_journal, ale má žurnál ext3 %s.\n"
+
+#~ msgid "Error while deleting extent: %m\n"
+#~ msgstr "Chyba při mazánà rozsahu: %m\n"
+
+#~ msgid "Recreate journal to make the filesystem ext3 again?\n"
+#~ msgstr "Znovu vytvoÅ™it žurnál, aby se zÃskal zpÄ›t souborový systém ext3?\n"
+
+#~ msgid "bad block size - %s"
+#~ msgstr "špatná velikost bloku – %s"
+
#~ msgid "while retrying to write block bitmaps for %s"
#~ msgstr "při opakovaném pokusu zapsat bitmapy bloků pro %s"
diff --git a/po/e2fsprogs.pot b/po/e2fsprogs.pot
index a602c5c..ad0334f 100644
--- a/po/e2fsprogs.pot
+++ b/po/e2fsprogs.pot
@@ -1,7 +1,8 @@
# E2fsprogs translation template file
-# Copyright (C) 2009 Theodore Ts'o
+# Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Theodore Ts'o
# This file is distributed under the same license as the e2fsprogs package.
-# Theodore Ts'o <tytso at mit.edu>, 2009.
+# Theodore Ts'o <tytso at mit.edu>, 2010.
#
#. The strings in e2fsck's problem.c can be very hard to translate,
#. since the strings are expanded in two different ways. First of all,
@@ -64,9 +65,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: e2fsprogs 1.41.6\n"
+"Project-Id-Version: e2fsprogs 1.41.10\n"
"Report-Msgid-Bugs-To: tytso at alum.mit.edu\n"
-"POT-Creation-Date: 2009-05-30 13:48-0400\n"
+"POT-Creation-Date: 2010-02-10 15:24-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -74,7 +75,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: e2fsck/badblocks.c:22 misc/mke2fs.c:165
+#: e2fsck/badblocks.c:22 misc/mke2fs.c:169
#, c-format
msgid "Bad block %u out of range; ignored.\n"
msgstr ""
@@ -88,10 +89,10 @@ msgid "while reading the bad blocks inode"
msgstr ""
#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:1058 e2fsck/unix.c:1141 misc/badblocks.c:1148
-#: misc/badblocks.c:1156 misc/badblocks.c:1170 misc/badblocks.c:1182
-#: misc/dumpe2fs.c:505 misc/e2image.c:576 misc/e2image.c:672
-#: misc/e2image.c:688 misc/mke2fs.c:181 misc/tune2fs.c:1532 resize/main.c:310
+#: e2fsck/unix.c:1062 e2fsck/unix.c:1145 misc/badblocks.c:1155
+#: misc/badblocks.c:1163 misc/badblocks.c:1177 misc/badblocks.c:1189
+#: misc/dumpe2fs.c:552 misc/e2image.c:583 misc/e2image.c:679
+#: misc/e2image.c:695 misc/mke2fs.c:185 misc/tune2fs.c:1573 resize/main.c:310
#, c-format
msgid "while trying to open %s"
msgstr ""
@@ -101,7 +102,7 @@ msgstr ""
msgid "while trying popen '%s'"
msgstr ""
-#: e2fsck/badblocks.c:93 misc/mke2fs.c:188
+#: e2fsck/badblocks.c:93 misc/mke2fs.c:192
msgid "while reading in list of bad blocks from file"
msgstr ""
@@ -185,21 +186,21 @@ msgstr ""
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr ""
-#: e2fsck/iscan.c:83 e2fsck/unix.c:818
+#: e2fsck/iscan.c:83 e2fsck/unix.c:817
#, c-format
msgid "while opening %s for flushing"
msgstr ""
-#: e2fsck/iscan.c:88 e2fsck/unix.c:824 resize/main.c:286
+#: e2fsck/iscan.c:88 e2fsck/unix.c:823 resize/main.c:286
#, c-format
msgid "while trying to flush %s"
msgstr ""
-#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:482
+#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:489
msgid "while opening inode scan"
msgstr ""
-#: e2fsck/iscan.c:129 misc/e2image.c:500
+#: e2fsck/iscan.c:129 misc/e2image.c:507
msgid "while getting next inode"
msgstr ""
@@ -237,308 +238,328 @@ msgstr ""
msgid "while trying to re-open %s"
msgstr ""
-#: e2fsck/message.c:110
+#: e2fsck/message.c:111
msgid "aextended attribute"
msgstr ""
-#: e2fsck/message.c:111
+#: e2fsck/message.c:112
msgid "Aerror allocating"
msgstr ""
-#: e2fsck/message.c:112
+#: e2fsck/message.c:113
msgid "bblock"
msgstr ""
-#: e2fsck/message.c:113
+#: e2fsck/message.c:114
msgid "Bbitmap"
msgstr ""
-#: e2fsck/message.c:114
+#: e2fsck/message.c:115
msgid "ccompress"
msgstr ""
-#: e2fsck/message.c:115
+#: e2fsck/message.c:116
msgid "Cconflicts with some other fs @b"
msgstr ""
-#: e2fsck/message.c:116
+#: e2fsck/message.c:117
msgid "iinode"
msgstr ""
-#: e2fsck/message.c:117
+#: e2fsck/message.c:118
msgid "Iillegal"
msgstr ""
-#: e2fsck/message.c:118
+#: e2fsck/message.c:119
msgid "jjournal"
msgstr ""
-#: e2fsck/message.c:119
+#: e2fsck/message.c:120
msgid "Ddeleted"
msgstr ""
-#: e2fsck/message.c:120
+#: e2fsck/message.c:121
msgid "ddirectory"
msgstr ""
-#: e2fsck/message.c:121
+#: e2fsck/message.c:122
msgid "eentry"
msgstr ""
-#: e2fsck/message.c:122
+#: e2fsck/message.c:123
msgid "E at e '%Dn' in %p (%i)"
msgstr ""
-#: e2fsck/message.c:123
+#: e2fsck/message.c:124
msgid "ffilesystem"
msgstr ""
-#: e2fsck/message.c:124
+#: e2fsck/message.c:125
msgid "Ffor @i %i (%Q) is"
msgstr ""
-#: e2fsck/message.c:125
+#: e2fsck/message.c:126
msgid "ggroup"
msgstr ""
-#: e2fsck/message.c:126
+#: e2fsck/message.c:127
msgid "hHTREE @d @i"
msgstr ""
-#: e2fsck/message.c:127
+#: e2fsck/message.c:128
msgid "llost+found"
msgstr ""
-#: e2fsck/message.c:128
+#: e2fsck/message.c:129
msgid "Lis a link"
msgstr ""
-#: e2fsck/message.c:129
+#: e2fsck/message.c:130
msgid "mmultiply-claimed"
msgstr ""
-#: e2fsck/message.c:130
+#: e2fsck/message.c:131
msgid "ninvalid"
msgstr ""
-#: e2fsck/message.c:131
+#: e2fsck/message.c:132
msgid "oorphaned"
msgstr ""
-#: e2fsck/message.c:132
+#: e2fsck/message.c:133
msgid "pproblem in"
msgstr ""
-#: e2fsck/message.c:133
+#: e2fsck/message.c:134
msgid "rroot @i"
msgstr ""
-#: e2fsck/message.c:134
+#: e2fsck/message.c:135
msgid "sshould be"
msgstr ""
-#: e2fsck/message.c:135
+#: e2fsck/message.c:136
msgid "Ssuper at b"
msgstr ""
-#: e2fsck/message.c:136
+#: e2fsck/message.c:137
msgid "uunattached"
msgstr ""
-#: e2fsck/message.c:137
+#: e2fsck/message.c:138
msgid "vdevice"
msgstr ""
-#: e2fsck/message.c:138
+#: e2fsck/message.c:139
msgid "xextent"
msgstr ""
-#: e2fsck/message.c:139
+#: e2fsck/message.c:140
msgid "zzero-length"
msgstr ""
-#: e2fsck/message.c:150
+#: e2fsck/message.c:151
msgid "<The NULL inode>"
msgstr ""
-#: e2fsck/message.c:151
+#: e2fsck/message.c:152
msgid "<The bad blocks inode>"
msgstr ""
-#: e2fsck/message.c:153
+#: e2fsck/message.c:154
msgid "<The ACL index inode>"
msgstr ""
-#: e2fsck/message.c:154
+#: e2fsck/message.c:155
msgid "<The ACL data inode>"
msgstr ""
-#: e2fsck/message.c:155
+#: e2fsck/message.c:156
msgid "<The boot loader inode>"
msgstr ""
-#: e2fsck/message.c:156
+#: e2fsck/message.c:157
msgid "<The undelete directory inode>"
msgstr ""
-#: e2fsck/message.c:157
+#: e2fsck/message.c:158
msgid "<The group descriptor inode>"
msgstr ""
-#: e2fsck/message.c:158
+#: e2fsck/message.c:159
msgid "<The journal inode>"
msgstr ""
-#: e2fsck/message.c:159
+#: e2fsck/message.c:160
msgid "<Reserved inode 9>"
msgstr ""
-#: e2fsck/message.c:160
+#: e2fsck/message.c:161
msgid "<Reserved inode 10>"
msgstr ""
-#: e2fsck/message.c:323
+#: e2fsck/message.c:330
#, c-format
msgid "regular file"
msgstr ""
-#: e2fsck/message.c:325
+#: e2fsck/message.c:332
#, c-format
msgid "directory"
msgstr ""
-#: e2fsck/message.c:327
+#: e2fsck/message.c:334
#, c-format
msgid "character device"
msgstr ""
-#: e2fsck/message.c:329
+#: e2fsck/message.c:336
#, c-format
msgid "block device"
msgstr ""
-#: e2fsck/message.c:331
+#: e2fsck/message.c:338
#, c-format
msgid "named pipe"
msgstr ""
-#: e2fsck/message.c:333
+#: e2fsck/message.c:340
#, c-format
msgid "symbolic link"
msgstr ""
-#: e2fsck/message.c:335
+#: e2fsck/message.c:342
#, c-format
msgid "socket"
msgstr ""
-#: e2fsck/message.c:337
+#: e2fsck/message.c:344
#, c-format
msgid "unknown file type with mode 0%o"
msgstr ""
-#: e2fsck/pass1b.c:218
+#: e2fsck/message.c:422
+msgid "indirect block"
+msgstr ""
+
+#: e2fsck/message.c:424
+msgid "double indirect block"
+msgstr ""
+
+#: e2fsck/message.c:426
+msgid "triple indirect block"
+msgstr ""
+
+#: e2fsck/message.c:428
+msgid "translator block"
+msgstr ""
+
+#: e2fsck/message.c:430
+msgid "block #"
+msgstr ""
+
+#: e2fsck/pass1b.c:220
msgid "multiply claimed inode map"
msgstr ""
-#: e2fsck/pass1b.c:578 e2fsck/pass1b.c:711
+#: e2fsck/pass1b.c:581 e2fsck/pass1b.c:714
#, c-format
msgid "internal error: can't find dup_blk for %u\n"
msgstr ""
-#: e2fsck/pass1b.c:754
+#: e2fsck/pass1b.c:757
msgid "returned from clone_file_block"
msgstr ""
-#: e2fsck/pass1b.c:773
+#: e2fsck/pass1b.c:776
#, c-format
msgid "internal error: couldn't lookup EA block record for %u"
msgstr ""
-#: e2fsck/pass1b.c:785
+#: e2fsck/pass1b.c:788
#, c-format
msgid "internal error: couldn't lookup EA inode record for %u"
msgstr ""
-#: e2fsck/pass1.c:430 e2fsck/pass2.c:778
+#: e2fsck/pass1.c:475 e2fsck/pass2.c:776
msgid "reading directory block"
msgstr ""
-#: e2fsck/pass1.c:550
+#: e2fsck/pass1.c:597
msgid "in-use inode map"
msgstr ""
-#: e2fsck/pass1.c:559
+#: e2fsck/pass1.c:606
msgid "directory inode map"
msgstr ""
-#: e2fsck/pass1.c:567
+#: e2fsck/pass1.c:614
msgid "regular file inode map"
msgstr ""
-#: e2fsck/pass1.c:574
+#: e2fsck/pass1.c:621
msgid "in-use block map"
msgstr ""
-#: e2fsck/pass1.c:628
+#: e2fsck/pass1.c:675
msgid "opening inode scan"
msgstr ""
-#: e2fsck/pass1.c:652
+#: e2fsck/pass1.c:699
msgid "getting next inode from scan"
msgstr ""
-#: e2fsck/pass1.c:1121
+#: e2fsck/pass1.c:1169
msgid "Pass 1"
msgstr ""
-#: e2fsck/pass1.c:1178
+#: e2fsck/pass1.c:1226
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr ""
-#: e2fsck/pass1.c:1222
+#: e2fsck/pass1.c:1270
msgid "bad inode map"
msgstr ""
-#: e2fsck/pass1.c:1244
+#: e2fsck/pass1.c:1292
msgid "inode in bad block map"
msgstr ""
-#: e2fsck/pass1.c:1264
+#: e2fsck/pass1.c:1312
msgid "imagic inode map"
msgstr ""
-#: e2fsck/pass1.c:1291
+#: e2fsck/pass1.c:1339
msgid "multiply claimed block map"
msgstr ""
-#: e2fsck/pass1.c:1390
+#: e2fsck/pass1.c:1438
msgid "ext attr block map"
msgstr ""
-#: e2fsck/pass1.c:2132
+#: e2fsck/pass1.c:2162
#, c-format
msgid "%6lu(%c): expecting %6lu got phys %6lu (blkcnt %lld)\n"
msgstr ""
-#: e2fsck/pass1.c:2447
+#: e2fsck/pass1.c:2514
msgid "block bitmap"
msgstr ""
-#: e2fsck/pass1.c:2451
+#: e2fsck/pass1.c:2518
msgid "inode bitmap"
msgstr ""
-#: e2fsck/pass1.c:2455
+#: e2fsck/pass1.c:2522
msgid "inode table"
msgstr ""
-#: e2fsck/pass2.c:284
+#: e2fsck/pass2.c:277
msgid "Pass 2"
msgstr ""
-#: e2fsck/pass2.c:801
+#: e2fsck/pass2.c:799
msgid "Can not continue."
msgstr ""
@@ -896,7 +917,7 @@ msgstr ""
msgid "Clear @j"
msgstr ""
-#: e2fsck/problem.c:245 e2fsck/problem.c:647
+#: e2fsck/problem.c:245 e2fsck/problem.c:664
#. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem.
msgid "@f has feature flag(s) set, but is a revision 0 @f. "
msgstr ""
@@ -907,13 +928,13 @@ msgid "%s @o @i %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n"
msgstr ""
#: e2fsck/problem.c:255
-#. @-expanded: illegal block #%B (%b) found in orphaned inode %i.\n
-msgid "@I @b #%B (%b) found in @o @i %i.\n"
+#. @-expanded: illegal %B (%b) found in orphaned inode %i.\n
+msgid "@I %B (%b) found in @o @i %i.\n"
msgstr ""
#: e2fsck/problem.c:260
-#. @-expanded: Already cleared block #%B (%b) found in orphaned inode %i.\n
-msgid "Already cleared @b #%B (%b) found in @o @i %i.\n"
+#. @-expanded: Already cleared %B (%b) found in orphaned inode %i.\n
+msgid "Already cleared %B (%b) found in @o @i %i.\n"
msgstr ""
#: e2fsck/problem.c:265
@@ -1008,13 +1029,19 @@ msgid "Resize @i not valid. "
msgstr ""
#: e2fsck/problem.c:337
-#. @-expanded: superblock last mount time is in the future.
-msgid "@S last mount time is in the future. "
+#. @-expanded: superblock last mount time (%t,\n
+#. @-expanded: \tnow = %T) is in the future.\n
+msgid ""
+"@S last mount time (%t,\n"
+"\tnow = %T) is in the future.\n"
msgstr ""
#: e2fsck/problem.c:342
-#. @-expanded: superblock last write time is in the future.
-msgid "@S last write time is in the future. "
+#. @-expanded: superblock last write time (%t,\n
+#. @-expanded: \tnow = %T) is in the future.\n
+msgid ""
+"@S last write time (%t,\n"
+"\tnow = %T) is in the future.\n"
msgstr ""
#: e2fsck/problem.c:346
@@ -1068,122 +1095,147 @@ msgstr ""
msgid "The test_fs flag is set (and ext4 is available). "
msgstr ""
-#: e2fsck/problem.c:392
+#: e2fsck/problem.c:390
+#. @-expanded: superblock last mount time is in the future.\n
+#. @-expanded: \t(by less than a day, probably due to the hardware clock being incorrectly
+#. @-expanded: set)
+msgid ""
+"@S last mount time is in the future.\n"
+"\t(by less than a day, probably due to the hardware clock being incorrectly "
+"set) "
+msgstr ""
+
+#: e2fsck/problem.c:396
+#. @-expanded: superblock last write time is in the future.\n
+#. @-expanded: \t(by less than a day, probably due to the hardware clock being incorrectly
+#. @-expanded: set).
+msgid ""
+"@S last write time is in the future.\n"
+"\t(by less than a day, probably due to the hardware clock being incorrectly "
+"set). "
+msgstr ""
+
+#: e2fsck/problem.c:402
+#. @-expanded: One or more block group descriptor checksums are invalid.
+msgid "One or more @b @g descriptor checksums are invalid. "
+msgstr ""
+
+#: e2fsck/problem.c:409
#. @-expanded: Pass 1: Checking inodes, blocks, and sizes\n
msgid "Pass 1: Checking @is, @bs, and sizes\n"
msgstr ""
-#: e2fsck/problem.c:396
+#: e2fsck/problem.c:413
#. @-expanded: root inode is not a directory.
msgid "@r is not a @d. "
msgstr ""
-#: e2fsck/problem.c:401
+#: e2fsck/problem.c:418
#. @-expanded: root inode has dtime set (probably due to old mke2fs).
msgid "@r has dtime set (probably due to old mke2fs). "
msgstr ""
-#: e2fsck/problem.c:406
+#: e2fsck/problem.c:423
#. @-expanded: Reserved inode %i (%Q) has invalid mode.
msgid "Reserved @i %i (%Q) has @n mode. "
msgstr ""
-#: e2fsck/problem.c:411
+#: e2fsck/problem.c:428
#, c-format
#. @-expanded: deleted inode %i has zero dtime.
msgid "@D @i %i has zero dtime. "
msgstr ""
-#: e2fsck/problem.c:416
+#: e2fsck/problem.c:433
#, c-format
#. @-expanded: inode %i is in use, but has dtime set.
msgid "@i %i is in use, but has dtime set. "
msgstr ""
-#: e2fsck/problem.c:421
+#: e2fsck/problem.c:438
#, c-format
#. @-expanded: inode %i is a zero-length directory.
msgid "@i %i is a @z @d. "
msgstr ""
-#: e2fsck/problem.c:426
+#: e2fsck/problem.c:443
#. @-expanded: group %g's block bitmap at %b conflicts with some other fs block.\n
msgid "@g %g's @b @B at %b @C.\n"
msgstr ""
-#: e2fsck/problem.c:431
+#: e2fsck/problem.c:448
#. @-expanded: group %g's inode bitmap at %b conflicts with some other fs block.\n
msgid "@g %g's @i @B at %b @C.\n"
msgstr ""
-#: e2fsck/problem.c:436
+#: e2fsck/problem.c:453
#. @-expanded: group %g's inode table at %b conflicts with some other fs block.\n
msgid "@g %g's @i table at %b @C.\n"
msgstr ""
-#: e2fsck/problem.c:441
+#: e2fsck/problem.c:458
#. @-expanded: group %g's block bitmap (%b) is bad.
msgid "@g %g's @b @B (%b) is bad. "
msgstr ""
-#: e2fsck/problem.c:446
+#: e2fsck/problem.c:463
#. @-expanded: group %g's inode bitmap (%b) is bad.
msgid "@g %g's @i @B (%b) is bad. "
msgstr ""
-#: e2fsck/problem.c:451
+#: e2fsck/problem.c:468
#. @-expanded: inode %i, i_size is %Is, should be %N.
msgid "@i %i, i_size is %Is, @s %N. "
msgstr ""
-#: e2fsck/problem.c:456
+#: e2fsck/problem.c:473
#. @-expanded: inode %i, i_blocks is %Ib, should be %N.
msgid "@i %i, i_ at bs is %Ib, @s %N. "
msgstr ""
-#: e2fsck/problem.c:461
-#. @-expanded: illegal block #%B (%b) in inode %i.
-msgid "@I @b #%B (%b) in @i %i. "
+#: e2fsck/problem.c:478
+#. @-expanded: illegal %B (%b) in inode %i.
+msgid "@I %B (%b) in @i %i. "
msgstr ""
-#: e2fsck/problem.c:466
-#. @-expanded: block #%B (%b) overlaps filesystem metadata in inode %i.
-msgid "@b #%B (%b) overlaps @f metadata in @i %i. "
+#: e2fsck/problem.c:483
+#. @-expanded: %B (%b) overlaps filesystem metadata in inode %i.
+msgid "%B (%b) overlaps @f metadata in @i %i. "
msgstr ""
-#: e2fsck/problem.c:471
+#: e2fsck/problem.c:488
#, c-format
#. @-expanded: inode %i has illegal block(s).
msgid "@i %i has illegal @b(s). "
msgstr ""
-#: e2fsck/problem.c:476
+#: e2fsck/problem.c:493
#, c-format
#. @-expanded: Too many illegal blocks in inode %i.\n
msgid "Too many illegal @bs in @i %i.\n"
msgstr ""
-#: e2fsck/problem.c:481
-#. @-expanded: illegal block #%B (%b) in bad block inode.
-msgid "@I @b #%B (%b) in bad @b @i. "
+#: e2fsck/problem.c:498
+#. @-expanded: illegal %B (%b) in bad block inode.
+msgid "@I %B (%b) in bad @b @i. "
msgstr ""
-#: e2fsck/problem.c:486
+#: e2fsck/problem.c:503
#. @-expanded: Bad block inode has illegal block(s).
msgid "Bad @b @i has illegal @b(s). "
msgstr ""
-#: e2fsck/problem.c:491
+#: e2fsck/problem.c:508
#. @-expanded: Duplicate or bad block in use!\n
msgid "Duplicate or bad @b in use!\n"
msgstr ""
-#: e2fsck/problem.c:496
+#: e2fsck/problem.c:513
#. @-expanded: Bad block %b used as bad block inode indirect block.
msgid "Bad @b %b used as bad @b @i indirect @b. "
msgstr ""
-#: e2fsck/problem.c:501
+#: e2fsck/problem.c:518
#. @-expanded: \n
#. @-expanded: The bad block inode has probably been corrupted. You probably\n
#. @-expanded: should stop now and run e2fsck -c to scan for bad blocks\n
@@ -1195,7 +1247,7 @@ msgid ""
"in the @f.\n"
msgstr ""
-#: e2fsck/problem.c:508
+#: e2fsck/problem.c:525
#. @-expanded: \n
#. @-expanded: If the block is really bad, the filesystem can not be fixed.\n
msgid ""
@@ -1203,7 +1255,7 @@ msgid ""
"If the @b is really bad, the @f can not be fixed.\n"
msgstr ""
-#: e2fsck/problem.c:513
+#: e2fsck/problem.c:530
#. @-expanded: You can remove this block from the bad block list and hope\n
#. @-expanded: that the block is really OK. But there are no guarantees.\n
#. @-expanded: \n
@@ -1213,120 +1265,120 @@ msgid ""
"\n"
msgstr ""
-#: e2fsck/problem.c:519
+#: e2fsck/problem.c:536
#. @-expanded: The primary superblock (%b) is on the bad block list.\n
msgid "The primary @S (%b) is on the bad @b list.\n"
msgstr ""
-#: e2fsck/problem.c:524
+#: e2fsck/problem.c:541
#. @-expanded: Block %b in the primary group descriptors is on the bad block list\n
msgid "Block %b in the primary @g descriptors is on the bad @b list\n"
msgstr ""
-#: e2fsck/problem.c:530
+#: e2fsck/problem.c:547
#. @-expanded: Warning: Group %g's superblock (%b) is bad.\n
msgid "Warning: Group %g's @S (%b) is bad.\n"
msgstr ""
-#: e2fsck/problem.c:535
+#: e2fsck/problem.c:552
#. @-expanded: Warning: Group %g's copy of the group descriptors has a bad block (%b).\n
msgid "Warning: Group %g's copy of the @g descriptors has a bad @b (%b).\n"
msgstr ""
-#: e2fsck/problem.c:541
+#: e2fsck/problem.c:558
#. @-expanded: Programming error? block #%b claimed for no reason in process_bad_block.\n
msgid "Programming error? @b #%b claimed for no reason in process_bad_ at b.\n"
msgstr ""
-#: e2fsck/problem.c:547
+#: e2fsck/problem.c:564
#. @-expanded: error allocating %N contiguous block(s) in block group %g for %s: %m\n
msgid "@A %N contiguous @b(s) in @b @g %g for %s: %m\n"
msgstr ""
-#: e2fsck/problem.c:552
+#: e2fsck/problem.c:569
#, c-format
#. @-expanded: error allocating block buffer for relocating %s\n
msgid "@A @b buffer for relocating %s\n"
msgstr ""
-#: e2fsck/problem.c:557
+#: e2fsck/problem.c:574
#. @-expanded: Relocating group %g's %s from %b to %c...\n
msgid "Relocating @g %g's %s from %b to %c...\n"
msgstr ""
-#: e2fsck/problem.c:562
+#: e2fsck/problem.c:579
#, c-format
#. @-expanded: Relocating group %g's %s to %c...\n
msgid "Relocating @g %g's %s to %c...\n"
msgstr ""
-#: e2fsck/problem.c:567
+#: e2fsck/problem.c:584
#. @-expanded: Warning: could not read block %b of %s: %m\n
msgid "Warning: could not read @b %b of %s: %m\n"
msgstr ""
-#: e2fsck/problem.c:572
+#: e2fsck/problem.c:589
#. @-expanded: Warning: could not write block %b for %s: %m\n
msgid "Warning: could not write @b %b for %s: %m\n"
msgstr ""
-#: e2fsck/problem.c:577 e2fsck/problem.c:1383
+#: e2fsck/problem.c:594 e2fsck/problem.c:1400
#. @-expanded: error allocating inode bitmap (%N): %m\n
msgid "@A @i @B (%N): %m\n"
msgstr ""
-#: e2fsck/problem.c:582
+#: e2fsck/problem.c:599
#. @-expanded: error allocating block bitmap (%N): %m\n
msgid "@A @b @B (%N): %m\n"
msgstr ""
-#: e2fsck/problem.c:587
+#: e2fsck/problem.c:604
#, c-format
#. @-expanded: error allocating icount link information: %m\n
msgid "@A icount link information: %m\n"
msgstr ""
-#: e2fsck/problem.c:592
+#: e2fsck/problem.c:609
#, c-format
#. @-expanded: error allocating directory block array: %m\n
msgid "@A @d @b array: %m\n"
msgstr ""
-#: e2fsck/problem.c:597
+#: e2fsck/problem.c:614
#, c-format
#. @-expanded: Error while scanning inodes (%i): %m\n
msgid "Error while scanning @is (%i): %m\n"
msgstr ""
-#: e2fsck/problem.c:602
+#: e2fsck/problem.c:619
#, c-format
#. @-expanded: Error while iterating over blocks in inode %i: %m\n
msgid "Error while iterating over @bs in @i %i: %m\n"
msgstr ""
-#: e2fsck/problem.c:607
+#: e2fsck/problem.c:624
#. @-expanded: Error storing inode count information (inode=%i, count=%N): %m\n
msgid "Error storing @i count information (@i=%i, count=%N): %m\n"
msgstr ""
-#: e2fsck/problem.c:612
+#: e2fsck/problem.c:629
#. @-expanded: Error storing directory block information (inode=%i, block=%b, num=%N): %m\n
msgid "Error storing @d @b information (@i=%i, @b=%b, num=%N): %m\n"
msgstr ""
-#: e2fsck/problem.c:618
+#: e2fsck/problem.c:635
#, c-format
#. @-expanded: Error reading inode %i: %m\n
msgid "Error reading @i %i: %m\n"
msgstr ""
-#: e2fsck/problem.c:626
+#: e2fsck/problem.c:643
#, c-format
#. @-expanded: inode %i has imagic flag set.
msgid "@i %i has imagic flag set. "
msgstr ""
-#: e2fsck/problem.c:631
+#: e2fsck/problem.c:648
#, c-format
#. @-expanded: Special (device/socket/fifo/symlink) file (inode %i) has immutable\n
#. @-expanded: or append-only flag set.
@@ -1335,150 +1387,148 @@ msgid ""
"or append-only flag set. "
msgstr ""
-#: e2fsck/problem.c:637
+#: e2fsck/problem.c:654
#, c-format
#. @-expanded: inode %i has compression flag set on filesystem without compression support.
msgid "@i %i has @cion flag set on @f without @cion support. "
msgstr ""
-#: e2fsck/problem.c:642
+#: e2fsck/problem.c:659
#, c-format
#. @-expanded: Special (device/socket/fifo) inode %i has non-zero size.
msgid "Special (@v/socket/fifo) @i %i has non-zero size. "
msgstr ""
-#: e2fsck/problem.c:652
+#: e2fsck/problem.c:669
#. @-expanded: journal inode is not in use, but contains data.
msgid "@j @i is not in use, but contains data. "
msgstr ""
-#: e2fsck/problem.c:657
+#: e2fsck/problem.c:674
#. @-expanded: journal is not regular file.
msgid "@j is not regular file. "
msgstr ""
-#: e2fsck/problem.c:662
+#: e2fsck/problem.c:679
#, c-format
#. @-expanded: inode %i was part of the orphaned inode list.
msgid "@i %i was part of the @o @i list. "
msgstr ""
-#: e2fsck/problem.c:668
+#: e2fsck/problem.c:685
#. @-expanded: inodes that were part of a corrupted orphan linked list found.
msgid "@is that were part of a corrupted orphan linked list found. "
msgstr ""
-#: e2fsck/problem.c:673
+#: e2fsck/problem.c:690
#. @-expanded: error allocating refcount structure (%N): %m\n
msgid "@A refcount structure (%N): %m\n"
msgstr ""
-#: e2fsck/problem.c:678
+#: e2fsck/problem.c:695
#. @-expanded: Error reading extended attribute block %b for inode %i.
msgid "Error reading @a @b %b for @i %i. "
msgstr ""
-#: e2fsck/problem.c:683
+#: e2fsck/problem.c:700
#. @-expanded: inode %i has a bad extended attribute block %b.
msgid "@i %i has a bad @a @b %b. "
msgstr ""
-#: e2fsck/problem.c:688
+#: e2fsck/problem.c:705
#. @-expanded: Error reading extended attribute block %b (%m).
msgid "Error reading @a @b %b (%m). "
msgstr ""
-#: e2fsck/problem.c:693
-#. @-expanded: extended attribute block %b has reference count %B, should be %N.
-msgid "@a @b %b has reference count %B, @s %N. "
+#: e2fsck/problem.c:710
+#. @-expanded: extended attribute block %b has reference count %r, should be %N.
+msgid "@a @b %b has reference count %r, @s %N. "
msgstr ""
-#: e2fsck/problem.c:698
+#: e2fsck/problem.c:715
#. @-expanded: Error writing extended attribute block %b (%m).
msgid "Error writing @a @b %b (%m). "
msgstr ""
-#: e2fsck/problem.c:703
+#: e2fsck/problem.c:720
#. @-expanded: extended attribute block %b has h_blocks > 1.
msgid "@a @b %b has h_ at bs > 1. "
msgstr ""
-#: e2fsck/problem.c:708
+#: e2fsck/problem.c:725
#. @-expanded: error allocating extended attribute block %b.
msgid "@A @a @b %b. "
msgstr ""
-#: e2fsck/problem.c:713
+#: e2fsck/problem.c:730
#. @-expanded: extended attribute block %b is corrupt (allocation collision).
msgid "@a @b %b is corrupt (allocation collision). "
msgstr ""
-#: e2fsck/problem.c:718
+#: e2fsck/problem.c:735
#. @-expanded: extended attribute block %b is corrupt (invalid name).
msgid "@a @b %b is corrupt (@n name). "
msgstr ""
-#: e2fsck/problem.c:723
+#: e2fsck/problem.c:740
#. @-expanded: extended attribute block %b is corrupt (invalid value).
msgid "@a @b %b is corrupt (@n value). "
msgstr ""
-#: e2fsck/problem.c:728
+#: e2fsck/problem.c:745
#, c-format
#. @-expanded: inode %i is too big.
msgid "@i %i is too big. "
msgstr ""
-#: e2fsck/problem.c:732
-#. @-expanded: block #%B (%b) causes directory to be too big.
-msgid "@b #%B (%b) causes @d to be too big. "
+#: e2fsck/problem.c:749
+#. @-expanded: %B (%b) causes directory to be too big.
+msgid "%B (%b) causes @d to be too big. "
msgstr ""
-#: e2fsck/problem.c:737
-#. @-expanded: block #%B (%b) causes file to be too big.
-msgid "@b #%B (%b) causes file to be too big. "
+#: e2fsck/problem.c:754
+msgid "%B (%b) causes file to be too big. "
msgstr ""
-#: e2fsck/problem.c:742
-#. @-expanded: block #%B (%b) causes symlink to be too big.
-msgid "@b #%B (%b) causes symlink to be too big. "
+#: e2fsck/problem.c:759
+msgid "%B (%b) causes symlink to be too big. "
msgstr ""
-#: e2fsck/problem.c:747
+#: e2fsck/problem.c:764
#, c-format
#. @-expanded: inode %i has INDEX_FL flag set on filesystem without htree support.\n
msgid "@i %i has INDEX_FL flag set on @f without htree support.\n"
msgstr ""
-#: e2fsck/problem.c:752
+#: e2fsck/problem.c:769
#, c-format
#. @-expanded: inode %i has INDEX_FL flag set but is not a directory.\n
msgid "@i %i has INDEX_FL flag set but is not a @d.\n"
msgstr ""
-#: e2fsck/problem.c:757
+#: e2fsck/problem.c:774
#, c-format
#. @-expanded: HTREE directory inode %i has an invalid root node.\n
msgid "@h %i has an @n root node.\n"
msgstr ""
-#: e2fsck/problem.c:762
+#: e2fsck/problem.c:779
#. @-expanded: HTREE directory inode %i has an unsupported hash version (%N)\n
msgid "@h %i has an unsupported hash version (%N)\n"
msgstr ""
-#: e2fsck/problem.c:767
+#: e2fsck/problem.c:784
#, c-format
#. @-expanded: HTREE directory inode %i uses an incompatible htree root node flag.\n
msgid "@h %i uses an incompatible htree root node flag.\n"
msgstr ""
-#: e2fsck/problem.c:772
+#: e2fsck/problem.c:789
#. @-expanded: HTREE directory inode %i has a tree depth (%N) which is too big\n
msgid "@h %i has a tree depth (%N) which is too big\n"
msgstr ""
-#: e2fsck/problem.c:777
+#: e2fsck/problem.c:794
#. @-expanded: Bad block inode has an indirect block (%b) that conflicts with\n
#. @-expanded: filesystem metadata.
msgid ""
@@ -1486,54 +1536,54 @@ msgid ""
"@f metadata. "
msgstr ""
-#: e2fsck/problem.c:783
+#: e2fsck/problem.c:800
#, c-format
#. @-expanded: Resize inode (re)creation failed: %m.
msgid "Resize @i (re)creation failed: %m."
msgstr ""
-#: e2fsck/problem.c:788
+#: e2fsck/problem.c:805
#. @-expanded: inode %i has a extra size (%IS) which is invalid\n
msgid "@i %i has a extra size (%IS) which is @n\n"
msgstr ""
-#: e2fsck/problem.c:793
+#: e2fsck/problem.c:810
#. @-expanded: extended attribute in inode %i has a namelen (%N) which is invalid\n
msgid "@a in @i %i has a namelen (%N) which is @n\n"
msgstr ""
-#: e2fsck/problem.c:798
+#: e2fsck/problem.c:815
#. @-expanded: extended attribute in inode %i has a value offset (%N) which is invalid\n
msgid "@a in @i %i has a value offset (%N) which is @n\n"
msgstr ""
-#: e2fsck/problem.c:803
+#: e2fsck/problem.c:820
#. @-expanded: extended attribute in inode %i has a value block (%N) which is invalid (must be 0)\n
msgid "@a in @i %i has a value @b (%N) which is @n (must be 0)\n"
msgstr ""
-#: e2fsck/problem.c:808
+#: e2fsck/problem.c:825
#. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n
msgid "@a in @i %i has a value size (%N) which is @n\n"
msgstr ""
-#: e2fsck/problem.c:813
+#: e2fsck/problem.c:830
#. @-expanded: extended attribute in inode %i has a hash (%N) which is invalid\n
msgid "@a in @i %i has a hash (%N) which is @n\n"
msgstr ""
-#: e2fsck/problem.c:818
+#: e2fsck/problem.c:835
#. @-expanded: inode %i is a %It but it looks like it is really a directory.\n
msgid "@i %i is a %It but it looks like it is really a directory.\n"
msgstr ""
-#: e2fsck/problem.c:823
+#: e2fsck/problem.c:840
#, c-format
#. @-expanded: Error while reading over extent tree in inode %i: %m\n
msgid "Error while reading over @x tree in @i %i: %m\n"
msgstr ""
-#: e2fsck/problem.c:828
+#: e2fsck/problem.c:845
#. @-expanded: Failed to iterate extents in inode %i\n
#. @-expanded: \t(op %s, blk %b, lblk %c): %m\n
msgid ""
@@ -1541,7 +1591,7 @@ msgid ""
"\t(op %s, blk %b, lblk %c): %m\n"
msgstr ""
-#: e2fsck/problem.c:834
+#: e2fsck/problem.c:851
#. @-expanded: inode %i has an invalid extent\n
#. @-expanded: \t(logical block %c, invalid physical block %b, len %N)\n
msgid ""
@@ -1549,7 +1599,7 @@ msgid ""
"\t(logical @b %c, @n physical @b %b, len %N)\n"
msgstr ""
-#: e2fsck/problem.c:839
+#: e2fsck/problem.c:856
#. @-expanded: inode %i has an invalid extent\n
#. @-expanded: \t(logical block %c, physical block %b, invalid len %N)\n
msgid ""
@@ -1557,30 +1607,30 @@ msgid ""
"\t(logical @b %c, physical @b %b, @n len %N)\n"
msgstr ""
-#: e2fsck/problem.c:844
+#: e2fsck/problem.c:861
#, c-format
#. @-expanded: inode %i has EXTENTS_FL flag set on filesystem without extents support.\n
msgid "@i %i has EXTENTS_FL flag set on @f without extents support.\n"
msgstr ""
-#: e2fsck/problem.c:849
+#: e2fsck/problem.c:866
#, c-format
#. @-expanded: inode %i is in extent format, but superblock is missing EXTENTS feature\n
msgid "@i %i is in extent format, but @S is missing EXTENTS feature\n"
msgstr ""
-#: e2fsck/problem.c:854
+#: e2fsck/problem.c:871
#, c-format
#. @-expanded: inode %i missing EXTENT_FL, but is in extents format\n
msgid "@i %i missing EXTENT_FL, but is in extents format\n"
msgstr ""
-#: e2fsck/problem.c:859
+#: e2fsck/problem.c:876
#, c-format
msgid "Fast symlink %i has EXTENT_FL set. "
msgstr ""
-#: e2fsck/problem.c:864
+#: e2fsck/problem.c:881
#. @-expanded: inode %i has out of order extents\n
#. @-expanded: \t(invalid logical block %c, physical block %b, len %N)\n
msgid ""
@@ -1588,12 +1638,12 @@ msgid ""
"\t(@n logical @b %c, physical @b %b, len %N)\n"
msgstr ""
-#: e2fsck/problem.c:868
+#: e2fsck/problem.c:885
#. @-expanded: inode %i has an invalid extent node (blk %b, lblk %c)\n
msgid "@i %i has an invalid extent node (blk %b, lblk %c)\n"
msgstr ""
-#: e2fsck/problem.c:875
+#: e2fsck/problem.c:892
#. @-expanded: \n
#. @-expanded: Running additional passes to resolve blocks claimed by more than one inode...\n
#. @-expanded: Pass 1B: Rescanning for multiply-claimed blocks\n
@@ -1603,63 +1653,63 @@ msgid ""
"Pass 1B: Rescanning for @m @bs\n"
msgstr ""
-#: e2fsck/problem.c:881
+#: e2fsck/problem.c:898
#, c-format
#. @-expanded: multiply-claimed block(s) in inode %i:
msgid "@m @b(s) in @i %i:"
msgstr ""
-#: e2fsck/problem.c:896
+#: e2fsck/problem.c:913
#, c-format
msgid "Error while scanning inodes (%i): %m\n"
msgstr ""
-#: e2fsck/problem.c:901
+#: e2fsck/problem.c:918
#, c-format
#. @-expanded: error allocating inode bitmap (inode_dup_map): %m\n
msgid "@A @i @B (@i_dup_map): %m\n"
msgstr ""
-#: e2fsck/problem.c:906
+#: e2fsck/problem.c:923
#, c-format
#. @-expanded: Error while iterating over blocks in inode %i (%s): %m\n
msgid "Error while iterating over @bs in @i %i (%s): %m\n"
msgstr ""
-#: e2fsck/problem.c:911 e2fsck/problem.c:1227
+#: e2fsck/problem.c:928 e2fsck/problem.c:1244
#. @-expanded: Error adjusting refcount for extended attribute block %b (inode %i): %m\n
msgid "Error adjusting refcount for @a @b %b (@i %i): %m\n"
msgstr ""
-#: e2fsck/problem.c:917
+#: e2fsck/problem.c:934
#. @-expanded: Pass 1C: Scanning directories for inodes with multiply-claimed blocks\n
msgid "Pass 1C: Scanning directories for @is with @m @bs\n"
msgstr ""
-#: e2fsck/problem.c:923
+#: e2fsck/problem.c:940
#. @-expanded: Pass 1D: Reconciling multiply-claimed blocks\n
msgid "Pass 1D: Reconciling @m @bs\n"
msgstr ""
-#: e2fsck/problem.c:928
+#: e2fsck/problem.c:945
#. @-expanded: File %Q (inode #%i, mod time %IM) \n
-#. @-expanded: has %B multiply-claimed block(s), shared with %N file(s):\n
+#. @-expanded: has %r multiply-claimed block(s), shared with %N file(s):\n
msgid ""
"File %Q (@i #%i, mod time %IM) \n"
-" has %B @m @b(s), shared with %N file(s):\n"
+" has %r @m @b(s), shared with %N file(s):\n"
msgstr ""
-#: e2fsck/problem.c:934
+#: e2fsck/problem.c:951
#. @-expanded: \t%Q (inode #%i, mod time %IM)\n
msgid "\t%Q (@i #%i, mod time %IM)\n"
msgstr ""
-#: e2fsck/problem.c:939
+#: e2fsck/problem.c:956
#. @-expanded: \t<filesystem metadata>\n
msgid "\t<@f metadata>\n"
msgstr ""
-#: e2fsck/problem.c:944
+#: e2fsck/problem.c:961
#. @-expanded: (There are %N inodes containing multiply-claimed blocks.)\n
#. @-expanded: \n
msgid ""
@@ -1667,7 +1717,7 @@ msgid ""
"\n"
msgstr ""
-#: e2fsck/problem.c:949
+#: e2fsck/problem.c:966
#. @-expanded: multiply-claimed blocks already reassigned or cloned.\n
#. @-expanded: \n
msgid ""
@@ -1675,313 +1725,313 @@ msgid ""
"\n"
msgstr ""
-#: e2fsck/problem.c:962
+#: e2fsck/problem.c:979
#, c-format
msgid "Couldn't clone file: %m\n"
msgstr ""
-#: e2fsck/problem.c:968
+#: e2fsck/problem.c:985
#. @-expanded: Pass 2: Checking directory structure\n
msgid "Pass 2: Checking @d structure\n"
msgstr ""
-#: e2fsck/problem.c:973
+#: e2fsck/problem.c:990
#, c-format
#. @-expanded: invalid inode number for '.' in directory inode %i.\n
msgid "@n @i number for '.' in @d @i %i.\n"
msgstr ""
-#: e2fsck/problem.c:978
+#: e2fsck/problem.c:995
#. @-expanded: entry '%Dn' in %p (%i) has invalid inode #: %Di.\n
msgid "@E has @n @i #: %Di.\n"
msgstr ""
-#: e2fsck/problem.c:983
+#: e2fsck/problem.c:1000
#. @-expanded: entry '%Dn' in %p (%i) has deleted/unused inode %Di.
msgid "@E has @D/unused @i %Di. "
msgstr ""
-#: e2fsck/problem.c:988
+#: e2fsck/problem.c:1005
#. @-expanded: entry '%Dn' in %p (%i) is a link to '.'
msgid "@E @L to '.' "
msgstr ""
-#: e2fsck/problem.c:993
+#: e2fsck/problem.c:1010
#. @-expanded: entry '%Dn' in %p (%i) points to inode (%Di) located in a bad block.\n
msgid "@E points to @i (%Di) located in a bad @b.\n"
msgstr ""
-#: e2fsck/problem.c:998
+#: e2fsck/problem.c:1015
#. @-expanded: entry '%Dn' in %p (%i) is a link to directory %P (%Di).\n
msgid "@E @L to @d %P (%Di).\n"
msgstr ""
-#: e2fsck/problem.c:1003
+#: e2fsck/problem.c:1020
#. @-expanded: entry '%Dn' in %p (%i) is a link to the root inode.\n
msgid "@E @L to the @r.\n"
msgstr ""
-#: e2fsck/problem.c:1008
+#: e2fsck/problem.c:1025
#. @-expanded: entry '%Dn' in %p (%i) has illegal characters in its name.\n
msgid "@E has illegal characters in its name.\n"
msgstr ""
-#: e2fsck/problem.c:1013
+#: e2fsck/problem.c:1030
#, c-format
#. @-expanded: Missing '.' in directory inode %i.\n
msgid "Missing '.' in @d @i %i.\n"
msgstr ""
-#: e2fsck/problem.c:1018
+#: e2fsck/problem.c:1035
#, c-format
#. @-expanded: Missing '..' in directory inode %i.\n
msgid "Missing '..' in @d @i %i.\n"
msgstr ""
-#: e2fsck/problem.c:1023
+#: e2fsck/problem.c:1040
#. @-expanded: First entry '%Dn' (inode=%Di) in directory inode %i (%p) should be '.'\n
msgid "First @e '%Dn' (@i=%Di) in @d @i %i (%p) @s '.'\n"
msgstr ""
-#: e2fsck/problem.c:1028
+#: e2fsck/problem.c:1045
#. @-expanded: Second entry '%Dn' (inode=%Di) in directory inode %i should be '..'\n
msgid "Second @e '%Dn' (@i=%Di) in @d @i %i @s '..'\n"
msgstr ""
-#: e2fsck/problem.c:1033
+#: e2fsck/problem.c:1050
#. @-expanded: i_faddr for inode %i (%Q) is %IF, should be zero.\n
msgid "i_faddr @F %IF, @s zero.\n"
msgstr ""
-#: e2fsck/problem.c:1038
+#: e2fsck/problem.c:1055
#. @-expanded: i_file_acl for inode %i (%Q) is %If, should be zero.\n
msgid "i_file_acl @F %If, @s zero.\n"
msgstr ""
-#: e2fsck/problem.c:1043
+#: e2fsck/problem.c:1060
#. @-expanded: i_dir_acl for inode %i (%Q) is %Id, should be zero.\n
msgid "i_dir_acl @F %Id, @s zero.\n"
msgstr ""
-#: e2fsck/problem.c:1048
+#: e2fsck/problem.c:1065
#. @-expanded: i_frag for inode %i (%Q) is %N, should be zero.\n
msgid "i_frag @F %N, @s zero.\n"
msgstr ""
-#: e2fsck/problem.c:1053
+#: e2fsck/problem.c:1070
#. @-expanded: i_fsize for inode %i (%Q) is %N, should be zero.\n
msgid "i_fsize @F %N, @s zero.\n"
msgstr ""
-#: e2fsck/problem.c:1058
+#: e2fsck/problem.c:1075
#. @-expanded: inode %i (%Q) has invalid mode (%Im).\n
msgid "@i %i (%Q) has @n mode (%Im).\n"
msgstr ""
-#: e2fsck/problem.c:1063
-#. @-expanded: directory inode %i, block %B, offset %N: directory corrupted\n
-msgid "@d @i %i, @b %B, offset %N: @d corrupted\n"
+#: e2fsck/problem.c:1080
+#. @-expanded: directory inode %i, %B, offset %N: directory corrupted\n
+msgid "@d @i %i, %B, offset %N: @d corrupted\n"
msgstr ""
-#: e2fsck/problem.c:1068
-#. @-expanded: directory inode %i, block %B, offset %N: filename too long\n
-msgid "@d @i %i, @b %B, offset %N: filename too long\n"
+#: e2fsck/problem.c:1085
+#. @-expanded: directory inode %i, %B, offset %N: filename too long\n
+msgid "@d @i %i, %B, offset %N: filename too long\n"
msgstr ""
-#: e2fsck/problem.c:1073
-#. @-expanded: directory inode %i has an unallocated block #%B.
-msgid "@d @i %i has an unallocated @b #%B. "
+#: e2fsck/problem.c:1090
+#. @-expanded: directory inode %i has an unallocated %B.
+msgid "@d @i %i has an unallocated %B. "
msgstr ""
-#: e2fsck/problem.c:1078
+#: e2fsck/problem.c:1095
#, c-format
#. @-expanded: '.' directory entry in directory inode %i is not NULL terminated\n
msgid "'.' @d @e in @d @i %i is not NULL terminated\n"
msgstr ""
-#: e2fsck/problem.c:1083
+#: e2fsck/problem.c:1100
#, c-format
#. @-expanded: '..' directory entry in directory inode %i is not NULL terminated\n
msgid "'..' @d @e in @d @i %i is not NULL terminated\n"
msgstr ""
-#: e2fsck/problem.c:1088
+#: e2fsck/problem.c:1105
#. @-expanded: inode %i (%Q) is an illegal character device.\n
msgid "@i %i (%Q) is an @I character @v.\n"
msgstr ""
-#: e2fsck/problem.c:1093
+#: e2fsck/problem.c:1110
#. @-expanded: inode %i (%Q) is an illegal block device.\n
msgid "@i %i (%Q) is an @I @b @v.\n"
msgstr ""
-#: e2fsck/problem.c:1098
+#: e2fsck/problem.c:1115
#. @-expanded: entry '%Dn' in %p (%i) is duplicate '.' entry.\n
msgid "@E is duplicate '.' @e.\n"
msgstr ""
-#: e2fsck/problem.c:1103
+#: e2fsck/problem.c:1120
#. @-expanded: entry '%Dn' in %p (%i) is duplicate '..' entry.\n
msgid "@E is duplicate '..' @e.\n"
msgstr ""
-#: e2fsck/problem.c:1108 e2fsck/problem.c:1408
+#: e2fsck/problem.c:1125 e2fsck/problem.c:1425
#, c-format
msgid "Internal error: couldn't find dir_info for %i.\n"
msgstr ""
-#: e2fsck/problem.c:1113
+#: e2fsck/problem.c:1130
#. @-expanded: entry '%Dn' in %p (%i) has rec_len of %Dr, should be %N.\n
msgid "@E has rec_len of %Dr, @s %N.\n"
msgstr ""
-#: e2fsck/problem.c:1118
+#: e2fsck/problem.c:1135
#, c-format
#. @-expanded: error allocating icount structure: %m\n
msgid "@A icount structure: %m\n"
msgstr ""
-#: e2fsck/problem.c:1123
+#: e2fsck/problem.c:1140
#, c-format
#. @-expanded: Error iterating over directory blocks: %m\n
msgid "Error iterating over @d @bs: %m\n"
msgstr ""
-#: e2fsck/problem.c:1128
+#: e2fsck/problem.c:1145
#. @-expanded: Error reading directory block %b (inode %i): %m\n
msgid "Error reading @d @b %b (@i %i): %m\n"
msgstr ""
-#: e2fsck/problem.c:1133
+#: e2fsck/problem.c:1150
#. @-expanded: Error writing directory block %b (inode %i): %m\n
msgid "Error writing @d @b %b (@i %i): %m\n"
msgstr ""
-#: e2fsck/problem.c:1138
+#: e2fsck/problem.c:1155
#, c-format
#. @-expanded: error allocating new directory block for inode %i (%s): %m\n
msgid "@A new @d @b for @i %i (%s): %m\n"
msgstr ""
-#: e2fsck/problem.c:1143
+#: e2fsck/problem.c:1160
#, c-format
#. @-expanded: Error deallocating inode %i: %m\n
msgid "Error deallocating @i %i: %m\n"
msgstr ""
-#: e2fsck/problem.c:1148
+#: e2fsck/problem.c:1165
#, c-format
#. @-expanded: directory entry for '.' in %p (%i) is big.\n
msgid "@d @e for '.' in %p (%i) is big.\n"
msgstr ""
-#: e2fsck/problem.c:1153
+#: e2fsck/problem.c:1170
#. @-expanded: inode %i (%Q) is an illegal FIFO.\n
msgid "@i %i (%Q) is an @I FIFO.\n"
msgstr ""
-#: e2fsck/problem.c:1158
+#: e2fsck/problem.c:1175
#. @-expanded: inode %i (%Q) is an illegal socket.\n
msgid "@i %i (%Q) is an @I socket.\n"
msgstr ""
-#: e2fsck/problem.c:1163
+#: e2fsck/problem.c:1180
#. @-expanded: Setting filetype for entry '%Dn' in %p (%i) to %N.\n
msgid "Setting filetype for @E to %N.\n"
msgstr ""
-#: e2fsck/problem.c:1168
+#: e2fsck/problem.c:1185
#. @-expanded: entry '%Dn' in %p (%i) has an incorrect filetype (was %Dt, should be %N).\n
msgid "@E has an incorrect filetype (was %Dt, @s %N).\n"
msgstr ""
-#: e2fsck/problem.c:1173
+#: e2fsck/problem.c:1190
#. @-expanded: entry '%Dn' in %p (%i) has filetype set.\n
msgid "@E has filetype set.\n"
msgstr ""
-#: e2fsck/problem.c:1178
+#: e2fsck/problem.c:1195
#. @-expanded: entry '%Dn' in %p (%i) has a zero-length name.\n
msgid "@E has a @z name.\n"
msgstr ""
-#: e2fsck/problem.c:1183
+#: e2fsck/problem.c:1200
#. @-expanded: Symlink %Q (inode #%i) is invalid.\n
msgid "Symlink %Q (@i #%i) is @n.\n"
msgstr ""
-#: e2fsck/problem.c:1188
+#: e2fsck/problem.c:1205
#. @-expanded: extended attribute block for inode %i (%Q) is invalid (%If).\n
msgid "@a @b @F @n (%If).\n"
msgstr ""
-#: e2fsck/problem.c:1193
+#: e2fsck/problem.c:1210
#. @-expanded: filesystem contains large files, but lacks LARGE_FILE flag in superblock.\n
msgid "@f contains large files, but lacks LARGE_FILE flag in @S.\n"
msgstr ""
-#: e2fsck/problem.c:1198
-#. @-expanded: problem in HTREE directory inode %d: node (%B) not referenced\n
-msgid "@p @h %d: node (%B) not referenced\n"
+#: e2fsck/problem.c:1215
+#. @-expanded: problem in HTREE directory inode %d: %B not referenced\n
+msgid "@p @h %d: %B not referenced\n"
msgstr ""
-#: e2fsck/problem.c:1203
-#. @-expanded: problem in HTREE directory inode %d: node (%B) referenced twice\n
-msgid "@p @h %d: node (%B) referenced twice\n"
+#: e2fsck/problem.c:1220
+#. @-expanded: problem in HTREE directory inode %d: %B referenced twice\n
+msgid "@p @h %d: %B referenced twice\n"
msgstr ""
-#: e2fsck/problem.c:1208
-#. @-expanded: problem in HTREE directory inode %d: node (%B) has bad min hash\n
-msgid "@p @h %d: node (%B) has bad min hash\n"
+#: e2fsck/problem.c:1225
+#. @-expanded: problem in HTREE directory inode %d: %B has bad min hash\n
+msgid "@p @h %d: %B has bad min hash\n"
msgstr ""
-#: e2fsck/problem.c:1213
-#. @-expanded: problem in HTREE directory inode %d: node (%B) has bad max hash\n
-msgid "@p @h %d: node (%B) has bad max hash\n"
+#: e2fsck/problem.c:1230
+#. @-expanded: problem in HTREE directory inode %d: %B has bad max hash\n
+msgid "@p @h %d: %B has bad max hash\n"
msgstr ""
-#: e2fsck/problem.c:1218
+#: e2fsck/problem.c:1235
#. @-expanded: invalid HTREE directory inode %d (%q).
msgid "@n @h %d (%q). "
msgstr ""
-#: e2fsck/problem.c:1222
+#: e2fsck/problem.c:1239
#. @-expanded: problem in HTREE directory inode %d (%q): bad block number %b.\n
msgid "@p @h %d (%q): bad @b number %b.\n"
msgstr ""
-#: e2fsck/problem.c:1232
+#: e2fsck/problem.c:1249
#, c-format
#. @-expanded: problem in HTREE directory inode %d: root node is invalid\n
msgid "@p @h %d: root node is @n\n"
msgstr ""
-#: e2fsck/problem.c:1237
-#. @-expanded: problem in HTREE directory inode %d: node (%B) has invalid limit (%N)\n
-msgid "@p @h %d: node (%B) has @n limit (%N)\n"
+#: e2fsck/problem.c:1254
+#. @-expanded: problem in HTREE directory inode %d: %B has invalid limit (%N)\n
+msgid "@p @h %d: %B has @n limit (%N)\n"
msgstr ""
-#: e2fsck/problem.c:1242
-#. @-expanded: problem in HTREE directory inode %d: node (%B) has invalid count (%N)\n
-msgid "@p @h %d: node (%B) has @n count (%N)\n"
+#: e2fsck/problem.c:1259
+#. @-expanded: problem in HTREE directory inode %d: %B has invalid count (%N)\n
+msgid "@p @h %d: %B has @n count (%N)\n"
msgstr ""
-#: e2fsck/problem.c:1247
-#. @-expanded: problem in HTREE directory inode %d: node (%B) has an unordered hash table\n
-msgid "@p @h %d: node (%B) has an unordered hash table\n"
+#: e2fsck/problem.c:1264
+#. @-expanded: problem in HTREE directory inode %d: %B has an unordered hash table\n
+msgid "@p @h %d: %B has an unordered hash table\n"
msgstr ""
-#: e2fsck/problem.c:1252
-#. @-expanded: problem in HTREE directory inode %d: node (%B) has invalid depth (%N)\n
-msgid "@p @h %d: node (%B) has @n depth (%N)\n"
+#: e2fsck/problem.c:1269
+#. @-expanded: problem in HTREE directory inode %d: %B has invalid depth (%N)\n
+msgid "@p @h %d: %B has @n depth (%N)\n"
msgstr ""
-#: e2fsck/problem.c:1257
+#: e2fsck/problem.c:1274
#. @-expanded: Duplicate entry '%Dn' in %p (%i) found.
msgid "Duplicate @E found. "
msgstr ""
-#: e2fsck/problem.c:1262
+#: e2fsck/problem.c:1279
#, no-c-format
#. @-expanded: entry '%Dn' in %p (%i) has a non-unique filename.\n
#. @-expanded: Rename to %s
@@ -1990,7 +2040,7 @@ msgid ""
"Rename to %s"
msgstr ""
-#: e2fsck/problem.c:1267
+#: e2fsck/problem.c:1284
#. @-expanded: Duplicate entry '%Dn' found.\n
#. @-expanded: \tMarking %p (%i) to be rebuilt.\n
#. @-expanded: \n
@@ -2000,115 +2050,115 @@ msgid ""
"\n"
msgstr ""
-#: e2fsck/problem.c:1272
+#: e2fsck/problem.c:1289
#. @-expanded: i_blocks_hi for inode %i (%Q) is %N, should be zero.\n
msgid "i_blocks_hi @F %N, @s zero.\n"
msgstr ""
-#: e2fsck/problem.c:1277
+#: e2fsck/problem.c:1294
#. @-expanded: Unexpected block in HTREE directory inode %d (%q).\n
msgid "Unexpected @b in @h %d (%q).\n"
msgstr ""
-#: e2fsck/problem.c:1281
+#: e2fsck/problem.c:1298
#. @-expanded: entry '%Dn' in %p (%i) references inode %Di in group %g where _INODE_UNINIT is set.\n
msgid "@E references @i %Di in @g %g where _INODE_UNINIT is set.\n"
msgstr ""
-#: e2fsck/problem.c:1286
+#: e2fsck/problem.c:1303
#. @-expanded: entry '%Dn' in %p (%i) references inode %Di found in group %g's unused inodes area.\n
msgid "@E references @i %Di found in @g %g's unused inodes area.\n"
msgstr ""
-#: e2fsck/problem.c:1291
+#: e2fsck/problem.c:1308
#. @-expanded: i_file_acl_hi for inode %i (%Q) is %N, should be zero.\n
msgid "i_file_acl_hi @F %N, @s zero.\n"
msgstr ""
-#: e2fsck/problem.c:1298
+#: e2fsck/problem.c:1315
#. @-expanded: Pass 3: Checking directory connectivity\n
msgid "Pass 3: Checking @d connectivity\n"
msgstr ""
-#: e2fsck/problem.c:1303
+#: e2fsck/problem.c:1320
#. @-expanded: root inode not allocated.
msgid "@r not allocated. "
msgstr ""
-#: e2fsck/problem.c:1308
+#: e2fsck/problem.c:1325
#. @-expanded: No room in lost+found directory.
msgid "No room in @l @d. "
msgstr ""
-#: e2fsck/problem.c:1313
+#: e2fsck/problem.c:1330
#, c-format
#. @-expanded: Unconnected directory inode %i (%p)\n
msgid "Unconnected @d @i %i (%p)\n"
msgstr ""
-#: e2fsck/problem.c:1318
+#: e2fsck/problem.c:1335
#. @-expanded: /lost+found not found.
msgid "/@l not found. "
msgstr ""
-#: e2fsck/problem.c:1323
+#: e2fsck/problem.c:1340
#. @-expanded: '..' in %Q (%i) is %P (%j), should be %q (%d).\n
msgid "'..' in %Q (%i) is %P (%j), @s %q (%d).\n"
msgstr ""
-#: e2fsck/problem.c:1328
+#: e2fsck/problem.c:1345
#. @-expanded: Bad or non-existent /lost+found. Cannot reconnect.\n
msgid "Bad or non-existent /@l. Cannot reconnect.\n"
msgstr ""
-#: e2fsck/problem.c:1333
+#: e2fsck/problem.c:1350
#, c-format
#. @-expanded: Could not expand /lost+found: %m\n
msgid "Could not expand /@l: %m\n"
msgstr ""
-#: e2fsck/problem.c:1338
+#: e2fsck/problem.c:1355
#, c-format
msgid "Could not reconnect %i: %m\n"
msgstr ""
-#: e2fsck/problem.c:1343
+#: e2fsck/problem.c:1360
#, c-format
#. @-expanded: Error while trying to find /lost+found: %m\n
msgid "Error while trying to find /@l: %m\n"
msgstr ""
-#: e2fsck/problem.c:1348
+#: e2fsck/problem.c:1365
#, c-format
#. @-expanded: ext2fs_new_block: %m while trying to create /lost+found directory\n
msgid "ext2fs_new_ at b: %m while trying to create /@l @d\n"
msgstr ""
-#: e2fsck/problem.c:1353
+#: e2fsck/problem.c:1370
#, c-format
#. @-expanded: ext2fs_new_inode: %m while trying to create /lost+found directory\n
msgid "ext2fs_new_ at i: %m while trying to create /@l @d\n"
msgstr ""
-#: e2fsck/problem.c:1358
+#: e2fsck/problem.c:1375
#, c-format
#. @-expanded: ext2fs_new_dir_block: %m while creating new directory block\n
msgid "ext2fs_new_dir_ at b: %m while creating new @d @b\n"
msgstr ""
-#: e2fsck/problem.c:1363
+#: e2fsck/problem.c:1380
#, c-format
#. @-expanded: ext2fs_write_dir_block: %m while writing the directory block for /lost+found\n
msgid "ext2fs_write_dir_ at b: %m while writing the @d @b for /@l\n"
msgstr ""
-#: e2fsck/problem.c:1368
+#: e2fsck/problem.c:1385
#, c-format
#. @-expanded: Error while adjusting inode count on inode %i\n
msgid "Error while adjusting @i count on @i %i\n"
msgstr ""
-#: e2fsck/problem.c:1373
+#: e2fsck/problem.c:1390
#, c-format
#. @-expanded: Couldn't fix parent of inode %i: %m\n
#. @-expanded: \n
@@ -2117,7 +2167,7 @@ msgid ""
"\n"
msgstr ""
-#: e2fsck/problem.c:1378
+#: e2fsck/problem.c:1395
#, c-format
#. @-expanded: Couldn't fix parent of inode %i: Couldn't find parent directory entry\n
#. @-expanded: \n
@@ -2126,73 +2176,73 @@ msgid ""
"\n"
msgstr ""
-#: e2fsck/problem.c:1388
+#: e2fsck/problem.c:1405
#, c-format
#. @-expanded: Error creating root directory (%s): %m\n
msgid "Error creating root @d (%s): %m\n"
msgstr ""
-#: e2fsck/problem.c:1393
+#: e2fsck/problem.c:1410
#, c-format
#. @-expanded: Error creating /lost+found directory (%s): %m\n
msgid "Error creating /@l @d (%s): %m\n"
msgstr ""
-#: e2fsck/problem.c:1398
+#: e2fsck/problem.c:1415
#. @-expanded: root inode is not a directory; aborting.\n
msgid "@r is not a @d; aborting.\n"
msgstr ""
-#: e2fsck/problem.c:1403
+#: e2fsck/problem.c:1420
#. @-expanded: Cannot proceed without a root inode.\n
msgid "Cannot proceed without a @r.\n"
msgstr ""
-#: e2fsck/problem.c:1413
+#: e2fsck/problem.c:1430
#, c-format
#. @-expanded: /lost+found is not a directory (ino=%i)\n
msgid "/@l is not a @d (ino=%i)\n"
msgstr ""
-#: e2fsck/problem.c:1420
+#: e2fsck/problem.c:1437
msgid "Pass 3A: Optimizing directories\n"
msgstr ""
-#: e2fsck/problem.c:1425
+#: e2fsck/problem.c:1442
#, c-format
msgid "Failed to create dirs_to_hash iterator: %m\n"
msgstr ""
-#: e2fsck/problem.c:1430
+#: e2fsck/problem.c:1447
msgid "Failed to optimize directory %q (%d): %m\n"
msgstr ""
-#: e2fsck/problem.c:1435
+#: e2fsck/problem.c:1452
msgid "Optimizing directories: "
msgstr ""
-#: e2fsck/problem.c:1452
+#: e2fsck/problem.c:1469
msgid "Pass 4: Checking reference counts\n"
msgstr ""
-#: e2fsck/problem.c:1457
+#: e2fsck/problem.c:1474
#, c-format
#. @-expanded: unattached zero-length inode %i.
msgid "@u @z @i %i. "
msgstr ""
-#: e2fsck/problem.c:1462
+#: e2fsck/problem.c:1479
#, c-format
#. @-expanded: unattached inode %i\n
msgid "@u @i %i\n"
msgstr ""
-#: e2fsck/problem.c:1467
+#: e2fsck/problem.c:1484
#. @-expanded: inode %i ref count is %Il, should be %N.
msgid "@i %i ref count is %Il, @s %N. "
msgstr ""
-#: e2fsck/problem.c:1471
+#: e2fsck/problem.c:1488
#. @-expanded: WARNING: PROGRAMMING BUG IN E2FSCK!\n
#. @-expanded: \tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n
#. @-expanded: inode_link_info[%i] is %N, inode.i_links_count is %Il. They should be the same!\n
@@ -2202,57 +2252,57 @@ msgid ""
"@i_link_info[%i] is %N, @i.i_links_count is %Il. They @s the same!\n"
msgstr ""
-#: e2fsck/problem.c:1481
+#: e2fsck/problem.c:1498
#. @-expanded: Pass 5: Checking group summary information\n
msgid "Pass 5: Checking @g summary information\n"
msgstr ""
-#: e2fsck/problem.c:1486
+#: e2fsck/problem.c:1503
#. @-expanded: Padding at end of inode bitmap is not set.
msgid "Padding at end of @i @B is not set. "
msgstr ""
-#: e2fsck/problem.c:1491
+#: e2fsck/problem.c:1508
#. @-expanded: Padding at end of block bitmap is not set.
msgid "Padding at end of @b @B is not set. "
msgstr ""
-#: e2fsck/problem.c:1496
+#: e2fsck/problem.c:1513
#. @-expanded: block bitmap differences:
msgid "@b @B differences: "
msgstr ""
-#: e2fsck/problem.c:1516
+#: e2fsck/problem.c:1533
#. @-expanded: inode bitmap differences:
msgid "@i @B differences: "
msgstr ""
-#: e2fsck/problem.c:1536
+#: e2fsck/problem.c:1553
#. @-expanded: Free inodes count wrong for group #%g (%i, counted=%j).\n
msgid "Free @is count wrong for @g #%g (%i, counted=%j).\n"
msgstr ""
-#: e2fsck/problem.c:1541
+#: e2fsck/problem.c:1558
#. @-expanded: Directories count wrong for group #%g (%i, counted=%j).\n
msgid "Directories count wrong for @g #%g (%i, counted=%j).\n"
msgstr ""
-#: e2fsck/problem.c:1546
+#: e2fsck/problem.c:1563
#. @-expanded: Free inodes count wrong (%i, counted=%j).\n
msgid "Free @is count wrong (%i, counted=%j).\n"
msgstr ""
-#: e2fsck/problem.c:1551
+#: e2fsck/problem.c:1568
#. @-expanded: Free blocks count wrong for group #%g (%b, counted=%c).\n
msgid "Free @bs count wrong for @g #%g (%b, counted=%c).\n"
msgstr ""
-#: e2fsck/problem.c:1556
+#: e2fsck/problem.c:1573
#. @-expanded: Free blocks count wrong (%b, counted=%c).\n
msgid "Free @bs count wrong (%b, counted=%c).\n"
msgstr ""
-#: e2fsck/problem.c:1561
+#: e2fsck/problem.c:1578
#. @-expanded: PROGRAMMING ERROR: filesystem (#%N) bitmap endpoints (%b, %c) don't match calculated bitmap
#. @-expanded: endpoints (%i, %j)\n
msgid ""
@@ -2260,45 +2310,45 @@ msgid ""
"endpoints (%i, %j)\n"
msgstr ""
-#: e2fsck/problem.c:1567
+#: e2fsck/problem.c:1584
msgid "Internal error: fudging end of bitmap (%N)\n"
msgstr ""
-#: e2fsck/problem.c:1572
+#: e2fsck/problem.c:1589
#, c-format
#. @-expanded: Error copying in replacement inode bitmap: %m\n
msgid "Error copying in replacement @i @B: %m\n"
msgstr ""
-#: e2fsck/problem.c:1577
+#: e2fsck/problem.c:1594
#, c-format
#. @-expanded: Error copying in replacement block bitmap: %m\n
msgid "Error copying in replacement @b @B: %m\n"
msgstr ""
-#: e2fsck/problem.c:1602
+#: e2fsck/problem.c:1619
#, c-format
#. @-expanded: group %g block(s) in use but group is marked BLOCK_UNINIT\n
msgid "@g %g @b(s) in use but @g is marked BLOCK_UNINIT\n"
msgstr ""
-#: e2fsck/problem.c:1607
+#: e2fsck/problem.c:1624
#, c-format
#. @-expanded: group %g inode(s) in use but group is marked INODE_UNINIT\n
msgid "@g %g @i(s) in use but @g is marked INODE_UNINIT\n"
msgstr ""
-#: e2fsck/problem.c:1614
+#: e2fsck/problem.c:1631
#. @-expanded: Recreate journal
msgid "Recreate @j"
msgstr ""
-#: e2fsck/problem.c:1732
+#: e2fsck/problem.c:1750
#, c-format
msgid "Unhandled error code (0x%x)!\n"
msgstr ""
-#: e2fsck/problem.c:1827
+#: e2fsck/problem.c:1854
msgid "IGNORED"
msgstr ""
@@ -2386,7 +2436,7 @@ msgstr ""
msgid " Extent depth histogram: "
msgstr ""
-#: e2fsck/unix.c:207 misc/badblocks.c:916 misc/tune2fs.c:1584 misc/util.c:151
+#: e2fsck/unix.c:207 misc/badblocks.c:928 misc/tune2fs.c:1625 misc/util.c:151
#: resize/main.c:249
#, c-format
msgid "while determining whether %s is mounted."
@@ -2520,19 +2570,19 @@ msgstr ""
msgid "Unable to resolve '%s'"
msgstr ""
-#: e2fsck/unix.c:831
+#: e2fsck/unix.c:830
#, c-format
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
msgstr ""
-#: e2fsck/unix.c:879
+#: e2fsck/unix.c:878
#, c-format
msgid ""
"E2FSCK_JBD_DEBUG \"%s\" not an integer\n"
"\n"
msgstr ""
-#: e2fsck/unix.c:888
+#: e2fsck/unix.c:887
#, c-format
msgid ""
"\n"
@@ -2540,43 +2590,43 @@ msgid ""
"\n"
msgstr ""
-#: e2fsck/unix.c:962
+#: e2fsck/unix.c:961
#, c-format
msgid "Error: ext2fs library version out of date!\n"
msgstr ""
-#: e2fsck/unix.c:970
+#: e2fsck/unix.c:969
msgid "while trying to initialize program"
msgstr ""
-#: e2fsck/unix.c:981
+#: e2fsck/unix.c:980
#, c-format
msgid "\tUsing %s, %s\n"
msgstr ""
-#: e2fsck/unix.c:993
+#: e2fsck/unix.c:992
msgid "need terminal for interactive repairs"
msgstr ""
-#: e2fsck/unix.c:1022
+#: e2fsck/unix.c:1025
#, c-format
msgid "%s: %s trying backup blocks...\n"
msgstr ""
-#: e2fsck/unix.c:1024
+#: e2fsck/unix.c:1027
msgid "Superblock invalid,"
msgstr ""
-#: e2fsck/unix.c:1025
+#: e2fsck/unix.c:1028
msgid "Group descriptors look bad..."
msgstr ""
-#: e2fsck/unix.c:1035
+#: e2fsck/unix.c:1038
#, c-format
msgid "%s: going back to original superblock\n"
msgstr ""
-#: e2fsck/unix.c:1061
+#: e2fsck/unix.c:1065
#, c-format
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
@@ -2584,142 +2634,142 @@ msgid ""
"\n"
msgstr ""
-#: e2fsck/unix.c:1067
+#: e2fsck/unix.c:1071
#, c-format
msgid "Could this be a zero-length partition?\n"
msgstr ""
-#: e2fsck/unix.c:1069
+#: e2fsck/unix.c:1073
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr ""
-#: e2fsck/unix.c:1074
+#: e2fsck/unix.c:1078
#, c-format
msgid "Possibly non-existent or swap device?\n"
msgstr ""
-#: e2fsck/unix.c:1076
+#: e2fsck/unix.c:1080
#, c-format
msgid "Filesystem mounted or opened exclusively by another program?\n"
msgstr ""
-#: e2fsck/unix.c:1080
+#: e2fsck/unix.c:1084
#, c-format
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
"check of the device.\n"
msgstr ""
-#: e2fsck/unix.c:1144
+#: e2fsck/unix.c:1148
msgid "Get a newer version of e2fsck!"
msgstr ""
-#: e2fsck/unix.c:1174
+#: e2fsck/unix.c:1178
#, c-format
msgid "while checking ext3 journal for %s"
msgstr ""
-#: e2fsck/unix.c:1185
+#: e2fsck/unix.c:1189
#, c-format
msgid ""
"Warning: skipping journal recovery because doing a read-only filesystem "
"check.\n"
msgstr ""
-#: e2fsck/unix.c:1198
+#: e2fsck/unix.c:1202
#, c-format
msgid "unable to set superblock flags on %s\n"
msgstr ""
-#: e2fsck/unix.c:1204
+#: e2fsck/unix.c:1208
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr ""
-#: e2fsck/unix.c:1229
+#: e2fsck/unix.c:1233
#, c-format
msgid "%s has unsupported feature(s):"
msgstr ""
-#: e2fsck/unix.c:1245
+#: e2fsck/unix.c:1249
msgid "Warning: compression support is experimental.\n"
msgstr ""
-#: e2fsck/unix.c:1250
+#: e2fsck/unix.c:1254
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
"\tbut filesystem %s has HTREE directories.\n"
msgstr ""
-#: e2fsck/unix.c:1303
+#: e2fsck/unix.c:1307
msgid "while reading bad blocks inode"
msgstr ""
-#: e2fsck/unix.c:1305
+#: e2fsck/unix.c:1309
#, c-format
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr ""
-#: e2fsck/unix.c:1331
+#: e2fsck/unix.c:1335
msgid "Couldn't determine journal size"
msgstr ""
-#: e2fsck/unix.c:1334
+#: e2fsck/unix.c:1338
#, c-format
msgid "Creating journal (%d blocks): "
msgstr ""
-#: e2fsck/unix.c:1341 misc/mke2fs.c:2113
+#: e2fsck/unix.c:1345 misc/mke2fs.c:2226
msgid ""
"\n"
"\twhile trying to create journal"
msgstr ""
-#: e2fsck/unix.c:1344
+#: e2fsck/unix.c:1348
#, c-format
msgid " Done.\n"
msgstr ""
-#: e2fsck/unix.c:1345
+#: e2fsck/unix.c:1349
#, c-format
msgid ""
"\n"
"*** journal has been re-created - filesystem is now ext3 again ***\n"
msgstr ""
-#: e2fsck/unix.c:1352
+#: e2fsck/unix.c:1356
#, c-format
msgid "Restarting e2fsck from the beginning...\n"
msgstr ""
-#: e2fsck/unix.c:1356
+#: e2fsck/unix.c:1360
msgid "while resetting context"
msgstr ""
-#: e2fsck/unix.c:1363
+#: e2fsck/unix.c:1367
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr ""
-#: e2fsck/unix.c:1368
+#: e2fsck/unix.c:1372
msgid "aborted"
msgstr ""
-#: e2fsck/unix.c:1380
+#: e2fsck/unix.c:1384
#, c-format
msgid ""
"\n"
"%s: ***** FILE SYSTEM WAS MODIFIED *****\n"
msgstr ""
-#: e2fsck/unix.c:1383
+#: e2fsck/unix.c:1387
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr ""
-#: e2fsck/unix.c:1391
+#: e2fsck/unix.c:1395
#, c-format
msgid ""
"\n"
@@ -2727,7 +2777,7 @@ msgid ""
"\n"
msgstr ""
-#: e2fsck/unix.c:1427
+#: e2fsck/unix.c:1431
msgid "while setting block group checksum info"
msgstr ""
@@ -2877,162 +2927,157 @@ msgstr ""
msgid "%6.2f%% done, %s elapsed"
msgstr ""
-#: misc/badblocks.c:289
+#: misc/badblocks.c:293
msgid "Testing with random pattern: "
msgstr ""
-#: misc/badblocks.c:307
+#: misc/badblocks.c:311
msgid "Testing with pattern 0x"
msgstr ""
-#: misc/badblocks.c:335 misc/badblocks.c:404
+#: misc/badblocks.c:339 misc/badblocks.c:408
msgid "during seek"
msgstr ""
-#: misc/badblocks.c:346
+#: misc/badblocks.c:350
#, c-format
msgid "Weird value (%ld) in do_read\n"
msgstr ""
-#: misc/badblocks.c:424
+#: misc/badblocks.c:428
msgid "during ext2fs_sync_device"
msgstr ""
-#: misc/badblocks.c:440 misc/badblocks.c:699
+#: misc/badblocks.c:447 misc/badblocks.c:711
msgid "while beginning bad block list iteration"
msgstr ""
-#: misc/badblocks.c:454 misc/badblocks.c:551 misc/badblocks.c:709
+#: misc/badblocks.c:461 misc/badblocks.c:563 misc/badblocks.c:721
msgid "while allocating buffers"
msgstr ""
-#: misc/badblocks.c:458
+#: misc/badblocks.c:465
#, c-format
msgid "Checking blocks %lu to %lu\n"
msgstr ""
-#: misc/badblocks.c:463
+#: misc/badblocks.c:470
msgid "Checking for bad blocks in read-only mode\n"
msgstr ""
-#: misc/badblocks.c:472
+#: misc/badblocks.c:479
msgid "Checking for bad blocks (read-only test): "
msgstr ""
-#: misc/badblocks.c:480 misc/badblocks.c:583 misc/badblocks.c:628
-#: misc/badblocks.c:772
+#: misc/badblocks.c:487 misc/badblocks.c:595 misc/badblocks.c:640
+#: misc/badblocks.c:784
msgid "Too many bad blocks, aborting test\n"
msgstr ""
-#: misc/badblocks.c:558
+#: misc/badblocks.c:570
msgid "Checking for bad blocks in read-write mode\n"
msgstr ""
-#: misc/badblocks.c:560 misc/badblocks.c:722
+#: misc/badblocks.c:572 misc/badblocks.c:734
#, c-format
msgid "From block %lu to %lu\n"
msgstr ""
-#: misc/badblocks.c:618
+#: misc/badblocks.c:630
msgid "Reading and comparing: "
msgstr ""
-#: misc/badblocks.c:721
+#: misc/badblocks.c:733
msgid "Checking for bad blocks in non-destructive read-write mode\n"
msgstr ""
-#: misc/badblocks.c:727
+#: misc/badblocks.c:739
msgid "Checking for bad blocks (non-destructive read-write test)\n"
msgstr ""
-#: misc/badblocks.c:734
+#: misc/badblocks.c:746
msgid ""
"\n"
"Interrupt caught, cleaning up\n"
msgstr ""
-#: misc/badblocks.c:810
+#: misc/badblocks.c:822
#, c-format
msgid "during test data write, block %lu"
msgstr ""
-#: misc/badblocks.c:921 misc/util.c:156
+#: misc/badblocks.c:933 misc/util.c:156
#, c-format
msgid "%s is mounted; "
msgstr ""
-#: misc/badblocks.c:923
+#: misc/badblocks.c:935
msgid "badblocks forced anyway. Hope /etc/mtab is incorrect.\n"
msgstr ""
-#: misc/badblocks.c:928
+#: misc/badblocks.c:940
msgid "it's not safe to run badblocks!\n"
msgstr ""
-#: misc/badblocks.c:933 misc/util.c:167
+#: misc/badblocks.c:945 misc/util.c:167
#, c-format
msgid "%s is apparently in use by the system; "
msgstr ""
-#: misc/badblocks.c:936
+#: misc/badblocks.c:948
msgid "badblocks forced anyway.\n"
msgstr ""
-#: misc/badblocks.c:956
+#: misc/badblocks.c:968
#, c-format
msgid "invalid %s - %s"
msgstr ""
-#: misc/badblocks.c:1015
-#, c-format
-msgid "bad block size - %s"
-msgstr ""
-
-#: misc/badblocks.c:1070
+#: misc/badblocks.c:1077
#, c-format
msgid "can't allocate memory for test_pattern - %s"
msgstr ""
-#: misc/badblocks.c:1097
+#: misc/badblocks.c:1104
msgid "Maximum of one test_pattern may be specified in read-only mode"
msgstr ""
-#: misc/badblocks.c:1103
+#: misc/badblocks.c:1110
msgid "Random test_pattern is not allowed in read-only mode"
msgstr ""
-#: misc/badblocks.c:1117
+#: misc/badblocks.c:1124
msgid ""
"Couldn't determine device size; you must specify\n"
"the size manually\n"
msgstr ""
-#: misc/badblocks.c:1123
+#: misc/badblocks.c:1130
msgid "while trying to determine device size"
msgstr ""
-#: misc/badblocks.c:1128
+#: misc/badblocks.c:1135
msgid "last block"
msgstr ""
-#: misc/badblocks.c:1134
+#: misc/badblocks.c:1141
msgid "first block"
msgstr ""
-#: misc/badblocks.c:1137
+#: misc/badblocks.c:1144
#, c-format
msgid "invalid starting block (%lu): must be less than %lu"
msgstr ""
-#: misc/badblocks.c:1193
+#: misc/badblocks.c:1200
msgid "while creating in-memory bad blocks list"
msgstr ""
-#: misc/badblocks.c:1208
+#: misc/badblocks.c:1215
msgid "while adding to in-memory bad block list"
msgstr ""
-#: misc/badblocks.c:1232
+#: misc/badblocks.c:1239
#, c-format
msgid "Pass completed, %u bad blocks found.\n"
msgstr ""
@@ -3047,7 +3092,7 @@ msgstr ""
msgid "bad version - %s\n"
msgstr ""
-#: misc/chattr.c:200 misc/lsattr.c:113
+#: misc/chattr.c:200 misc/lsattr.c:115
#, c-format
msgid "while trying to stat %s"
msgstr ""
@@ -3097,7 +3142,7 @@ msgstr ""
#: misc/dumpe2fs.c:53
#, c-format
-msgid "Usage: %s [-bfhixV] [-ob superblock] [-oB blocksize] device\n"
+msgid "Usage: %s [-bfhixV] [-o superblock=<num>] [-o blocksize=<num>] device\n"
msgstr ""
#: misc/dumpe2fs.c:168
@@ -3174,32 +3219,53 @@ msgstr ""
msgid " Free inodes: "
msgstr ""
-#: misc/dumpe2fs.c:264
+#: misc/dumpe2fs.c:268
msgid "while printing bad block list"
msgstr ""
-#: misc/dumpe2fs.c:270
+#: misc/dumpe2fs.c:274
#, c-format
msgid "Bad blocks: %u"
msgstr ""
-#: misc/dumpe2fs.c:292 misc/tune2fs.c:281
+#: misc/dumpe2fs.c:301 misc/tune2fs.c:281
msgid "while reading journal inode"
msgstr ""
-#: misc/dumpe2fs.c:295
+#: misc/dumpe2fs.c:307
+msgid "while opening journal inode"
+msgstr ""
+
+#: misc/dumpe2fs.c:313
+msgid "while reading journal super block"
+msgstr ""
+
+#: misc/dumpe2fs.c:323
+#, c-format
+msgid "Journal features: "
+msgstr ""
+
+#: misc/dumpe2fs.c:336
msgid "Journal size: "
msgstr ""
-#: misc/dumpe2fs.c:319 misc/tune2fs.c:202
+#: misc/dumpe2fs.c:347
+#, c-format
+msgid ""
+"Journal length: %u\n"
+"Journal sequence: 0x%08x\n"
+"Journal start: %u\n"
+msgstr ""
+
+#: misc/dumpe2fs.c:366 misc/tune2fs.c:202
msgid "while reading journal superblock"
msgstr ""
-#: misc/dumpe2fs.c:327
+#: misc/dumpe2fs.c:374
msgid "Couldn't find journal superblock magic numbers"
msgstr ""
-#: misc/dumpe2fs.c:331
+#: misc/dumpe2fs.c:378
#, c-format
msgid ""
"\n"
@@ -3211,27 +3277,27 @@ msgid ""
"Journal number of users: %u\n"
msgstr ""
-#: misc/dumpe2fs.c:344
+#: misc/dumpe2fs.c:391
#, c-format
msgid "Journal users: %s\n"
msgstr ""
-#: misc/dumpe2fs.c:360 misc/mke2fs.c:693 misc/tune2fs.c:872
+#: misc/dumpe2fs.c:407 misc/mke2fs.c:699 misc/tune2fs.c:872
#, c-format
msgid "Couldn't allocate memory to parse options!\n"
msgstr ""
-#: misc/dumpe2fs.c:386
+#: misc/dumpe2fs.c:433
#, c-format
msgid "Invalid superblock parameter: %s\n"
msgstr ""
-#: misc/dumpe2fs.c:401
+#: misc/dumpe2fs.c:448
#, c-format
msgid "Invalid blocksize parameter: %s\n"
msgstr ""
-#: misc/dumpe2fs.c:412
+#: misc/dumpe2fs.c:459
#, c-format
msgid ""
"\n"
@@ -3245,18 +3311,18 @@ msgid ""
"\tblocksize=<blocksize>\n"
msgstr ""
-#: misc/dumpe2fs.c:471 misc/mke2fs.c:1355
+#: misc/dumpe2fs.c:518 misc/mke2fs.c:1406
#, c-format
msgid "\tUsing %s\n"
msgstr ""
-#: misc/dumpe2fs.c:507 misc/e2image.c:674 misc/tune2fs.c:1535
+#: misc/dumpe2fs.c:554 misc/e2image.c:681 misc/tune2fs.c:1576
#: resize/main.c:312
#, c-format
msgid "Couldn't find valid filesystem superblock.\n"
msgstr ""
-#: misc/dumpe2fs.c:532
+#: misc/dumpe2fs.c:579
#, c-format
msgid ""
"\n"
@@ -3313,7 +3379,7 @@ msgstr ""
msgid "e2label: not an ext2 filesystem\n"
msgstr ""
-#: misc/e2label.c:96 misc/tune2fs.c:1670
+#: misc/e2label.c:96 misc/tune2fs.c:1711
#, c-format
msgid "Warning: label too long, truncating.\n"
msgstr ""
@@ -3342,7 +3408,7 @@ msgstr ""
msgid "Failed to read the file system data \n"
msgstr ""
-#: misc/e2undo.c:62 misc/e2undo.c:83 misc/e2undo.c:108 misc/e2undo.c:204
+#: misc/e2undo.c:62 misc/e2undo.c:83 misc/e2undo.c:108 misc/e2undo.c:205
#, c-format
msgid "Failed tdb_fetch %s\n"
msgstr ""
@@ -3356,31 +3422,31 @@ msgstr ""
msgid "The file system UUID didn't match \n"
msgstr ""
-#: misc/e2undo.c:161
+#: misc/e2undo.c:162
#, c-format
msgid "Failed tdb_open %s\n"
msgstr ""
-#: misc/e2undo.c:167
+#: misc/e2undo.c:168
#, c-format
msgid "Error while determining whether %s is mounted.\n"
msgstr ""
-#: misc/e2undo.c:173
+#: misc/e2undo.c:174
msgid "e2undo should only be run on unmounted file system\n"
msgstr ""
-#: misc/e2undo.c:182
+#: misc/e2undo.c:183
#, c-format
msgid "Failed to open %s\n"
msgstr ""
-#: misc/e2undo.c:208
+#: misc/e2undo.c:209
#, c-format
msgid "Replayed transaction of size %zd at location %ld\n"
msgstr ""
-#: misc/e2undo.c:214
+#: misc/e2undo.c:215
#, c-format
msgid "Failed write %s\n"
msgstr ""
@@ -3494,7 +3560,7 @@ msgstr ""
msgid "While reading version on %s"
msgstr ""
-#: misc/mke2fs.c:104
+#: misc/mke2fs.c:108
#, c-format
msgid ""
"Usage: %s [-c|-l filename] [-b block-size] [-f fragment-size]\n"
@@ -3503,38 +3569,38 @@ msgid ""
"\t[-m reserved-blocks-percentage] [-o creator-os]\n"
"\t[-g blocks-per-group] [-L volume-label] [-M last-mounted-directory]\n"
"\t[-O feature[,...]] [-r fs-revision] [-E extended-option[,...]]\n"
-"\t[-T fs-type] [-U UUID] [-jnqvFSV] device [blocks-count]\n"
+"\t[-T fs-type] [-U UUID] [-jnqvFKSV] device [blocks-count]\n"
msgstr ""
-#: misc/mke2fs.c:206
+#: misc/mke2fs.c:210
#, c-format
msgid "Running command: %s\n"
msgstr ""
-#: misc/mke2fs.c:210
+#: misc/mke2fs.c:214
#, c-format
msgid "while trying to run '%s'"
msgstr ""
-#: misc/mke2fs.c:217
+#: misc/mke2fs.c:221
msgid "while processing list of bad blocks from program"
msgstr ""
-#: misc/mke2fs.c:244
+#: misc/mke2fs.c:248
#, c-format
msgid "Block %d in primary superblock/group descriptor area bad.\n"
msgstr ""
-#: misc/mke2fs.c:246
+#: misc/mke2fs.c:250
#, c-format
msgid "Blocks %u through %u must be good in order to build a filesystem.\n"
msgstr ""
-#: misc/mke2fs.c:249
+#: misc/mke2fs.c:253
msgid "Aborting....\n"
msgstr ""
-#: misc/mke2fs.c:269
+#: misc/mke2fs.c:273
#, c-format
msgid ""
"Warning: the backup superblock/group descriptors at block %u contain\n"
@@ -3542,182 +3608,187 @@ msgid ""
"\n"
msgstr ""
-#: misc/mke2fs.c:288
+#: misc/mke2fs.c:292
msgid "while marking bad blocks as used"
msgstr ""
-#: misc/mke2fs.c:346
+#: misc/mke2fs.c:350
msgid "done \n"
msgstr ""
-#: misc/mke2fs.c:360
+#: misc/mke2fs.c:364
msgid "Writing inode tables: "
msgstr ""
-#: misc/mke2fs.c:383
+#: misc/mke2fs.c:387
#, c-format
msgid ""
"\n"
"Could not write %d blocks in inode table starting at %u: %s\n"
msgstr ""
-#: misc/mke2fs.c:407
+#: misc/mke2fs.c:411
msgid "while creating root dir"
msgstr ""
-#: misc/mke2fs.c:414
+#: misc/mke2fs.c:418
msgid "while reading root inode"
msgstr ""
-#: misc/mke2fs.c:428
+#: misc/mke2fs.c:432
msgid "while setting root inode ownership"
msgstr ""
-#: misc/mke2fs.c:446
+#: misc/mke2fs.c:450
msgid "while creating /lost+found"
msgstr ""
-#: misc/mke2fs.c:453
+#: misc/mke2fs.c:457
msgid "while looking up /lost+found"
msgstr ""
-#: misc/mke2fs.c:466
+#: misc/mke2fs.c:470
msgid "while expanding /lost+found"
msgstr ""
-#: misc/mke2fs.c:481
+#: misc/mke2fs.c:485
msgid "while setting bad block inode"
msgstr ""
-#: misc/mke2fs.c:508
+#: misc/mke2fs.c:512
#, c-format
msgid "Out of memory erasing sectors %d-%d\n"
msgstr ""
-#: misc/mke2fs.c:518
+#: misc/mke2fs.c:522
#, c-format
msgid "Warning: could not read block 0: %s\n"
msgstr ""
-#: misc/mke2fs.c:534
+#: misc/mke2fs.c:538
#, c-format
msgid "Warning: could not erase sector %d: %s\n"
msgstr ""
-#: misc/mke2fs.c:550
+#: misc/mke2fs.c:554
msgid "while initializing journal superblock"
msgstr ""
-#: misc/mke2fs.c:556
+#: misc/mke2fs.c:560
msgid "Zeroing journal device: "
msgstr ""
-#: misc/mke2fs.c:569
+#: misc/mke2fs.c:573
#, c-format
msgid "while zeroing journal device (block %u, count %d)"
msgstr ""
-#: misc/mke2fs.c:585
+#: misc/mke2fs.c:589
msgid "while writing journal superblock"
msgstr ""
-#: misc/mke2fs.c:601
+#: misc/mke2fs.c:605
#, c-format
msgid ""
"warning: %u blocks unused.\n"
"\n"
msgstr ""
-#: misc/mke2fs.c:606
+#: misc/mke2fs.c:610
#, c-format
msgid "Filesystem label=%s\n"
msgstr ""
-#: misc/mke2fs.c:607
+#: misc/mke2fs.c:611
msgid "OS type: "
msgstr ""
-#: misc/mke2fs.c:612
+#: misc/mke2fs.c:616
#, c-format
msgid "Block size=%u (log=%u)\n"
msgstr ""
-#: misc/mke2fs.c:614
+#: misc/mke2fs.c:618
#, c-format
msgid "Fragment size=%u (log=%u)\n"
msgstr ""
-#: misc/mke2fs.c:616
+#: misc/mke2fs.c:620
+#, c-format
+msgid "Stride=%u blocks, Stripe width=%u blocks\n"
+msgstr ""
+
+#: misc/mke2fs.c:622
#, c-format
msgid "%u inodes, %u blocks\n"
msgstr ""
-#: misc/mke2fs.c:618
+#: misc/mke2fs.c:624
#, c-format
msgid "%u blocks (%2.2f%%) reserved for the super user\n"
msgstr ""
-#: misc/mke2fs.c:621
+#: misc/mke2fs.c:627
#, c-format
msgid "First data block=%u\n"
msgstr ""
-#: misc/mke2fs.c:623
+#: misc/mke2fs.c:629
#, c-format
msgid "Maximum filesystem blocks=%lu\n"
msgstr ""
-#: misc/mke2fs.c:627
+#: misc/mke2fs.c:633
#, c-format
msgid "%u block groups\n"
msgstr ""
-#: misc/mke2fs.c:629
+#: misc/mke2fs.c:635
#, c-format
msgid "%u block group\n"
msgstr ""
-#: misc/mke2fs.c:630
+#: misc/mke2fs.c:636
#, c-format
msgid "%u blocks per group, %u fragments per group\n"
msgstr ""
-#: misc/mke2fs.c:632
+#: misc/mke2fs.c:638
#, c-format
msgid "%u inodes per group\n"
msgstr ""
-#: misc/mke2fs.c:639
+#: misc/mke2fs.c:645
#, c-format
msgid "Superblock backups stored on blocks: "
msgstr ""
-#: misc/mke2fs.c:718
+#: misc/mke2fs.c:724
#, c-format
msgid "Invalid stride parameter: %s\n"
msgstr ""
-#: misc/mke2fs.c:733
+#: misc/mke2fs.c:739
#, c-format
msgid "Invalid stripe-width parameter: %s\n"
msgstr ""
-#: misc/mke2fs.c:755
+#: misc/mke2fs.c:761
#, c-format
msgid "Invalid resize parameter: %s\n"
msgstr ""
-#: misc/mke2fs.c:762
+#: misc/mke2fs.c:768
#, c-format
msgid "The resize maximum must be greater than the filesystem size.\n"
msgstr ""
-#: misc/mke2fs.c:786
+#: misc/mke2fs.c:792
#, c-format
msgid "On-line resizing not supported with revision 0 filesystems\n"
msgstr ""
-#: misc/mke2fs.c:808
+#: misc/mke2fs.c:814
#, c-format
msgid ""
"\n"
@@ -3735,7 +3806,7 @@ msgid ""
"\n"
msgstr ""
-#: misc/mke2fs.c:824
+#: misc/mke2fs.c:830
#, c-format
msgid ""
"\n"
@@ -3743,150 +3814,150 @@ msgid ""
"\n"
msgstr ""
-#: misc/mke2fs.c:856
+#: misc/mke2fs.c:862
#, c-format
msgid ""
"Syntax error in mke2fs config file (%s, line #%d)\n"
"\t%s\n"
msgstr ""
-#: misc/mke2fs.c:869 misc/tune2fs.c:355
+#: misc/mke2fs.c:875 misc/tune2fs.c:355
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr ""
-#: misc/mke2fs.c:979
+#: misc/mke2fs.c:985
#, c-format
msgid ""
"\n"
"Warning! Your mke2fs.conf file does not define the %s filesystem type.\n"
msgstr ""
-#: misc/mke2fs.c:982
+#: misc/mke2fs.c:988
#, c-format
msgid ""
"You probably need to install an updated mke2fs.conf file.\n"
"\n"
msgstr ""
-#: misc/mke2fs.c:1176
+#: misc/mke2fs.c:1224
#, c-format
msgid "invalid block size - %s"
msgstr ""
-#: misc/mke2fs.c:1180
+#: misc/mke2fs.c:1228
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr ""
-#: misc/mke2fs.c:1196
+#: misc/mke2fs.c:1244
#, c-format
msgid "invalid fragment size - %s"
msgstr ""
-#: misc/mke2fs.c:1202
+#: misc/mke2fs.c:1250
#, c-format
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr ""
-#: misc/mke2fs.c:1209
+#: misc/mke2fs.c:1257
msgid "Illegal number for blocks per group"
msgstr ""
-#: misc/mke2fs.c:1214
+#: misc/mke2fs.c:1262
msgid "blocks per group must be multiple of 8"
msgstr ""
-#: misc/mke2fs.c:1222
+#: misc/mke2fs.c:1270
msgid "Illegal number for flex_bg size"
msgstr ""
-#: misc/mke2fs.c:1228
+#: misc/mke2fs.c:1276
msgid "flex_bg size must be a power of 2"
msgstr ""
-#: misc/mke2fs.c:1238
+#: misc/mke2fs.c:1286
#, c-format
msgid "invalid inode ratio %s (min %d/max %d)"
msgstr ""
-#: misc/mke2fs.c:1255
+#: misc/mke2fs.c:1306
msgid "in malloc for bad_blocks_filename"
msgstr ""
-#: misc/mke2fs.c:1265
+#: misc/mke2fs.c:1316
#, c-format
msgid "invalid reserved blocks percent - %s"
msgstr ""
-#: misc/mke2fs.c:1283
+#: misc/mke2fs.c:1334
#, c-format
msgid "bad revision level - %s"
msgstr ""
-#: misc/mke2fs.c:1295
+#: misc/mke2fs.c:1346
#, c-format
msgid "invalid inode size - %s"
msgstr ""
-#: misc/mke2fs.c:1315
+#: misc/mke2fs.c:1366
#, c-format
msgid "bad num inodes - %s"
msgstr ""
-#: misc/mke2fs.c:1380 misc/mke2fs.c:2068
+#: misc/mke2fs.c:1431 misc/mke2fs.c:2181
#, c-format
msgid "while trying to open journal device %s\n"
msgstr ""
-#: misc/mke2fs.c:1386
+#: misc/mke2fs.c:1437
#, c-format
msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n"
msgstr ""
-#: misc/mke2fs.c:1392
+#: misc/mke2fs.c:1443
#, c-format
msgid "Using journal device's blocksize: %d\n"
msgstr ""
-#: misc/mke2fs.c:1401
+#: misc/mke2fs.c:1452
#, c-format
msgid "%d-byte blocks too big for system (max %d)"
msgstr ""
-#: misc/mke2fs.c:1405
+#: misc/mke2fs.c:1456
#, c-format
msgid ""
"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
msgstr ""
-#: misc/mke2fs.c:1413
+#: misc/mke2fs.c:1464
#, c-format
msgid "invalid blocks count - %s"
msgstr ""
-#: misc/mke2fs.c:1423
+#: misc/mke2fs.c:1474
msgid "filesystem"
msgstr ""
-#: misc/mke2fs.c:1459
+#: misc/mke2fs.c:1510
#, c-format
msgid ""
"%s: Size of device %s too big to be expressed in 32 bits\n"
"\tusing a blocksize of %d.\n"
msgstr ""
-#: misc/mke2fs.c:1468 resize/main.c:374
+#: misc/mke2fs.c:1519 resize/main.c:374
msgid "while trying to determine filesystem size"
msgstr ""
-#: misc/mke2fs.c:1475
+#: misc/mke2fs.c:1526
msgid ""
"Couldn't determine device size; you must specify\n"
"the size of the filesystem\n"
msgstr ""
-#: misc/mke2fs.c:1482
+#: misc/mke2fs.c:1533
msgid ""
"Device size reported to be zero. Invalid partition specified, or\n"
"\tpartition table wasn't reread after running fdisk, due to\n"
@@ -3894,73 +3965,89 @@ msgid ""
"\tto re-read your partition table.\n"
msgstr ""
-#: misc/mke2fs.c:1500
+#: misc/mke2fs.c:1551
msgid "Filesystem larger than apparent device size."
msgstr ""
-#: misc/mke2fs.c:1506
+#: misc/mke2fs.c:1557
#, c-format
msgid "Failed to parse fs types list\n"
msgstr ""
-#: misc/mke2fs.c:1540
+#: misc/mke2fs.c:1591
msgid "fs_types for mke2fs.conf resolution: "
msgstr ""
-#: misc/mke2fs.c:1547
+#: misc/mke2fs.c:1598
#, c-format
msgid "Filesystem features not supported with revision 0 filesystems\n"
msgstr ""
-#: misc/mke2fs.c:1554
+#: misc/mke2fs.c:1605
#, c-format
msgid "Sparse superblocks not supported with revision 0 filesystems\n"
msgstr ""
-#: misc/mke2fs.c:1566
+#: misc/mke2fs.c:1617
#, c-format
msgid "Journals not supported with revision 0 filesystems\n"
msgstr ""
-#: misc/mke2fs.c:1584
+#: misc/mke2fs.c:1635
#, c-format
msgid ""
"The resize_inode and meta_bg features are not compatible.\n"
"They can not be both enabled simultaneously.\n"
msgstr ""
-#: misc/mke2fs.c:1601
+#: misc/mke2fs.c:1652
msgid "while trying to determine hardware sector size"
msgstr ""
-#: misc/mke2fs.c:1658
+#: misc/mke2fs.c:1690
+#, c-format
+msgid "warning: Unable to get device geometry for %s\n"
+msgstr ""
+
+#: misc/mke2fs.c:1693
+#, c-format
+msgid "%s alignment is offset by %lu bytes.\n"
+msgstr ""
+
+#: misc/mke2fs.c:1695
+#, c-format
+msgid ""
+"This may result in very poor performance, (re)-partitioning suggested.\n"
+msgstr ""
+
+#: misc/mke2fs.c:1724
msgid "reserved online resize blocks not supported on non-sparse filesystem"
msgstr ""
-#: misc/mke2fs.c:1667
+#: misc/mke2fs.c:1733
msgid "blocks per group count out of range"
msgstr ""
-#: misc/mke2fs.c:1682
+#: misc/mke2fs.c:1748
msgid "Flex_bg feature not enabled, so flex_bg size may not be specified"
msgstr ""
-#: misc/mke2fs.c:1694
+#: misc/mke2fs.c:1760
#, c-format
msgid "invalid inode size %d (min %d/max %d)"
msgstr ""
-#: misc/mke2fs.c:1708
+#: misc/mke2fs.c:1774
#, c-format
msgid "too many inodes (%llu), raise inode ratio?"
msgstr ""
-#: misc/mke2fs.c:1713
+#: misc/mke2fs.c:1779
#, c-format
msgid "too many inodes (%llu), specify < 2^32 inodes"
msgstr ""
-#: misc/mke2fs.c:1728
+#: misc/mke2fs.c:1794
#, c-format
msgid ""
"inode_size (%u) * inodes_count (%u) too big for a\n"
@@ -3968,16 +4055,16 @@ msgid ""
"\tor lower inode count (-N).\n"
msgstr ""
-#: misc/mke2fs.c:1821 misc/tune2fs.c:1453
+#: misc/mke2fs.c:1887 misc/tune2fs.c:1494
msgid "Couldn't allocate memory for tdb filename\n"
msgstr ""
-#: misc/mke2fs.c:1834 misc/tune2fs.c:1475
+#: misc/mke2fs.c:1900 misc/tune2fs.c:1516
#, c-format
msgid "while trying to delete %s"
msgstr ""
-#: misc/mke2fs.c:1844
+#: misc/mke2fs.c:1910
#, c-format
msgid ""
"Overwriting existing filesystem; this can be undone using the command:\n"
@@ -3985,72 +4072,87 @@ msgid ""
"\n"
msgstr ""
-#: misc/mke2fs.c:1893
-msgid "while setting up superblock"
+#: misc/mke2fs.c:1947
+#, c-format
+msgid "Calling BLKDISCARD from %llu to %llu "
+msgstr ""
+
+#: misc/mke2fs.c:1950
+#, c-format
+msgid "failed.\n"
msgstr ""
#: misc/mke2fs.c:1952
#, c-format
+msgid "succeeded.\n"
+msgstr ""
+
+#: misc/mke2fs.c:2001
+msgid "while setting up superblock"
+msgstr ""
+
+#: misc/mke2fs.c:2065
+#, c-format
msgid "unknown os - %s"
msgstr ""
-#: misc/mke2fs.c:2006
+#: misc/mke2fs.c:2119
msgid "while trying to allocate filesystem tables"
msgstr ""
-#: misc/mke2fs.c:2037
+#: misc/mke2fs.c:2150
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr ""
-#: misc/mke2fs.c:2050
+#: misc/mke2fs.c:2163
msgid "while reserving blocks for online resize"
msgstr ""
-#: misc/mke2fs.c:2061 misc/tune2fs.c:479
+#: misc/mke2fs.c:2174 misc/tune2fs.c:479
msgid "journal"
msgstr ""
-#: misc/mke2fs.c:2073
+#: misc/mke2fs.c:2186
#, c-format
msgid "Adding journal to device %s: "
msgstr ""
-#: misc/mke2fs.c:2080
+#: misc/mke2fs.c:2193
#, c-format
msgid ""
"\n"
"\twhile trying to add journal to device %s"
msgstr ""
-#: misc/mke2fs.c:2085 misc/mke2fs.c:2117 misc/tune2fs.c:508 misc/tune2fs.c:522
+#: misc/mke2fs.c:2198 misc/mke2fs.c:2230 misc/tune2fs.c:508 misc/tune2fs.c:522
#, c-format
msgid "done\n"
msgstr ""
-#: misc/mke2fs.c:2094
+#: misc/mke2fs.c:2207
#, c-format
msgid "Skipping journal creation in super-only mode\n"
msgstr ""
-#: misc/mke2fs.c:2105
+#: misc/mke2fs.c:2218
#, c-format
msgid "Creating journal (%u blocks): "
msgstr ""
-#: misc/mke2fs.c:2122
+#: misc/mke2fs.c:2235
#, c-format
msgid "Writing superblocks and filesystem accounting information: "
msgstr ""
-#: misc/mke2fs.c:2127
+#: misc/mke2fs.c:2240
#, c-format
msgid ""
"\n"
"Warning, had trouble writing out superblocks."
msgstr ""
-#: misc/mke2fs.c:2130
+#: misc/mke2fs.c:2243
#, c-format
msgid ""
"done\n"
@@ -4315,11 +4417,29 @@ msgid ""
"\t^test_fs\n"
msgstr ""
-#: misc/tune2fs.c:1388 misc/tune2fs.c:1393 resize/resize2fs.c:776
+#: misc/tune2fs.c:1421 resize/resize2fs.c:790
msgid "blocks to be moved"
msgstr ""
-#: misc/tune2fs.c:1485
+#: misc/tune2fs.c:1424
+msgid "Failed to allocate block bitmap when increasing inode size\n"
+msgstr ""
+
+#: misc/tune2fs.c:1430
+msgid "Not enough space to increase inode size \n"
+msgstr ""
+
+#: misc/tune2fs.c:1435
+msgid "Failed to relocate blocks during inode resize \n"
+msgstr ""
+
+#: misc/tune2fs.c:1467
+msgid ""
+"Error in resizing the inode size.\n"
+"Run e2undo to undo the file system changes. \n"
+msgstr ""
+
+#: misc/tune2fs.c:1526
#, c-format
msgid ""
"To undo the tune2fs operation please run the command\n"
@@ -4327,116 +4447,110 @@ msgid ""
"\n"
msgstr ""
-#: misc/tune2fs.c:1546
+#: misc/tune2fs.c:1587
#, c-format
msgid "The inode size is already %lu\n"
msgstr ""
-#: misc/tune2fs.c:1551
+#: misc/tune2fs.c:1592
#, c-format
msgid "Shrinking the inode size is not supported\n"
msgstr ""
-#: misc/tune2fs.c:1594
+#: misc/tune2fs.c:1635
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr ""
-#: misc/tune2fs.c:1600
+#: misc/tune2fs.c:1641
#, c-format
msgid "Setting current mount count to %d\n"
msgstr ""
-#: misc/tune2fs.c:1605
+#: misc/tune2fs.c:1646
#, c-format
msgid "Setting error behavior to %d\n"
msgstr ""
-#: misc/tune2fs.c:1610
+#: misc/tune2fs.c:1651
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr ""
-#: misc/tune2fs.c:1615
+#: misc/tune2fs.c:1656
#, c-format
msgid "Setting interval between checks to %lu seconds\n"
msgstr ""
-#: misc/tune2fs.c:1622
+#: misc/tune2fs.c:1663
#, c-format
msgid "Setting reserved blocks percentage to %g%% (%u blocks)\n"
msgstr ""
-#: misc/tune2fs.c:1629
+#: misc/tune2fs.c:1670
#, c-format
msgid "reserved blocks count is too big (%lu)"
msgstr ""
-#: misc/tune2fs.c:1635
+#: misc/tune2fs.c:1676
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr ""
-#: misc/tune2fs.c:1641
+#: misc/tune2fs.c:1682
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
msgstr ""
-#: misc/tune2fs.c:1648
+#: misc/tune2fs.c:1689
#, c-format
msgid ""
"\n"
"Sparse superblock flag set. %s"
msgstr ""
-#: misc/tune2fs.c:1653
+#: misc/tune2fs.c:1694
msgid ""
"\n"
"Clearing the sparse superflag not supported.\n"
msgstr ""
-#: misc/tune2fs.c:1660
+#: misc/tune2fs.c:1701
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr ""
-#: misc/tune2fs.c:1666
+#: misc/tune2fs.c:1707
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr ""
-#: misc/tune2fs.c:1717
+#: misc/tune2fs.c:1758
msgid "Invalid UUID format\n"
msgstr ""
-#: misc/tune2fs.c:1729
+#: misc/tune2fs.c:1770
msgid "The inode size may only be changed when the filesystem is unmounted.\n"
msgstr ""
-#: misc/tune2fs.c:1736
+#: misc/tune2fs.c:1777
msgid ""
"Changing the inode size not supported for filesystems with the flex_bg\n"
"feature enabled.\n"
msgstr ""
-#: misc/tune2fs.c:1748
-msgid ""
-"Error in resizing the inode size.\n"
-"Run e2undo to undo the file system changes. \n"
-msgstr ""
-
-#: misc/tune2fs.c:1752
+#: misc/tune2fs.c:1789
#, c-format
msgid "Setting inode size %lu\n"
msgstr ""
-#: misc/tune2fs.c:1762
+#: misc/tune2fs.c:1799
#, c-format
msgid "Setting stride size to %d\n"
msgstr ""
-#: misc/tune2fs.c:1767
+#: misc/tune2fs.c:1804
#, c-format
msgid "Setting stripe width to %d\n"
msgstr ""
@@ -4639,7 +4753,12 @@ msgid ""
"\n"
msgstr ""
-#: resize/main.c:455
+#: resize/main.c:448
+#, c-format
+msgid "Resizing the filesystem on %s to %u (%dk) blocks.\n"
+msgstr ""
+
+#: resize/main.c:457
#, c-format
msgid "while trying to resize %s"
msgstr ""
@@ -4647,11 +4766,18 @@ msgstr ""
#: resize/main.c:460
#, c-format
msgid ""
+"Please run 'e2fsck -fy %s' to fix the filesystem\n"
+"after the aborted resize operation.\n"
+msgstr ""
+
+#: resize/main.c:466
+#, c-format
+msgid ""
"The filesystem on %s is now %u blocks long.\n"
"\n"
msgstr ""
-#: resize/main.c:475
+#: resize/main.c:481
#, c-format
msgid "while trying to truncate %s"
msgstr ""
@@ -4708,20 +4834,20 @@ msgid ""
"this system.\n"
msgstr ""
-#: resize/resize2fs.c:336
+#: resize/resize2fs.c:350
#, c-format
msgid "inodes (%llu) must be less than %u"
msgstr ""
-#: resize/resize2fs.c:568
+#: resize/resize2fs.c:582
msgid "reserved blocks"
msgstr ""
-#: resize/resize2fs.c:781
+#: resize/resize2fs.c:795
msgid "meta-data blocks"
msgstr ""
-#: resize/resize2fs.c:1738
+#: resize/resize2fs.c:1752
#, c-format
msgid "Should never happen: resize inode corrupt!\n"
msgstr ""
diff --git a/po/fr.gmo b/po/fr.gmo
index 6f226e8..7bf06aa 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 3258b49..2473dc4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the e2fsprogs package.
# Copyright © 1996 Free Software Foundation, Inc.
# Michel Robitaille <robitail at IRO.UMontreal.CA>, traducteur depuis/since 1996.
-# Samuel Thibault <samuel.thibault at ens-lyon.org>, 2006-2008.
+# Samuel Thibault <samuel.thibault at ens-lyon.org>, 2006-2009.
#
#. The strings in e2fsck's problem.c can be very hard to translate,
#. since the strings are expanded in two different ways. First of all,
@@ -65,10 +65,10 @@
#.
msgid ""
msgstr ""
-"Project-Id-Version: GNU e2fsprogs 1.41.1\n"
+"Project-Id-Version: GNU e2fsprogs 1.41.8\n"
"Report-Msgid-Bugs-To: tytso at alum.mit.edu\n"
-"POT-Creation-Date: 2009-01-26 20:41-0500\n"
-"PO-Revision-Date: 2008-09-03 01:01+0200\n"
+"POT-Creation-Date: 2009-07-11 17:49-0400\n"
+"PO-Revision-Date: 2009-07-28 17:30:0200\n"
"Last-Translator: Samuel Thibault <samuel.thibault at ens-lyon.org>\n"
"Language-Team: French <traduc at traduc.org>\n"
"MIME-Version: 1.0\n"
@@ -90,10 +90,10 @@ msgid "while reading the bad blocks inode"
msgstr "lors de la lecture de l'i-noeud des blocs défectueux"
#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:1037 e2fsck/unix.c:1120 misc/badblocks.c:1148
-#: misc/badblocks.c:1156 misc/badblocks.c:1170 misc/badblocks.c:1182
-#: misc/dumpe2fs.c:505 misc/e2image.c:576 misc/e2image.c:672
-#: misc/e2image.c:688 misc/mke2fs.c:181 misc/tune2fs.c:1515 resize/main.c:309
+#: e2fsck/unix.c:1057 e2fsck/unix.c:1140 misc/badblocks.c:1155
+#: misc/badblocks.c:1163 misc/badblocks.c:1177 misc/badblocks.c:1189
+#: misc/dumpe2fs.c:510 misc/e2image.c:583 misc/e2image.c:679
+#: misc/e2image.c:695 misc/mke2fs.c:181 misc/tune2fs.c:1532 resize/main.c:310
#, c-format
msgid "while trying to open %s"
msgstr "lors de la tentative d'ouverture de %s"
@@ -105,8 +105,7 @@ msgstr "lors de la tentative d'ouverture via popen()
#: e2fsck/badblocks.c:93 misc/mke2fs.c:188
msgid "while reading in list of bad blocks from file"
-msgstr ""
-"lors de la lecture de la liste des blocs défectueux à partir du fichier"
+msgstr "lors de la lecture de la liste des blocs défectueux à partir du fichier"
#: e2fsck/badblocks.c:104
msgid "while updating bad block inode"
@@ -183,29 +182,28 @@ msgstr "Usage
#: e2fsck/flushb.c:63
#, c-format
msgid "BLKFLSBUF ioctl not supported! Can't flush buffers.\n"
-msgstr ""
-"L'ioctl BLKFLSBUF n'est pas supporté ! Impossible de vider les tampons.\n"
+msgstr "L'ioctl BLKFLSBUF n'est pas supporté ! Impossible de vider les tampons.\n"
#: e2fsck/iscan.c:46
#, c-format
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr "Usage : %s [-F] [-I nombre_blocs_du_tampon_d_i_noeud] périphérique\n"
-#: e2fsck/iscan.c:83 e2fsck/unix.c:818
+#: e2fsck/iscan.c:83 e2fsck/unix.c:817
#, c-format
msgid "while opening %s for flushing"
msgstr "lors de l'ouverture de %s pour la vidange"
-#: e2fsck/iscan.c:88 e2fsck/unix.c:824 resize/main.c:285
+#: e2fsck/iscan.c:88 e2fsck/unix.c:823 resize/main.c:286
#, c-format
msgid "while trying to flush %s"
msgstr "lors de la tentative de vidange de %s"
-#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:482
+#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:489
msgid "while opening inode scan"
msgstr "lors de l'ouverture de l'examen d'i-noeuds"
-#: e2fsck/iscan.c:129 misc/e2image.c:500
+#: e2fsck/iscan.c:129 misc/e2image.c:507
msgid "while getting next inode"
msgstr "lors de l'obtention de l'i-noeud suivant"
@@ -228,19 +226,19 @@ msgstr "%s
msgid "%s: journal too short\n"
msgstr "%s : journal trop court\n"
-#: e2fsck/journal.c:858
+#: e2fsck/journal.c:860
#, c-format
msgid "%s: recovering journal\n"
msgstr "%s : récupération du journal\n"
-#: e2fsck/journal.c:860
+#: e2fsck/journal.c:862
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
msgstr ""
"%s : aucune récupération du journal n'est possible tant qu'il est en\n"
"lecture seule\n"
-#: e2fsck/journal.c:881
+#: e2fsck/journal.c:887
#, c-format
msgid "while trying to re-open %s"
msgstr "lors de la tentative de ré-ouverture de %s"
@@ -445,32 +443,30 @@ msgstr "socket"
msgid "unknown file type with mode 0%o"
msgstr "type de fichier inconnu avec un mode 0%o"
-#: e2fsck/pass1b.c:215
+#: e2fsck/pass1b.c:220
msgid "multiply claimed inode map"
msgstr "carte des i-noeuds réclamés plusieurs fois"
-#: e2fsck/pass1b.c:567 e2fsck/pass1b.c:700
+#: e2fsck/pass1b.c:581 e2fsck/pass1b.c:714
#, c-format
msgid "internal error: can't find dup_blk for %u\n"
msgstr "erreur interne : ne peut trouver dup_blk pour %u\n"
-#: e2fsck/pass1b.c:743
+#: e2fsck/pass1b.c:757
msgid "returned from clone_file_block"
msgstr "retourné de clone_file_block"
-#: e2fsck/pass1b.c:762
+#: e2fsck/pass1b.c:776
#, c-format
msgid "internal error: couldn't lookup EA block record for %u"
-msgstr ""
-"erreur interne : impossible de trouver l'enregistrement de bloc EA pour %u"
+msgstr "erreur interne : impossible de trouver l'enregistrement de bloc EA pour %u"
-#: e2fsck/pass1b.c:774
+#: e2fsck/pass1b.c:788
#, c-format
msgid "internal error: couldn't lookup EA inode record for %u"
-msgstr ""
-"erreur interne : impossible de trouver l'enregistrement d'i-noeud EA pour %u"
+msgstr "erreur interne : impossible de trouver l'enregistrement d'i-noeud EA pour %u"
-#: e2fsck/pass1.c:430 e2fsck/pass2.c:780
+#: e2fsck/pass1.c:430 e2fsck/pass2.c:782
msgid "reading directory block"
msgstr "lecture des blocs de répertoire"
@@ -498,39 +494,39 @@ msgstr "l'ouverture de l'examen des i-noeuds"
msgid "getting next inode from scan"
msgstr "l'obtention de l'i-noeud suivant depuis l'examen"
-#: e2fsck/pass1.c:1122
+#: e2fsck/pass1.c:1123
msgid "Pass 1"
msgstr "Passe 1"
-#: e2fsck/pass1.c:1181
+#: e2fsck/pass1.c:1180
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr "lecture des blocs indirects de l'i-noeud %u"
-#: e2fsck/pass1.c:1225
+#: e2fsck/pass1.c:1224
msgid "bad inode map"
msgstr "carte des i-noeuds défectueux"
-#: e2fsck/pass1.c:1247
+#: e2fsck/pass1.c:1246
msgid "inode in bad block map"
msgstr "i-noeud dans la carte des blocs défectueux"
-#: e2fsck/pass1.c:1267
+#: e2fsck/pass1.c:1266
msgid "imagic inode map"
msgstr "carte d'i-noeuds magiques"
-#: e2fsck/pass1.c:1294
+#: e2fsck/pass1.c:1293
msgid "multiply claimed block map"
msgstr "carte des blocs réclamés plusieurs fois"
-#: e2fsck/pass1.c:1393
+#: e2fsck/pass1.c:1392
msgid "ext attr block map"
msgstr "carte des blocs d'attributs étendus"
#: e2fsck/pass1.c:2134
-#, fuzzy, c-format
+#, c-format
msgid "%6lu(%c): expecting %6lu got phys %6lu (blkcnt %lld)\n"
-msgstr "%6lu: %6lu attendu, obtenu phys %6lu (blkcnt %lld)\n"
+msgstr "%6lu(%c): %6lu attendu, obtenu phys %6lu (blkcnt %lld)\n"
#: e2fsck/pass1.c:2449
msgid "block bitmap"
@@ -544,35 +540,35 @@ msgstr "bitmap d'i-noeuds"
msgid "inode table"
msgstr "table d'i-noeuds"
-#: e2fsck/pass2.c:284
+#: e2fsck/pass2.c:283
msgid "Pass 2"
msgstr "Passe 2"
-#: e2fsck/pass2.c:803
+#: e2fsck/pass2.c:805
msgid "Can not continue."
msgstr "Ne peut continuer."
-#: e2fsck/pass3.c:79
+#: e2fsck/pass3.c:76
msgid "inode done bitmap"
msgstr "bitmap d'i-noeuds complétés"
-#: e2fsck/pass3.c:90
+#: e2fsck/pass3.c:84
msgid "Peak memory"
msgstr "Pointe mémoire"
-#: e2fsck/pass3.c:146
+#: e2fsck/pass3.c:134
msgid "Pass 3"
msgstr "Passe 3"
-#: e2fsck/pass3.c:334
+#: e2fsck/pass3.c:320
msgid "inode loop detection bitmap"
msgstr "bitmap de détection des boucles d'i-noeuds"
-#: e2fsck/pass4.c:196
+#: e2fsck/pass4.c:191
msgid "Pass 4"
msgstr "Passe 4"
-#: e2fsck/pass5.c:70
+#: e2fsck/pass5.c:64
msgid "Pass 5"
msgstr "Passe 5"
@@ -870,9 +866,9 @@ msgstr "Le Hurd ne supporte pas la fonctionnalit
#. @-expanded: superblock has an invalid journal (inode %i).\n
#: e2fsck/problem.c:187
-#, fuzzy, c-format
+#, c-format
msgid "@S has an @n @j (@i %i).\n"
-msgstr "le @S a un @j ext3 @n (@i %i).\n"
+msgstr "le @S a un @j @n (@i %i).\n"
#. @-expanded: External journal has multiple filesystem users (unsupported).\n
#: e2fsck/problem.c:192
@@ -899,119 +895,92 @@ msgstr "Le @j externe ne supporte pas ce @f\n"
#. @-expanded: format.\n
#. @-expanded: It is also possible the journal superblock is corrupt.\n
#: e2fsck/problem.c:212
-#, fuzzy
msgid ""
"@f @j @S is unknown type %N (unsupported).\n"
-"It is likely that your copy of e2fsck is old and/or doesn't support this @j "
-"format.\n"
+"It is likely that your copy of e2fsck is old and/or doesn't support this @j format.\n"
"It is also possible the @j @S is corrupt.\n"
msgstr ""
-"Le @S du @j Ext3 est de type inconnu %N (non supporté).\n"
+"Le @S du @j est de type inconnu %N (non supporté).\n"
"Il semble que votre copie d'e2fsck soit un peu vieillotte et/ou ne supporte\n"
"pas ce format de @j.\n"
"Il est aussi possible que le @S du @j soit corrompu.\n"
#. @-expanded: journal superblock is corrupt.\n
#: e2fsck/problem.c:220
-#, fuzzy
msgid "@j @S is corrupt.\n"
-msgstr "Le @S du @j Ext3 est corrompu.\n"
+msgstr "Le @S du @j est corrompu.\n"
#. @-expanded: superblock has_journal flag is clear, but a journal %s is present.\n
#: e2fsck/problem.c:225
-#, fuzzy, c-format
+#, c-format
msgid "@S has_ at j flag is clear, but a @j %s is present.\n"
-msgstr ""
-"le drapeau ext3 recovery n'est pas activé, mais le @j contient des données.\n"
+msgstr "Le drapeau has_ at j du @S n'est pas activé, mais un @j %s est présent.\n"
#. @-expanded: superblock needs_recovery flag is set, but no journal is present.\n
#: e2fsck/problem.c:230
-#, fuzzy
msgid "@S needs_recovery flag is set, but no @j is present.\n"
-msgstr ""
-"Le @S a le drapeau ext3 needs_recovery activé, mais n'a pas de de @j.\n"
+msgstr "Le @S a le drapeau needs_recovery activé, mais n'a pas de de @j.\n"
#. @-expanded: superblock needs_recovery flag is clear, but journal has data.\n
#: e2fsck/problem.c:235
-#, fuzzy
msgid "@S needs_recovery flag is clear, but @j has data.\n"
-msgstr ""
-"le drapeau ext3 recovery n'est pas activé, mais le @j contient des données.\n"
+msgstr "le drapeau needs_recovery n'est pas activé, mais le @j contient des données.\n"
#. @-expanded: Clear journal
#: e2fsck/problem.c:240
msgid "Clear @j"
msgstr "Effacer le @j"
-#. @-expanded: Run journal anyway
-#: e2fsck/problem.c:245
-msgid "Run @j anyway"
-msgstr "Exécuter quand même le @j"
-
-#. @-expanded: Recovery flag not set in backup superblock, so running journal anyway.\n
-#: e2fsck/problem.c:250
-msgid "Recovery flag not set in backup @S, so running @j anyway.\n"
-msgstr ""
-"Le drapeau de récupération n'est pas activé dans le @S de secours, le @j "
-"sera donc quand même exécuté.\n"
+#. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem.
+#: e2fsck/problem.c:245 e2fsck/problem.c:647
+msgid "@f has feature flag(s) set, but is a revision 0 @f. "
+msgstr "le @f a des drapeaux de fonctionnalités activés mais est un @f de version 0. "
#. @-expanded: %s orphaned inode %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n
-#: e2fsck/problem.c:255
+#: e2fsck/problem.c:250
msgid "%s @o @i %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n"
msgstr "%s l'@i @o %i (uid=%Iu, gid=%Ig, mode=%Im, taille=%Is)\n"
#. @-expanded: illegal block #%B (%b) found in orphaned inode %i.\n
-#: e2fsck/problem.c:260
+#: e2fsck/problem.c:255
msgid "@I @b #%B (%b) found in @o @i %i.\n"
msgstr "@b n°%B (%b) @I repéré dans l'@i @o %i.\n"
#. @-expanded: Already cleared block #%B (%b) found in orphaned inode %i.\n
-#: e2fsck/problem.c:265
+#: e2fsck/problem.c:260
msgid "Already cleared @b #%B (%b) found in @o @i %i.\n"
msgstr "Déjà effaçé le @b n°%B (%b) repéré dans l'@i @o %i.\n"
#. @-expanded: illegal orphaned inode %i in superblock.\n
-#: e2fsck/problem.c:270
+#: e2fsck/problem.c:265
#, c-format
msgid "@I @o @i %i in @S.\n"
msgstr "@i @o %i @I dans le @S.\n"
#. @-expanded: illegal inode %i in orphaned inode list.\n
-#: e2fsck/problem.c:275
+#: e2fsck/problem.c:270
#, c-format
msgid "@I @i %i in @o @i list.\n"
msgstr "@i %i @I dans la liste des @is @os.\n"
-#. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem.
-#: e2fsck/problem.c:280 e2fsck/problem.c:647
-msgid "@f has feature flag(s) set, but is a revision 0 @f. "
-msgstr ""
-"le @f a des drapeaux de fonctionnalités activés mais est un @f de version 0. "
-
#. @-expanded: journal superblock has an unknown read-only feature flag set.\n
-#: e2fsck/problem.c:285
-#, fuzzy
+#: e2fsck/problem.c:275
msgid "@j @S has an unknown read-only feature flag set.\n"
-msgstr ""
-"Le @S du @j Ext3 a un drapeau de fonctionnalités inconnu sélectionné en "
-"lecture seule.\n"
+msgstr "Le @S du @j a un drapeau de fonctionnalités inconnu sélectionné en lecture seule.\n"
#. @-expanded: journal superblock has an unknown incompatible feature flag set.\n
-#: e2fsck/problem.c:290
-#, fuzzy
+#: e2fsck/problem.c:280
msgid "@j @S has an unknown incompatible feature flag set.\n"
-msgstr ""
-"Le @S du @j Ext3 contient un drapeau non reconnu de fonctionnalités "
-"incompatibles.\n"
+msgstr "Le @S du @j contient un drapeau non reconnu de fonctionnalités incompatibles.\n"
#. @-expanded: journal version not supported by this e2fsck.\n
-#: e2fsck/problem.c:295
+#: e2fsck/problem.c:285
msgid "@j version not supported by this e2fsck.\n"
msgstr "cette version de @j n'est pas supportée par cet e2fsck.\n"
#. @-expanded: Moving journal from /%s to hidden inode.\n
#. @-expanded: \n
-#: e2fsck/problem.c:300
+#: e2fsck/problem.c:290
#, c-format
msgid ""
"Moving @j from /%s to hidden @i.\n"
@@ -1022,7 +991,7 @@ msgstr ""
#. @-expanded: Error moving journal: %m\n
#. @-expanded: \n
-#: e2fsck/problem.c:305
+#: e2fsck/problem.c:295
#, c-format
msgid ""
"Error moving @j: %m\n"
@@ -1034,7 +1003,7 @@ msgstr ""
#. @-expanded: Found invalid V2 journal superblock fields (from V1 journal).\n
#. @-expanded: Clearing fields beyond the V1 journal superblock...\n
#. @-expanded: \n
-#: e2fsck/problem.c:310
+#: e2fsck/problem.c:300
msgid ""
"Found @n V2 @j @S fields (from V1 @j).\n"
"Clearing fields beyond the V1 @j @S...\n"
@@ -1044,6 +1013,16 @@ msgstr ""
"Effacement des champs au-delà du @S de @j V1...\n"
"\n"
+#. @-expanded: Run journal anyway
+#: e2fsck/problem.c:306
+msgid "Run @j anyway"
+msgstr "Exécuter quand même le @j"
+
+#. @-expanded: Recovery flag not set in backup superblock, so running journal anyway.\n
+#: e2fsck/problem.c:311
+msgid "Recovery flag not set in backup @S, so running @j anyway.\n"
+msgstr "Le drapeau de récupération n'est pas activé dans le @S de secours, le @j sera donc quand même exécuté.\n"
+
#. @-expanded: Backing up journal inode block information.\n
#. @-expanded: \n
#: e2fsck/problem.c:316
@@ -1067,9 +1046,7 @@ msgstr ""
#. @-expanded: Resize_inode not enabled, but the resize inode is non-zero.
#: e2fsck/problem.c:327
msgid "Resize_ at i not enabled, but the resize @i is non-zero. "
-msgstr ""
-"Resize_inode n'est pas activé, mais l'@i de changement de taille n'est pas "
-"nul. "
+msgstr "Resize_inode n'est pas activé, mais l'@i de changement de taille n'est pas nul. "
#. @-expanded: Resize inode not valid.
#: e2fsck/problem.c:332
@@ -1127,8 +1104,7 @@ msgstr ""
#. @-expanded: group descriptor %g has invalid unused inodes count %b.
#: e2fsck/problem.c:371
msgid "@g descriptor %g has invalid unused inodes count %b. "
-msgstr ""
-"Le descripteur de @g %g a un nombre invalide d'i-noeuds non utilisés %b. "
+msgstr "Le descripteur de @g %g a un nombre invalide d'i-noeuds non utilisés %b. "
#. @-expanded: Last group block bitmap uninitialized.
#: e2fsck/problem.c:376
@@ -1138,12 +1114,11 @@ msgstr "Le @B de @b du dernier @g n'est pas initialis
#: e2fsck/problem.c:381
#, c-format
msgid "Journal transaction %i was corrupt, replay was aborted.\n"
-msgstr ""
-"La transaction %i du journal était corrompue, le rejeu a été abandonné.\n"
+msgstr "La transaction %i du journal était corrompue, le rejeu a été abandonné.\n"
#: e2fsck/problem.c:385
msgid "The test_fs flag is set (and ext4 is available). "
-msgstr ""
+msgstr "Le drapeau test_fs est positionné (et ext4 est disponible). "
#. @-expanded: Pass 1: Checking inodes, blocks, and sizes\n
#: e2fsck/problem.c:392
@@ -1258,8 +1233,7 @@ msgstr "@b dupliqu
#. @-expanded: Bad block %b used as bad block inode indirect block.
#: e2fsck/problem.c:496
msgid "Bad @b %b used as bad @b @i indirect @b. "
-msgstr ""
-"%b défectueux utilisé en tant que @b indirect d'@i des @bs défectueux. "
+msgstr "%b défectueux utilisé en tant que @b indirect d'@i des @bs défectueux. "
#. @-expanded: \n
#. @-expanded: The bad block inode has probably been corrupted. You probably\n
@@ -1308,9 +1282,7 @@ msgstr "Le @S primaire (%b) est sur la liste des @bs d
#. @-expanded: Block %b in the primary group descriptors is on the bad block list\n
#: e2fsck/problem.c:524
msgid "Block %b in the primary @g descriptors is on the bad @b list\n"
-msgstr ""
-"Le bloc %b dans les descripteurs de @gs primaires est dans la liste des @bs "
-"défectueux\n"
+msgstr "Le bloc %b dans les descripteurs de @gs primaires est dans la liste des @bs défectueux\n"
#. @-expanded: Warning: Group %g's superblock (%b) is bad.\n
#: e2fsck/problem.c:530
@@ -1320,16 +1292,12 @@ msgstr "Avertissement
#. @-expanded: Warning: Group %g's copy of the group descriptors has a bad block (%b).\n
#: e2fsck/problem.c:535
msgid "Warning: Group %g's copy of the @g descriptors has a bad @b (%b).\n"
-msgstr ""
-"Avertissement : la copie des descripteurs de @gs du @g %g a un @b (%b) "
-"défectueux.\n"
+msgstr "Avertissement : la copie des descripteurs de @gs du @g %g a un @b (%b) défectueux.\n"
#. @-expanded: Programming error? block #%b claimed for no reason in process_bad_block.\n
#: e2fsck/problem.c:541
msgid "Programming error? @b #%b claimed for no reason in process_bad_ at b.\n"
-msgstr ""
-"Erreur de programmation ? @b n°%b reclamé sans aucune raison dans "
-"process_bad_block.\n"
+msgstr "Erreur de programmation ? @b n°%b reclamé sans aucune raison dans process_bad_block.\n"
#. @-expanded: error allocating %N contiguous block(s) in block group %g for %s: %m\n
#: e2fsck/problem.c:547
@@ -1364,7 +1332,7 @@ msgid "Warning: could not write @b %b for %s: %m\n"
msgstr "Avertissement : impossible d'écrire le @b %b pour %s : %m\n"
#. @-expanded: error allocating inode bitmap (%N): %m\n
-#: e2fsck/problem.c:577 e2fsck/problem.c:1378
+#: e2fsck/problem.c:577 e2fsck/problem.c:1383
msgid "@A @i @B (%N): %m\n"
msgstr "@A du @B d'@is (%N) : %m\n"
@@ -1400,16 +1368,12 @@ msgstr "Erreur lors de la boucle d'it
#. @-expanded: Error storing inode count information (inode=%i, count=%N): %m\n
#: e2fsck/problem.c:607
msgid "Error storing @i count information (@i=%i, count=%N): %m\n"
-msgstr ""
-"Erreur lors du stockage du compteur d'information d'@i (@i=%i, compteur=%"
-"N) : %m\n"
+msgstr "Erreur lors du stockage du compteur d'information d'@i (@i=%i, compteur=%N) : %m\n"
#. @-expanded: Error storing directory block information (inode=%i, block=%b, num=%N): %m\n
#: e2fsck/problem.c:612
msgid "Error storing @d @b information (@i=%i, @b=%b, num=%N): %m\n"
-msgstr ""
-"Erreur lors du stockage de l'information du @b de @ds (@i=%i, @b=%b, num=%"
-"N) : %m\n"
+msgstr "Erreur lors du stockage de l'information du @b de @ds (@i=%i, @b=%b, num=%N) : %m\n"
#. @-expanded: Error reading inode %i: %m\n
#: e2fsck/problem.c:618
@@ -1438,9 +1402,7 @@ msgstr ""
#: e2fsck/problem.c:637
#, c-format
msgid "@i %i has @cion flag set on @f without @cion support. "
-msgstr ""
-"l'@i %i a le drapeau de @cion qui est initialisé sur un @f sans support de "
-"@cion. "
+msgstr "l'@i %i a le drapeau de @cion qui est initialisé sur un @f sans support de @cion. "
#. @-expanded: Special (device/socket/fifo) inode %i has non-zero size.
#: e2fsck/problem.c:642
@@ -1467,9 +1429,7 @@ msgstr "l'@i %i fait partie de la liste des @is @os. "
#. @-expanded: inodes that were part of a corrupted orphan linked list found.
#: e2fsck/problem.c:668
msgid "@is that were part of a corrupted orphan linked list found. "
-msgstr ""
-"des @is qui faisaient partie d'une liste chaînée d'orphelins corrompue ont "
-"été repérés. "
+msgstr "des @is qui faisaient partie d'une liste chaînée d'orphelins corrompue ont été repérés. "
#. @-expanded: error allocating refcount structure (%N): %m\n
#: e2fsck/problem.c:673
@@ -1551,8 +1511,7 @@ msgstr "le @b n
#: e2fsck/problem.c:747
#, c-format
msgid "@i %i has INDEX_FL flag set on @f without htree support.\n"
-msgstr ""
-"l'@i %i a le drapeau INDEX_FL activé sur le @f sans support des htrees.\n"
+msgstr "l'@i %i a le drapeau INDEX_FL activé sur le @f sans support des htrees.\n"
#. @-expanded: inode %i has INDEX_FL flag set but is not a directory.\n
#: e2fsck/problem.c:752
@@ -1588,9 +1547,7 @@ msgstr "l'@h %i a une hauteur d'arbre (%N) qui est trop grande\n"
msgid ""
"Bad @b @i has an indirect @b (%b) that conflicts with\n"
"@f metadata. "
-msgstr ""
-"l'@i des @bs défectueux a un @b indirect (%b) qui entre en conflit avec les "
-"métadonnées du @f. "
+msgstr "l'@i des @bs défectueux a un @b indirect (%b) qui entre en conflit avec les métadonnées du @f. "
#. @-expanded: Resize inode (re)creation failed: %m.
#: e2fsck/problem.c:783
@@ -1608,21 +1565,21 @@ msgstr "l'@i %i a une taille extra (%IS) qui est @n\n"
msgid "@a in @i %i has a namelen (%N) which is @n\n"
msgstr "l'@a dans l'@i %i a une longueur de nom (%N) qui est @n\n"
-#. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n
-#: e2fsck/problem.c:798
-msgid "@a in @i %i has a value size (%N) which is @n\n"
-msgstr "l'@a dans l'@i %i a une valeur de taille (%N) qui est @n\n"
-
#. @-expanded: extended attribute in inode %i has a value offset (%N) which is invalid\n
-#: e2fsck/problem.c:803
+#: e2fsck/problem.c:798
msgid "@a in @i %i has a value offset (%N) which is @n\n"
msgstr "l'@a dans l'@i %i a une valeur de décalage (%N) qui est @n\n"
#. @-expanded: extended attribute in inode %i has a value block (%N) which is invalid (must be 0)\n
-#: e2fsck/problem.c:808
+#: e2fsck/problem.c:803
msgid "@a in @i %i has a value @b (%N) which is @n (must be 0)\n"
msgstr "l'@a dans l'@i %i a un @b de valeur (%N) qui est @n (doit être 0)\n"
+#. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n
+#: e2fsck/problem.c:808
+msgid "@a in @i %i has a value size (%N) which is @n\n"
+msgstr "l'@a dans l'@i %i a une valeur de taille (%N) qui est @n\n"
+
#. @-expanded: extended attribute in inode %i has a hash (%N) which is invalid\n
#: e2fsck/problem.c:813
msgid "@a in @i %i has a hash (%N) which is @n\n"
@@ -1646,6 +1603,8 @@ msgid ""
"Failed to iterate extents in @i %i\n"
"\t(op %s, blk %b, lblk %c): %m\n"
msgstr ""
+"N'a pu itérer sur les extens de l'@i %i\n"
+"\t(op %s, blk %b, lblk %c): %m\n"
#. @-expanded: inode %i has an invalid extent\n
#. @-expanded: \t(logical block %c, invalid physical block %b, len %N)\n
@@ -1671,15 +1630,13 @@ msgstr ""
#: e2fsck/problem.c:844
#, c-format
msgid "@i %i has EXTENTS_FL flag set on @f without extents support.\n"
-msgstr ""
-"l'@i %i a le drapeau EXTENTS_FL activé sur le @f sans support des extents.\n"
+msgstr "l'@i %i a le drapeau EXTENTS_FL activé sur le @f sans support des extents.\n"
#. @-expanded: inode %i is in extent format, but superblock is missing EXTENTS feature\n
#: e2fsck/problem.c:849
#, c-format
msgid "@i %i is in extent format, but @S is missing EXTENTS feature\n"
-msgstr ""
-"L'@i %i a un format d'extent, mais le @S n'a pas la fonctionnalité EXTENTS\n"
+msgstr "L'@i %i a un format d'extent, mais le @S n'a pas la fonctionnalité EXTENTS\n"
#. @-expanded: inode %i missing EXTENT_FL, but is in extents format\n
#: e2fsck/problem.c:854
@@ -1705,7 +1662,7 @@ msgstr ""
#. @-expanded: inode %i has an invalid extent node (blk %b, lblk %c)\n
#: e2fsck/problem.c:868
msgid "@i %i has an invalid extent node (blk %b, lblk %c)\n"
-msgstr ""
+msgstr "L'@i %i a un noeud d'extent invalide (blk %b, lblk %c)\n"
#. @-expanded: \n
#. @-expanded: Running additional passes to resolve blocks claimed by more than one inode...\n
@@ -1717,8 +1674,7 @@ msgid ""
"Pass 1B: Rescanning for @m @bs\n"
msgstr ""
"\n"
-"Exécution de passes additionnelles pour résoudre les problèmes de @bs "
-"réclamés par plus d'un @i...\n"
+"Exécution de passes additionnelles pour résoudre les problèmes de @bs réclamés par plus d'un @i...\n"
"Passe 1B : ré-examen pour les @bs @m\n"
#. @-expanded: multiply-claimed block(s) in inode %i:
@@ -1949,7 +1905,7 @@ msgstr "l'@E est un doublon de l'@e
msgid "@E is duplicate '..' @e.\n"
msgstr "l'@E est un doublon de l'@e « .. ».\n"
-#: e2fsck/problem.c:1108 e2fsck/problem.c:1403
+#: e2fsck/problem.c:1108 e2fsck/problem.c:1408
#, c-format
msgid "Internal error: couldn't find dir_info for %i.\n"
msgstr "Erreur interne : impossible de trouver dir_info pour %i.\n"
@@ -2042,9 +1998,7 @@ msgstr "le @b d'@a @F @n (%If).\n"
#. @-expanded: filesystem contains large files, but lacks LARGE_FILE flag in superblock.\n
#: e2fsck/problem.c:1193
msgid "@f contains large files, but lacks LARGE_FILE flag in @S.\n"
-msgstr ""
-"le @f contient de grands fichiers, mais n'a pas le drapeau LARGE_FILE activé "
-"dans le @S.\n"
+msgstr "le @f contient de grands fichiers, mais n'a pas le drapeau LARGE_FILE activé dans le @S.\n"
#. @-expanded: problem in HTREE directory inode %d: node (%B) not referenced\n
#: e2fsck/problem.c:1198
@@ -2143,106 +2097,105 @@ msgstr "@b dans l'@h %d (%q) inattendu.\n"
#. @-expanded: entry '%Dn' in %p (%i) references inode %Di in group %g where _INODE_UNINIT is set.\n
#: e2fsck/problem.c:1281
-#, fuzzy
msgid "@E references @i %Di in @g %g where _INODE_UNINIT is set.\n"
-msgstr "@i %i non trouvé dans le @g %g où _INODE_UNINIT est positionné. "
+msgstr "@E référence l'@i %Di dans le @g %g où _INODE_UNINIT est positionné.\n"
#. @-expanded: entry '%Dn' in %p (%i) references inode %Di found in group %g's unused inodes area.\n
#: e2fsck/problem.c:1286
-#, fuzzy
msgid "@E references @i %Di found in @g %g's unused inodes area.\n"
-msgstr "@i %i trouvé dans la zone d'i-noeuds non utilisés du @g %g "
+msgstr "@E référence l'@i %Di trouvé dans la zone d'i-noeuds non utilisés du @g %g.\n"
+
+#. @-expanded: i_file_acl_hi for inode %i (%Q) is %N, should be zero.\n
+#: e2fsck/problem.c:1291
+msgid "i_file_acl_hi @F %N, @s zero.\n"
+msgstr "i_file_acl_hi @F %N, @s zéro.\n"
#. @-expanded: Pass 3: Checking directory connectivity\n
-#: e2fsck/problem.c:1293
+#: e2fsck/problem.c:1298
msgid "Pass 3: Checking @d connectivity\n"
msgstr "Passe 3 : vérification de la connectivité des @ds\n"
#. @-expanded: root inode not allocated.
-#: e2fsck/problem.c:1298
+#: e2fsck/problem.c:1303
msgid "@r not allocated. "
msgstr "l'@r n'est pas alloué. "
#. @-expanded: No room in lost+found directory.
-#: e2fsck/problem.c:1303
+#: e2fsck/problem.c:1308
msgid "No room in @l @d. "
msgstr "Pas d'espace dans le @d @l. "
#. @-expanded: Unconnected directory inode %i (%p)\n
-#: e2fsck/problem.c:1308
+#: e2fsck/problem.c:1313
#, c-format
msgid "Unconnected @d @i %i (%p)\n"
msgstr "@i %i (%p) de @d non connecté\n"
#. @-expanded: /lost+found not found.
-#: e2fsck/problem.c:1313
+#: e2fsck/problem.c:1318
msgid "/@l not found. "
msgstr "/@l n'a pas été trouvé. "
#. @-expanded: '..' in %Q (%i) is %P (%j), should be %q (%d).\n
-#: e2fsck/problem.c:1318
+#: e2fsck/problem.c:1323
msgid "'..' in %Q (%i) is %P (%j), @s %q (%d).\n"
msgstr "« .. » dans %Q (%i) est %P (%j), @s %q (%d).\n"
#. @-expanded: Bad or non-existent /lost+found. Cannot reconnect.\n
-#: e2fsck/problem.c:1323
+#: e2fsck/problem.c:1328
msgid "Bad or non-existent /@l. Cannot reconnect.\n"
msgstr "/@l erroné ou inexistent. Ne peut reconnecter.\n"
#. @-expanded: Could not expand /lost+found: %m\n
-#: e2fsck/problem.c:1328
+#: e2fsck/problem.c:1333
#, c-format
msgid "Could not expand /@l: %m\n"
msgstr "Ne peux étendre /@l : %m\n"
-#: e2fsck/problem.c:1333
+#: e2fsck/problem.c:1338
#, c-format
msgid "Could not reconnect %i: %m\n"
msgstr "Ne peut reconnecter %i : %m\n"
#. @-expanded: Error while trying to find /lost+found: %m\n
-#: e2fsck/problem.c:1338
+#: e2fsck/problem.c:1343
#, c-format
msgid "Error while trying to find /@l: %m\n"
msgstr "Erreur lors de la tentative de repérage de /@l : %m\n"
#. @-expanded: ext2fs_new_block: %m while trying to create /lost+found directory\n
-#: e2fsck/problem.c:1343
+#: e2fsck/problem.c:1348
#, c-format
msgid "ext2fs_new_ at b: %m while trying to create /@l @d\n"
msgstr "ext2fs_new_ at b : %m lors de la tentative de création du @d /@l\n"
#. @-expanded: ext2fs_new_inode: %m while trying to create /lost+found directory\n
-#: e2fsck/problem.c:1348
+#: e2fsck/problem.c:1353
#, c-format
msgid "ext2fs_new_ at i: %m while trying to create /@l @d\n"
msgstr "ext2fs_new_ at i : %m lors de la tentative de création du @d /@l\n"
#. @-expanded: ext2fs_new_dir_block: %m while creating new directory block\n
-#: e2fsck/problem.c:1353
+#: e2fsck/problem.c:1358
#, c-format
msgid "ext2fs_new_dir_ at b: %m while creating new @d @b\n"
-msgstr ""
-"ext2fs_new_dir_ at b : %m lors de la tentative de création d'un nouveau @b de "
-"@d\n"
+msgstr "ext2fs_new_dir_ at b : %m lors de la tentative de création d'un nouveau @b de @d\n"
#. @-expanded: ext2fs_write_dir_block: %m while writing the directory block for /lost+found\n
-#: e2fsck/problem.c:1358
+#: e2fsck/problem.c:1363
#, c-format
msgid "ext2fs_write_dir_ at b: %m while writing the @d @b for /@l\n"
-msgstr ""
-"ext2fs_write_dir_ at b : %m lors de la tentative d'écriture du @b de @d pour /"
-"@l\n"
+msgstr "ext2fs_write_dir_ at b : %m lors de la tentative d'écriture du @b de @d pour /@l\n"
#. @-expanded: Error while adjusting inode count on inode %i\n
-#: e2fsck/problem.c:1363
+#: e2fsck/problem.c:1368
#, c-format
msgid "Error while adjusting @i count on @i %i\n"
msgstr "Erreur lors de l'ajustement du compteur d'@i sur l'@i %i\n"
#. @-expanded: Couldn't fix parent of inode %i: %m\n
#. @-expanded: \n
-#: e2fsck/problem.c:1368
+#: e2fsck/problem.c:1373
#, c-format
msgid ""
"Couldn't fix parent of @i %i: %m\n"
@@ -2253,7 +2206,7 @@ msgstr ""
#. @-expanded: Couldn't fix parent of inode %i: Couldn't find parent directory entry\n
#. @-expanded: \n
-#: e2fsck/problem.c:1373
+#: e2fsck/problem.c:1378
#, c-format
msgid ""
"Couldn't fix parent of @i %i: Couldn't find parent @d @e\n"
@@ -2263,76 +2216,75 @@ msgstr ""
"\n"
#. @-expanded: Error creating root directory (%s): %m\n
-#: e2fsck/problem.c:1383
+#: e2fsck/problem.c:1388
#, c-format
msgid "Error creating root @d (%s): %m\n"
msgstr "Erreur de création du @d racine (%s) : %m\n"
#. @-expanded: Error creating /lost+found directory (%s): %m\n
-#: e2fsck/problem.c:1388
+#: e2fsck/problem.c:1393
#, c-format
msgid "Error creating /@l @d (%s): %m\n"
msgstr "Erreur de création du @d /@l (%s) : %m\n"
#. @-expanded: root inode is not a directory; aborting.\n
-#: e2fsck/problem.c:1393
+#: e2fsck/problem.c:1398
msgid "@r is not a @d; aborting.\n"
msgstr "l'@r n'est pas un @d ; arrêt immédiat.\n"
#. @-expanded: Cannot proceed without a root inode.\n
-#: e2fsck/problem.c:1398
+#: e2fsck/problem.c:1403
msgid "Cannot proceed without a @r.\n"
msgstr "Ne peut procéder sans un @r.\n"
#. @-expanded: /lost+found is not a directory (ino=%i)\n
-#: e2fsck/problem.c:1408
+#: e2fsck/problem.c:1413
#, c-format
msgid "/@l is not a @d (ino=%i)\n"
msgstr "/@l n'est pas un @d (ino=%i)\n"
-#: e2fsck/problem.c:1415
+#: e2fsck/problem.c:1420
msgid "Pass 3A: Optimizing directories\n"
msgstr "Passe 3A : optimisation des répertoires\n"
-#: e2fsck/problem.c:1420
-#, fuzzy, c-format
+#: e2fsck/problem.c:1425
+#, c-format
msgid "Failed to create dirs_to_hash iterator: %m\n"
-msgstr "Échec de création de l'itérateur dirs_to_hash : %m"
+msgstr "Échec de création de l'itérateur dirs_to_hash : %m\n"
-#: e2fsck/problem.c:1425
-#, fuzzy
+#: e2fsck/problem.c:1430
msgid "Failed to optimize directory %q (%d): %m\n"
-msgstr "Échec d'optimisation du répertoire %q (%d) : %m"
+msgstr "Échec d'optimisation du répertoire %q (%d) : %m\n"
-#: e2fsck/problem.c:1430
+#: e2fsck/problem.c:1435
msgid "Optimizing directories: "
msgstr "Optimisation des répertoires : "
-#: e2fsck/problem.c:1447
+#: e2fsck/problem.c:1452
msgid "Pass 4: Checking reference counts\n"
msgstr "Passe 4 : vérification des compteurs de référence\n"
#. @-expanded: unattached zero-length inode %i.
-#: e2fsck/problem.c:1452
+#: e2fsck/problem.c:1457
#, c-format
msgid "@u @z @i %i. "
msgstr "@i %i @z @u. "
#. @-expanded: unattached inode %i\n
-#: e2fsck/problem.c:1457
+#: e2fsck/problem.c:1462
#, c-format
msgid "@u @i %i\n"
msgstr "@i %i @u\n"
#. @-expanded: inode %i ref count is %Il, should be %N.
-#: e2fsck/problem.c:1462
+#: e2fsck/problem.c:1467
msgid "@i %i ref count is %Il, @s %N. "
msgstr "le compteur de référence de l'@i %i est %Il, @s %N. "
#. @-expanded: WARNING: PROGRAMMING BUG IN E2FSCK!\n
#. @-expanded: \tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n
#. @-expanded: inode_link_info[%i] is %N, inode.i_links_count is %Il. They should be the same!\n
-#: e2fsck/problem.c:1466
+#: e2fsck/problem.c:1471
msgid ""
"WARNING: PROGRAMMING BUG IN E2FSCK!\n"
"\tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n"
@@ -2344,113 +2296,100 @@ msgstr ""
"\ti-node.i_links_count est %Il. Ils devraient être les mêmes !\n"
#. @-expanded: Pass 5: Checking group summary information\n
-#: e2fsck/problem.c:1476
+#: e2fsck/problem.c:1481
msgid "Pass 5: Checking @g summary information\n"
msgstr "Passe 5 : vérification de l'information du sommaire de @g\n"
#. @-expanded: Padding at end of inode bitmap is not set.
-#: e2fsck/problem.c:1481
+#: e2fsck/problem.c:1486
msgid "Padding at end of @i @B is not set. "
msgstr "Le remplissage à la fin du @B d'@i n'est pas initialisé. "
#. @-expanded: Padding at end of block bitmap is not set.
-#: e2fsck/problem.c:1486
+#: e2fsck/problem.c:1491
msgid "Padding at end of @b @B is not set. "
msgstr "Le remplissage à la fin du @B de @bs n'est pas initialisé. "
#. @-expanded: block bitmap differences:
-#: e2fsck/problem.c:1491
+#: e2fsck/problem.c:1496
msgid "@b @B differences: "
msgstr "différences de @B de @bs: "
#. @-expanded: inode bitmap differences:
-#: e2fsck/problem.c:1511
+#: e2fsck/problem.c:1516
msgid "@i @B differences: "
msgstr "différences de @B d'@is : "
#. @-expanded: Free inodes count wrong for group #%g (%i, counted=%j).\n
-#: e2fsck/problem.c:1531
+#: e2fsck/problem.c:1536
msgid "Free @is count wrong for @g #%g (%i, counted=%j).\n"
-msgstr ""
-"Le décompte des @is libres est erroné pour le @g n°%g (%i, décompté=%j).\n"
+msgstr "Le décompte des @is libres est erroné pour le @g n°%g (%i, décompté=%j).\n"
#. @-expanded: Directories count wrong for group #%g (%i, counted=%j).\n
-#: e2fsck/problem.c:1536
+#: e2fsck/problem.c:1541
msgid "Directories count wrong for @g #%g (%i, counted=%j).\n"
-msgstr ""
-"Le décompte des répertoires est erroné pour le @g n°%g (%i, décompté=%j).\n"
+msgstr "Le décompte des répertoires est erroné pour le @g n°%g (%i, décompté=%j).\n"
#. @-expanded: Free inodes count wrong (%i, counted=%j).\n
-#: e2fsck/problem.c:1541
+#: e2fsck/problem.c:1546
msgid "Free @is count wrong (%i, counted=%j).\n"
msgstr "Le décompte des @is libres est erroné (%i, décompté=%j).\n"
#. @-expanded: Free blocks count wrong for group #%g (%b, counted=%c).\n
-#: e2fsck/problem.c:1546
+#: e2fsck/problem.c:1551
msgid "Free @bs count wrong for @g #%g (%b, counted=%c).\n"
-msgstr ""
-"Le décompte des @bs libres est erroné pour le @g n°%g (%b, décompté=%c).\n"
+msgstr "Le décompte des @bs libres est erroné pour le @g n°%g (%b, décompté=%c).\n"
#. @-expanded: Free blocks count wrong (%b, counted=%c).\n
-#: e2fsck/problem.c:1551
+#: e2fsck/problem.c:1556
msgid "Free @bs count wrong (%b, counted=%c).\n"
msgstr "Le décompte des @bs libres est erroné (%b, décompté=%c).\n"
#. @-expanded: PROGRAMMING ERROR: filesystem (#%N) bitmap endpoints (%b, %c) don't match calculated bitmap
#. @-expanded: endpoints (%i, %j)\n
-#: e2fsck/problem.c:1556
-msgid ""
-"PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B "
-"endpoints (%i, %j)\n"
-msgstr ""
-"ERREUR DE PROGRAMMATION : les points de terminaisons (%b, %c) de @Bs du @f (n"
-"°%N) ne concordent pas avec les points de terminaison de @Bs calculés (%i, %"
-"j)\n"
+#: e2fsck/problem.c:1561
+msgid "PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B endpoints (%i, %j)\n"
+msgstr "ERREUR DE PROGRAMMATION : les points de terminaisons (%b, %c) de @Bs du @f (n°%N) ne concordent pas avec les points de terminaison de @Bs calculés (%i, %j)\n"
-#: e2fsck/problem.c:1562
+#: e2fsck/problem.c:1567
msgid "Internal error: fudging end of bitmap (%N)\n"
msgstr "Erreur interne : ajustement approximatif de la fin du bitmap (%N)\n"
#. @-expanded: Error copying in replacement inode bitmap: %m\n
-#: e2fsck/problem.c:1567
+#: e2fsck/problem.c:1572
#, c-format
msgid "Error copying in replacement @i @B: %m\n"
msgstr "Erreur lors de la copie du @B d'@is de remplacement : %m\n"
#. @-expanded: Error copying in replacement block bitmap: %m\n
-#: e2fsck/problem.c:1572
+#: e2fsck/problem.c:1577
#, c-format
msgid "Error copying in replacement @b @B: %m\n"
msgstr "Erreur lors de la copie du @B des @bs de remplacement : %m\n"
-#. @-expanded: Recreate journal
-#: e2fsck/problem.c:1597
-#, fuzzy
-msgid "Recreate @j"
-msgstr "Recréer"
-
#. @-expanded: group %g block(s) in use but group is marked BLOCK_UNINIT\n
#: e2fsck/problem.c:1602
#, c-format
msgid "@g %g @b(s) in use but @g is marked BLOCK_UNINIT\n"
-msgstr ""
-"Un ou des @b(s) du @g %g en cours d'utilisation alors que le @g est marqué "
-"BLOCK_UNINIT\n"
+msgstr "Un ou des @b(s) du @g %g en cours d'utilisation alors que le @g est marqué BLOCK_UNINIT\n"
#. @-expanded: group %g inode(s) in use but group is marked INODE_UNINIT\n
#: e2fsck/problem.c:1607
#, c-format
msgid "@g %g @i(s) in use but @g is marked INODE_UNINIT\n"
-msgstr ""
-"Un ou des @i(s) du @g %g en cours d'utilisation alors que le @g est marqué "
-"INODE_UNINIT\n"
+msgstr "Un ou des @i(s) du @g %g en cours d'utilisation alors que le @g est marqué INODE_UNINIT\n"
-#: e2fsck/problem.c:1725
+#. @-expanded: Recreate journal
+#: e2fsck/problem.c:1614
+msgid "Recreate @j"
+msgstr "Recréer le @j"
+
+#: e2fsck/problem.c:1732
#, c-format
msgid "Unhandled error code (0x%x)!\n"
msgstr "Code d'erreur non traité (0x%x) !\n"
-#: e2fsck/problem.c:1820
+#: e2fsck/problem.c:1827
msgid "IGNORED"
msgstr "IGNORÉ"
@@ -2511,8 +2450,7 @@ msgid ""
" -p Automatic repair (no questions)\n"
" -n Make no changes to the filesystem\n"
" -y Assume \"yes\" to all questions\n"
-" -c Check for bad blocks and add them to the badblock "
-"list\n"
+" -c Check for bad blocks and add them to the badblock list\n"
" -f Force checking even if filesystem is marked clean\n"
msgstr ""
"\n"
@@ -2560,8 +2498,8 @@ msgstr " nombre d'i-noeuds avec des blocs ind/dind/tind
msgid " Extent depth histogram: "
msgstr " Histogramme des profondeurs d'extents : "
-#: e2fsck/unix.c:207 misc/badblocks.c:916 misc/tune2fs.c:1567 misc/util.c:151
-#: resize/main.c:248
+#: e2fsck/unix.c:207 misc/badblocks.c:928 misc/tune2fs.c:1584 misc/util.c:151
+#: resize/main.c:249
#, c-format
msgid "while determining whether %s is mounted."
msgstr "lors de la détermination à savoir si %s est monté."
@@ -2595,8 +2533,7 @@ msgid ""
msgstr ""
"\n"
"\n"
-"\a\a\a\aAVERTISSEMENT !!! L'exécution d'e2fsck sur un système de fichiers "
-"monté\n"
+"\a\a\a\aAVERTISSEMENT !!! L'exécution d'e2fsck sur un système de fichiers monté\n"
"peut causer des dommages SÉVÈRES au système de fichiers.\a\a\a\n"
"\n"
@@ -2619,9 +2556,7 @@ msgstr " n'a pas
#: e2fsck/unix.c:314
msgid " primary superblock features different from backup"
-msgstr ""
-" les fonctionnalités du superbloc primaire diffèrent de celles de la "
-"sauvegarde"
+msgstr " les fonctionnalités du superbloc primaire diffèrent de celles de la sauvegarde"
#: e2fsck/unix.c:318
#, c-format
@@ -2630,8 +2565,7 @@ msgstr " a
#: e2fsck/unix.c:324
msgid " has filesystem last checked time in the future"
-msgstr ""
-" a une date de dernière vérification du système de fichier dans le futur"
+msgstr " a une date de dernière vérification du système de fichier dans le futur"
#: e2fsck/unix.c:330
#, c-format
@@ -2703,17 +2637,17 @@ msgstr "Seule une des options -p/-a, -n ou -y peut
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr "L'option -t n'est pas supportée sur cette version d'e2fsck.\n"
-#: e2fsck/unix.c:801 misc/tune2fs.c:549 misc/tune2fs.c:833 misc/tune2fs.c:850
+#: e2fsck/unix.c:801 misc/tune2fs.c:550 misc/tune2fs.c:835 misc/tune2fs.c:853
#, c-format
msgid "Unable to resolve '%s'"
msgstr "Impossible de résoudre « %s »"
-#: e2fsck/unix.c:831
+#: e2fsck/unix.c:830
#, c-format
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
msgstr "Les options -c et -l/-L ne peuvent pas être utilisées simultanément.\n"
-#: e2fsck/unix.c:879
+#: e2fsck/unix.c:878
#, c-format
msgid ""
"E2FSCK_JBD_DEBUG \"%s\" not an integer\n"
@@ -2722,7 +2656,7 @@ msgstr ""
"E2FSCK_JBD_DEBUG \"%s\" n'est pas un entier\n"
"\n"
-#: e2fsck/unix.c:888
+#: e2fsck/unix.c:887
#, c-format
msgid ""
"\n"
@@ -2733,38 +2667,43 @@ msgstr ""
"Argument non numérique invalide pour -%c (\"%s\")\n"
"\n"
-#: e2fsck/unix.c:929
+#: e2fsck/unix.c:961
#, c-format
msgid "Error: ext2fs library version out of date!\n"
msgstr "Erreur : la version de la bibliothèque ext2fs est périmée !\n"
-#: e2fsck/unix.c:937
+#: e2fsck/unix.c:969
msgid "while trying to initialize program"
msgstr "lors de la tentative d'initialisation du programme"
-#: e2fsck/unix.c:951
+#: e2fsck/unix.c:980
#, c-format
msgid "\tUsing %s, %s\n"
msgstr "\tUtilisation de %s, %s\n"
-#: e2fsck/unix.c:963
+#: e2fsck/unix.c:992
msgid "need terminal for interactive repairs"
msgstr "a besoin d'un terminal pour des réparations en mode interactif"
-#: e2fsck/unix.c:1010
+#: e2fsck/unix.c:1021
#, c-format
msgid "%s: %s trying backup blocks...\n"
msgstr "%s: %s tentons d'utiliser les blocs de sauvetage...\n"
-#: e2fsck/unix.c:1012
+#: e2fsck/unix.c:1023
msgid "Superblock invalid,"
msgstr "Superbloc invalide,"
-#: e2fsck/unix.c:1013
+#: e2fsck/unix.c:1024
msgid "Group descriptors look bad..."
msgstr "Les descripteurs de groupe semblent en mauvais état..."
-#: e2fsck/unix.c:1040
+#: e2fsck/unix.c:1034
+#, c-format
+msgid "%s: going back to original superblock\n"
+msgstr "%s : retour au superblock originel\n"
+
+#: e2fsck/unix.c:1060
#, c-format
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
@@ -2776,29 +2715,29 @@ msgstr ""
"corrompu)\n"
"\n"
-#: e2fsck/unix.c:1046
+#: e2fsck/unix.c:1066
#, c-format
msgid "Could this be a zero-length partition?\n"
msgstr "Peut-être cette partition est-elle de taille zéro ?\n"
-#: e2fsck/unix.c:1048
+#: e2fsck/unix.c:1068
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr "Vous devez avoir un accès %s au système de fichiers ou être root\n"
-#: e2fsck/unix.c:1053
+#: e2fsck/unix.c:1073
#, c-format
msgid "Possibly non-existent or swap device?\n"
msgstr "Périphérique peut-être inexistent ou pour le swap ?\n"
-#: e2fsck/unix.c:1055
+#: e2fsck/unix.c:1075
#, c-format
msgid "Filesystem mounted or opened exclusively by another program?\n"
msgstr ""
"Système de fichier monté ou ouvert en mode exclusif par un autre\n"
"programme ?\n"
-#: e2fsck/unix.c:1059
+#: e2fsck/unix.c:1079
#, c-format
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
@@ -2807,44 +2746,42 @@ msgstr ""
"Disque protégé en écriture ; utilisez l'option -n pour effectuer une\n"
"vérification du périphérique en lecture seule.\n"
-#: e2fsck/unix.c:1123
+#: e2fsck/unix.c:1143
msgid "Get a newer version of e2fsck!"
msgstr "Veuillez obtenir une version plus récente d'e2fsck !"
-#: e2fsck/unix.c:1147
+#: e2fsck/unix.c:1173
#, c-format
msgid "while checking ext3 journal for %s"
msgstr "lors de la vérification du journal ext3 pour %s"
-#: e2fsck/unix.c:1158
+#: e2fsck/unix.c:1184
#, c-format
-msgid ""
-"Warning: skipping journal recovery because doing a read-only filesystem "
-"check.\n"
+msgid "Warning: skipping journal recovery because doing a read-only filesystem check.\n"
msgstr ""
"Avertissement : saute la récupération du journal puisque l'on\n"
"procède à l'examen d'un système de fichiers en lecture seule.\n"
-#: e2fsck/unix.c:1171
+#: e2fsck/unix.c:1197
#, c-format
msgid "unable to set superblock flags on %s\n"
msgstr "impossible d'initialiser les drapeaux du superbloc sur %s\n"
-#: e2fsck/unix.c:1177
+#: e2fsck/unix.c:1203
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr "lors de la récupération du journal ext3 de %s"
-#: e2fsck/unix.c:1201
+#: e2fsck/unix.c:1228
#, c-format
msgid "%s has unsupported feature(s):"
msgstr "%s a une(des) fonctionnalité(s) non supportée(s):"
-#: e2fsck/unix.c:1217
+#: e2fsck/unix.c:1244
msgid "Warning: compression support is experimental.\n"
msgstr "Avertissement : le support de la compression est expérimental.\n"
-#: e2fsck/unix.c:1222
+#: e2fsck/unix.c:1249
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
@@ -2853,25 +2790,25 @@ msgstr ""
"E2fsck n'est pas compilé avec le support pour HTREE,\n"
"\tmais le système de fichiers %s a des répertoires HTREE.\n"
-#: e2fsck/unix.c:1276
+#: e2fsck/unix.c:1302
msgid "while reading bad blocks inode"
msgstr "lors de la lecture de l'i-noeud des blocs défectueux"
-#: e2fsck/unix.c:1278
+#: e2fsck/unix.c:1304
#, c-format
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr "Cela ne semble pas être bien, mais on va quand même essayer...\n"
-#: e2fsck/unix.c:1304
+#: e2fsck/unix.c:1330
msgid "Couldn't determine journal size"
msgstr "N'a pu déterminer la taille du journal"
-#: e2fsck/unix.c:1307
+#: e2fsck/unix.c:1333
#, c-format
msgid "Creating journal (%d blocks): "
msgstr "Création du journal (%d blocs) : "
-#: e2fsck/unix.c:1314 misc/mke2fs.c:2091
+#: e2fsck/unix.c:1340 misc/mke2fs.c:2113
msgid ""
"\n"
"\twhile trying to create journal"
@@ -2879,40 +2816,39 @@ msgstr ""
"\n"
"\tlors de la tentative de création du journal"
-#: e2fsck/unix.c:1317
+#: e2fsck/unix.c:1343
#, c-format
msgid " Done.\n"
msgstr "Complété.\n"
-#: e2fsck/unix.c:1318
+#: e2fsck/unix.c:1344
#, c-format
msgid ""
"\n"
"*** journal has been re-created - filesystem is now ext3 again ***\n"
msgstr ""
"\n"
-"*** le journal a été re-créé - le système de fichier est de nouveau ext3 "
-"***\n"
+"*** le journal a été re-créé - le système de fichier est de nouveau ext3 ***\n"
-#: e2fsck/unix.c:1325
+#: e2fsck/unix.c:1351
#, c-format
msgid "Restarting e2fsck from the beginning...\n"
msgstr "Re-démarrons e2fsck depuis le début...\n"
-#: e2fsck/unix.c:1329
+#: e2fsck/unix.c:1355
msgid "while resetting context"
msgstr "lors de la réinitialisation du contexte"
-#: e2fsck/unix.c:1336
+#: e2fsck/unix.c:1362
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr "%s : e2fsck a été annulé.\n"
-#: e2fsck/unix.c:1341
+#: e2fsck/unix.c:1367
msgid "aborted"
msgstr "arrêté"
-#: e2fsck/unix.c:1353
+#: e2fsck/unix.c:1379
#, c-format
msgid ""
"\n"
@@ -2921,12 +2857,12 @@ msgstr ""
"\n"
"%s: ***** LE SYSTÈME DE FICHIERS A ÉTÉ MODIFIÉ *****\n"
-#: e2fsck/unix.c:1356
+#: e2fsck/unix.c:1382
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr "%s: ***** RÉ-AMORCER LINUX *****\n"
-#: e2fsck/unix.c:1364
+#: e2fsck/unix.c:1390
#, c-format
msgid ""
"\n"
@@ -2937,10 +2873,9 @@ msgstr ""
"%s : **AVERTISSEMENT : le système de fichiers contient encore des erreurs**\n"
"\n"
-#: e2fsck/unix.c:1400
+#: e2fsck/unix.c:1426
msgid "while setting block group checksum info"
-msgstr ""
-"lors de l'initialisation de l'information de checksum du groupe de blocs"
+msgstr "lors de l'initialisation de l'information de checksum du groupe de blocs"
#: e2fsck/util.c:138 misc/util.c:68
msgid "yY"
@@ -3021,9 +2956,7 @@ msgstr "l'
#: e2fsck/util.c:248
#, c-format
msgid "while rewriting block and inode bitmaps for %s"
-msgstr ""
-"lors d'une nouvelle tentative d'écriture de bitmaps de blocs et d'i-noeuds "
-"pour %s"
+msgstr "lors d'une nouvelle tentative d'écriture de bitmaps de blocs et d'i-noeuds pour %s"
#: e2fsck/util.c:260
#, c-format
@@ -3038,37 +2971,37 @@ msgstr ""
"%s: INCONSISTENCE INATTENDUE ; EXÉCUTEZ fsck MANUELLEMENT.\n"
"\t(i.e., sans options -a ou -p)\n"
-#: e2fsck/util.c:336
+#: e2fsck/util.c:341
#, c-format
-msgid "Memory used: %dk/%dk (%dk/%dk), "
-msgstr "Mémoire utilisée : %dk/%dk (%dk/%dk), "
+msgid "Memory used: %luk/%luk (%luk/%luk), "
+msgstr "Mémoire utilisée : %luk/%luk (%luk/%luk), "
-#: e2fsck/util.c:340
+#: e2fsck/util.c:345
#, c-format
-msgid "Memory used: %d, "
-msgstr "Mémoire utilisée : %d, "
+msgid "Memory used: %lu, "
+msgstr "Mémoire utilisée : %lu, "
-#: e2fsck/util.c:346
+#: e2fsck/util.c:352
#, c-format
msgid "time: %5.2f/%5.2f/%5.2f\n"
msgstr "temps : %5.2f/%5.2f/%5.2f\n"
-#: e2fsck/util.c:351
+#: e2fsck/util.c:357
#, c-format
msgid "elapsed time: %6.3f\n"
msgstr "temps écoulé : %6.3f\n"
-#: e2fsck/util.c:385 e2fsck/util.c:399
+#: e2fsck/util.c:391 e2fsck/util.c:405
#, c-format
-msgid "while reading inode %ld in %s"
-msgstr "lors de la lecture de l'i-noeud %ld dans %s"
+msgid "while reading inode %lu in %s"
+msgstr "lors de la lecture de l'i-noeud %lu dans %s"
-#: e2fsck/util.c:413 e2fsck/util.c:426
+#: e2fsck/util.c:419 e2fsck/util.c:432
#, c-format
-msgid "while writing inode %ld in %s"
-msgstr "lors de l'écriture de l'i-noeud %ld dans %s"
+msgid "while writing inode %lu in %s"
+msgstr "lors de l'écriture de l'i-noeud %lu dans %s"
-#: e2fsck/util.c:575
+#: e2fsck/util.c:581
msgid "while allocating zeroizing buffer"
msgstr "lors de l'allocation d'un tampon de mise à zéro"
@@ -3080,8 +3013,7 @@ msgstr "compl
#, c-format
msgid ""
"Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnf]\n"
-" [-c blocks_at_once] [-d delay_factor_between_reads] [-e "
-"max_bad_blocks]\n"
+" [-c blocks_at_once] [-d delay_factor_between_reads] [-e max_bad_blocks]\n"
" [-p num_passes] [-t test_pattern [-t test_pattern [...]]]\n"
" device [last_block [first_block]]\n"
msgstr ""
@@ -3103,80 +3035,79 @@ msgstr ""
#: misc/badblocks.c:202
#, c-format
msgid "%6.2f%% done, %s elapsed"
-msgstr ""
+msgstr "%6.2f%% effectué, %s écoulé"
-#: misc/badblocks.c:289
+#: misc/badblocks.c:293
msgid "Testing with random pattern: "
msgstr "Test en cours avec un motif aléatoire : "
-#: misc/badblocks.c:307
+#: misc/badblocks.c:311
msgid "Testing with pattern 0x"
msgstr "Test en cours avec le motif 0x"
-#: misc/badblocks.c:335 misc/badblocks.c:404
+#: misc/badblocks.c:339 misc/badblocks.c:408
msgid "during seek"
msgstr "lors de la recherche"
-#: misc/badblocks.c:346
+#: misc/badblocks.c:350
#, c-format
msgid "Weird value (%ld) in do_read\n"
msgstr "Valeur bizarre (%ld) dans do_read\n"
-#: misc/badblocks.c:424
+#: misc/badblocks.c:428
msgid "during ext2fs_sync_device"
msgstr "lors de l'exécution d'ext2fs_sync_device"
-#: misc/badblocks.c:440 misc/badblocks.c:699
+#: misc/badblocks.c:447 misc/badblocks.c:711
msgid "while beginning bad block list iteration"
msgstr "lors du début de l'itération de la liste des blocs défectueux"
-#: misc/badblocks.c:454 misc/badblocks.c:551 misc/badblocks.c:709
+#: misc/badblocks.c:461 misc/badblocks.c:563 misc/badblocks.c:721
msgid "while allocating buffers"
msgstr "lors de l'allocation des tampons"
-#: misc/badblocks.c:458
+#: misc/badblocks.c:465
#, c-format
msgid "Checking blocks %lu to %lu\n"
msgstr "Vérification des blocs %lu à %lu\n"
-#: misc/badblocks.c:463
+#: misc/badblocks.c:470
msgid "Checking for bad blocks in read-only mode\n"
msgstr "Vérification des blocs défectueux en mode lecture seule\n"
-#: misc/badblocks.c:472
+#: misc/badblocks.c:479
msgid "Checking for bad blocks (read-only test): "
msgstr "Vérification des blocs défectueux (test en mode lecture seule) : "
-#: misc/badblocks.c:480 misc/badblocks.c:583 misc/badblocks.c:628
-#: misc/badblocks.c:772
+#: misc/badblocks.c:487 misc/badblocks.c:595 misc/badblocks.c:640
+#: misc/badblocks.c:784
msgid "Too many bad blocks, aborting test\n"
msgstr "Trop de blocs défectueux, test abandonné\n"
-#: misc/badblocks.c:558
+#: misc/badblocks.c:570
msgid "Checking for bad blocks in read-write mode\n"
msgstr "Vérification des blocs défectueux en mode lecture-écriture\n"
-#: misc/badblocks.c:560 misc/badblocks.c:722
+#: misc/badblocks.c:572 misc/badblocks.c:734
#, c-format
msgid "From block %lu to %lu\n"
msgstr "Du bloc %lu au bloc %lu\n"
-#: misc/badblocks.c:618
+#: misc/badblocks.c:630
msgid "Reading and comparing: "
msgstr "Lecture et comparaison : "
-#: misc/badblocks.c:721
+#: misc/badblocks.c:733
msgid "Checking for bad blocks in non-destructive read-write mode\n"
msgstr ""
"Vérification des blocs défectueux dans un mode non destructif de lecture-\n"
"écriture\n"
-#: misc/badblocks.c:727
+#: misc/badblocks.c:739
msgid "Checking for bad blocks (non-destructive read-write test)\n"
-msgstr ""
-"Vérification des blocs défectueux (test non destructif de lecture-écriture)\n"
+msgstr "Vérification des blocs défectueux (test non destructif de lecture-écriture)\n"
-#: misc/badblocks.c:734
+#: misc/badblocks.c:746
msgid ""
"\n"
"Interrupt caught, cleaning up\n"
@@ -3184,59 +3115,54 @@ msgstr ""
"\n"
"Interruption, nettoyage en cours\n"
-#: misc/badblocks.c:810
+#: misc/badblocks.c:822
#, c-format
msgid "during test data write, block %lu"
msgstr "lors du test d'écriture de données, bloc %lu"
-#: misc/badblocks.c:921 misc/util.c:156
+#: misc/badblocks.c:933 misc/util.c:156
#, c-format
msgid "%s is mounted; "
msgstr "%s est monté ; "
-#: misc/badblocks.c:923
+#: misc/badblocks.c:935
msgid "badblocks forced anyway. Hope /etc/mtab is incorrect.\n"
msgstr ""
"l'exécution de badblocks est tout de même forcée.\n"
"Espérons que /etc/mtab est incorrect.\n"
-#: misc/badblocks.c:928
+#: misc/badblocks.c:940
msgid "it's not safe to run badblocks!\n"
msgstr "il n'est pas prudent d'exécuter badblocks !\n"
-#: misc/badblocks.c:933 misc/util.c:167
+#: misc/badblocks.c:945 misc/util.c:167
#, c-format
msgid "%s is apparently in use by the system; "
msgstr "%s est apparemment utilisé par le système ; "
-#: misc/badblocks.c:936
+#: misc/badblocks.c:948
msgid "badblocks forced anyway.\n"
msgstr "blocs erronés forcés de toutes manières.\n"
-#: misc/badblocks.c:956
+#: misc/badblocks.c:968
#, c-format
msgid "invalid %s - %s"
msgstr "%s invalide - %s"
-#: misc/badblocks.c:1015
-#, c-format
-msgid "bad block size - %s"
-msgstr "taille des blocs défectueux - %s"
-
-#: misc/badblocks.c:1070
+#: misc/badblocks.c:1077
#, c-format
msgid "can't allocate memory for test_pattern - %s"
msgstr "ne peut allouer de la mémoire pour motif_de_test - %s"
-#: misc/badblocks.c:1097
+#: misc/badblocks.c:1104
msgid "Maximum of one test_pattern may be specified in read-only mode"
msgstr "Au plus un seul motif_de_test peut être spécifé en mode lecture seule"
-#: misc/badblocks.c:1103
+#: misc/badblocks.c:1110
msgid "Random test_pattern is not allowed in read-only mode"
msgstr "Un motif_de_test aléatoire n'est pas permis en mode lecture seule"
-#: misc/badblocks.c:1117
+#: misc/badblocks.c:1124
msgid ""
"Couldn't determine device size; you must specify\n"
"the size manually\n"
@@ -3244,94 +3170,98 @@ msgstr ""
"Ne peut déterminer la taille du périphérique ; vous devez spécifier\n"
"la taille manuellement\n"
-#: misc/badblocks.c:1123
+#: misc/badblocks.c:1130
msgid "while trying to determine device size"
msgstr "lors de la tentative de détermination de la taille du périphérique"
-#: misc/badblocks.c:1128
+#: misc/badblocks.c:1135
msgid "last block"
msgstr "dernier bloc"
-#: misc/badblocks.c:1134
+#: misc/badblocks.c:1141
msgid "first block"
msgstr "premier bloc"
-#: misc/badblocks.c:1137
+#: misc/badblocks.c:1144
#, c-format
msgid "invalid starting block (%lu): must be less than %lu"
msgstr "bloc de départ invalide (%lu): doit être moins de %lu"
-#: misc/badblocks.c:1193
+#: misc/badblocks.c:1200
msgid "while creating in-memory bad blocks list"
msgstr "lors de la création en mémoire d'une liste des blocs défectueux"
-#: misc/badblocks.c:1208
+#: misc/badblocks.c:1215
msgid "while adding to in-memory bad block list"
msgstr "lors de l'ajout en mémoire à la liste des blocs défectueux"
-#: misc/badblocks.c:1232
+#: misc/badblocks.c:1239
#, c-format
msgid "Pass completed, %u bad blocks found.\n"
msgstr "Passe complétée, %u blocs défectueux repérés.\n"
#: misc/chattr.c:85
#, c-format
-msgid "Usage: %s [-RVf] [-+=AacDdijsSu] [-v version] files...\n"
-msgstr "Usage : %s [-RVf] [-+=AacDdijsSu] [-v version] fichiers...\n"
+msgid "Usage: %s [-RVf] [-+=AacDdeijsSu] [-v version] files...\n"
+msgstr "Usage : %s [-RVf] [-+=AacDdeijsSu] [-v version] fichiers...\n"
-#: misc/chattr.c:152
+#: misc/chattr.c:153
#, c-format
msgid "bad version - %s\n"
msgstr "version erronée - %s\n"
-#: misc/chattr.c:198 misc/lsattr.c:113
+#: misc/chattr.c:200 misc/lsattr.c:115
#, c-format
msgid "while trying to stat %s"
msgstr "lors de l'évaluation par stat() de %s"
-#: misc/chattr.c:204 misc/chattr.c:222
-#, c-format
-msgid "Flags of %s set as "
-msgstr "Drapeaux de %s initialisés comme "
-
-#: misc/chattr.c:214
+#: misc/chattr.c:207
#, c-format
msgid "while reading flags on %s"
msgstr "lors de la lecture des drapeaux sur %s"
-#: misc/chattr.c:231
+#: misc/chattr.c:216 misc/chattr.c:235
+#, c-format
+msgid "Clearing extent flag not supported on %s"
+msgstr "La suppression du drapeau extent n'est pas supportée sur %s"
+
+#: misc/chattr.c:221 misc/chattr.c:240
+#, c-format
+msgid "Flags of %s set as "
+msgstr "Drapeaux de %s initialisés comme "
+
+#: misc/chattr.c:249
#, c-format
msgid "while setting flags on %s"
msgstr "lors de l'initialisation des drapeaux sur %s"
-#: misc/chattr.c:239
+#: misc/chattr.c:257
#, c-format
msgid "Version of %s set as %lu\n"
msgstr "Version de %s initialisée à %lu\n"
-#: misc/chattr.c:243
+#: misc/chattr.c:261
#, c-format
msgid "while setting version on %s"
msgstr "lors de l'initialisation de la version sur %s"
-#: misc/chattr.c:263
+#: misc/chattr.c:281
#, c-format
msgid "Couldn't allocate path variable in chattr_dir_proc"
msgstr "Ne peut allouer une variable de chemin dans chattr_dir_proc"
-#: misc/chattr.c:302
+#: misc/chattr.c:320
msgid "= is incompatible with - and +\n"
msgstr "= est incompatible avec - et +\n"
-#: misc/chattr.c:310
+#: misc/chattr.c:328
msgid "Must use '-v', =, - or +\n"
msgstr "Vous devez utiliser « -v », = - ou +\n"
#: misc/dumpe2fs.c:53
#, c-format
msgid "Usage: %s [-bfhixV] [-ob superblock] [-oB blocksize] device\n"
-msgstr ""
-"Usage : %s [-bfhixV] [-ob super_bloc] [-oB taille_de_bloc] périphérique\n"
+msgstr "Usage : %s [-bfhixV] [-ob super_bloc] [-oB taille_de_bloc] périphérique\n"
#: misc/dumpe2fs.c:168
#, c-format
@@ -3413,32 +3343,32 @@ msgstr " Blocs libres
msgid " Free inodes: "
msgstr " I-noeuds libres : "
-#: misc/dumpe2fs.c:264
+#: misc/dumpe2fs.c:268
msgid "while printing bad block list"
msgstr "lors de l'affichage de la liste des blocs défectueux"
-#: misc/dumpe2fs.c:270
+#: misc/dumpe2fs.c:274
#, c-format
msgid "Bad blocks: %u"
msgstr "Blocs défectueux : %u"
-#: misc/dumpe2fs.c:292 misc/tune2fs.c:279
+#: misc/dumpe2fs.c:297 misc/tune2fs.c:281
msgid "while reading journal inode"
msgstr "lors de la lecture de l'i-noeud du journal"
-#: misc/dumpe2fs.c:295
+#: misc/dumpe2fs.c:300
msgid "Journal size: "
msgstr "Taille du journal: "
-#: misc/dumpe2fs.c:319 misc/tune2fs.c:200
+#: misc/dumpe2fs.c:324 misc/tune2fs.c:202
msgid "while reading journal superblock"
msgstr "lors de la lecture du journal du superbloc"
-#: misc/dumpe2fs.c:327
+#: misc/dumpe2fs.c:332
msgid "Couldn't find journal superblock magic numbers"
msgstr "Ne peut trouver les numéros magique du superbloc du journal"
-#: misc/dumpe2fs.c:331
+#: misc/dumpe2fs.c:336
#, c-format
msgid ""
"\n"
@@ -3457,27 +3387,27 @@ msgstr ""
"Début du journal : %u\n"
"Nombre d'utilisateurs du journal : %u\n"
-#: misc/dumpe2fs.c:344
+#: misc/dumpe2fs.c:349
#, c-format
msgid "Journal users: %s\n"
msgstr "Usagers du journal : %s\n"
-#: misc/dumpe2fs.c:360 misc/mke2fs.c:693 misc/tune2fs.c:868
+#: misc/dumpe2fs.c:365 misc/mke2fs.c:693 misc/tune2fs.c:872
#, c-format
msgid "Couldn't allocate memory to parse options!\n"
msgstr "Impossible d'allouer de la mémoire pour analyser les options !\n"
-#: misc/dumpe2fs.c:386
+#: misc/dumpe2fs.c:391
#, c-format
msgid "Invalid superblock parameter: %s\n"
msgstr "Paramètre de superbloc invalide : %s\n"
-#: misc/dumpe2fs.c:401
+#: misc/dumpe2fs.c:406
#, c-format
msgid "Invalid blocksize parameter: %s\n"
msgstr "Paramètre de taille de bloc invalide : %s\n"
-#: misc/dumpe2fs.c:412
+#: misc/dumpe2fs.c:417
#, c-format
msgid ""
"\n"
@@ -3501,18 +3431,18 @@ msgstr ""
"\tblocksize=<taille de bloc>\n"
"\n"
-#: misc/dumpe2fs.c:471 misc/mke2fs.c:1355
+#: misc/dumpe2fs.c:476 misc/mke2fs.c:1355
#, c-format
msgid "\tUsing %s\n"
msgstr "\tUtilisation de %s\n"
-#: misc/dumpe2fs.c:507 misc/e2image.c:674 misc/tune2fs.c:1518
-#: resize/main.c:311
+#: misc/dumpe2fs.c:512 misc/e2image.c:681 misc/tune2fs.c:1535
+#: resize/main.c:312
#, c-format
msgid "Couldn't find valid filesystem superblock.\n"
msgstr "Impossible de trouver un superbloc de système de fichiers valide.\n"
-#: misc/dumpe2fs.c:532
+#: misc/dumpe2fs.c:537
#, c-format
msgid ""
"\n"
@@ -3533,8 +3463,7 @@ msgstr "Ne peut allouer un tampon d'en-t
#: misc/e2image.c:83
#, c-format
msgid "short write (only %d bytes) for writing image header"
-msgstr ""
-"écriture écourtée (seulement %d octets) pour l'écriture de l'en-tête image"
+msgstr "écriture écourtée (seulement %d octets) pour l'écriture de l'en-tête image"
#: misc/e2image.c:102
msgid "while writing superblock"
@@ -3572,7 +3501,7 @@ msgstr "e2label
msgid "e2label: not an ext2 filesystem\n"
msgstr "e2label : n'est pas un système de fichiers ext2\n"
-#: misc/e2label.c:96 misc/tune2fs.c:1653
+#: misc/e2label.c:96 misc/tune2fs.c:1670
#, c-format
msgid "Warning: label too long, truncating.\n"
msgstr "Avertissement : étiquette trop longue, sera tronquée.\n"
@@ -3587,7 +3516,7 @@ msgstr "e2label
msgid "e2label: error writing superblock\n"
msgstr "e2label : erreur lors de l'écriture du superbloc\n"
-#: misc/e2label.c:116 misc/tune2fs.c:541
+#: misc/e2label.c:116 misc/tune2fs.c:542
#, c-format
msgid "Usage: e2label device [newlabel]\n"
msgstr "Usage : e2label périphérique [nouvelle_étiquette]\n"
@@ -3627,8 +3556,7 @@ msgstr "Erreur lors la d
#: misc/e2undo.c:173
msgid "e2undo should only be run on unmounted file system\n"
-msgstr ""
-"e2undo ne devrait être lancé que sur un système de fichiers non monté\n"
+msgstr "e2undo ne devrait être lancé que sur un système de fichiers non monté\n"
#: misc/e2undo.c:182
#, c-format
@@ -3645,17 +3573,17 @@ msgstr "Rejeu de la transaction de taille %zd
msgid "Failed write %s\n"
msgstr "Échec écriture %s\n"
-#: misc/fsck.c:347
+#: misc/fsck.c:343
#, c-format
msgid "WARNING: couldn't open %s: %s\n"
msgstr "AVERTISSEMENT : impossible d'ouvrir %s : %s\n"
-#: misc/fsck.c:357
+#: misc/fsck.c:353
#, c-format
msgid "WARNING: bad format on line %d of %s\n"
msgstr "AVERTISSEMENT : format erroné sur la ligne %d de %s\n"
-#: misc/fsck.c:372
+#: misc/fsck.c:368
msgid ""
"\a\a\aWARNING: Your /etc/fstab does not contain the fsck passno\n"
"\tfield. I will kludge around things for you, but you\n"
@@ -3668,39 +3596,37 @@ msgstr ""
"\tpossible.\n"
"\n"
-#: misc/fsck.c:481
+#: misc/fsck.c:477
#, c-format
msgid "fsck: %s: not found\n"
msgstr "fsck : %s : non trouvé\n"
-#: misc/fsck.c:597
+#: misc/fsck.c:593
#, c-format
msgid "%s: wait: No more child process?!?\n"
msgstr "%s : wait : plus de processus fils ?!?\n"
-#: misc/fsck.c:619
+#: misc/fsck.c:615
#, c-format
msgid "Warning... %s for device %s exited with signal %d.\n"
-msgstr ""
-"Avertissement... %s pour le périphérique %s s'est terminé avec le signal %"
-"d.\n"
+msgstr "Avertissement... %s pour le périphérique %s s'est terminé avec le signal %d.\n"
-#: misc/fsck.c:625
+#: misc/fsck.c:621
#, c-format
msgid "%s %s: status is %x, should never happen.\n"
msgstr "%s %s : l'état est %x, ne devrait jamais se produire.\n"
-#: misc/fsck.c:664
+#: misc/fsck.c:660
#, c-format
msgid "Finished with %s (exit status %d)\n"
msgstr "Terminé avec %s (état de fin d'exécution %d)\n"
-#: misc/fsck.c:724
+#: misc/fsck.c:720
#, c-format
msgid "%s: Error %d while executing fsck.%s for %s\n"
msgstr "%s : Erreur %d lors de l'exécution de fsck.%s pour %s\n"
-#: misc/fsck.c:745
+#: misc/fsck.c:741
msgid ""
"Either all or none of the filesystem types passed to -t must be prefixed\n"
"with 'no' or '!'.\n"
@@ -3708,47 +3634,39 @@ msgstr ""
"Soit tous ou aucun des types de systèmes de fichiers passés à -t doivent\n"
"être préfixés par « no » ou « ! ».\n"
-#: misc/fsck.c:764
+#: misc/fsck.c:760
msgid "Couldn't allocate memory for filesystem types\n"
-msgstr ""
-"Impossible d'allouer de la mémoire pour les types de systèmes de fichiers\n"
+msgstr "Impossible d'allouer de la mémoire pour les types de systèmes de fichiers\n"
-#: misc/fsck.c:887
+#: misc/fsck.c:883
#, c-format
-msgid ""
-"%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
-"number\n"
-msgstr ""
-"%s: saut de la mauvaise ligne de /etc/fstab: montage « bind » avec un numéro "
-"de passe fsck non nul\n"
+msgid "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number\n"
+msgstr "%s: saut de la mauvaise ligne de /etc/fstab: montage « bind » avec un numéro de passe fsck non nul\n"
-#: misc/fsck.c:914
+#: misc/fsck.c:910
#, c-format
msgid "fsck: cannot check %s: fsck.%s not found\n"
msgstr "fsck : ne peut pas vérifier %s : fsck.%s non trouvé\n"
-#: misc/fsck.c:970
+#: misc/fsck.c:966
msgid "Checking all file systems.\n"
msgstr "Vérification de tous les systèmes de fichiers.\n"
-#: misc/fsck.c:1061
+#: misc/fsck.c:1057
#, c-format
msgid "--waiting-- (pass %d)\n"
msgstr "--en attente-- (passe %d)\n"
-#: misc/fsck.c:1081
-msgid ""
-"Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
-msgstr ""
-"Usage : fsck [-AMNPRTV] [ -C [ fd ] ] [-t type_sys_fichiers] "
-"[options_sys_fichiers] [sys_fichiers...]\n"
+#: misc/fsck.c:1077
+msgid "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
+msgstr "Usage : fsck [-AMNPRTV] [ -C [ fd ] ] [-t type_sys_fichiers] [options_sys_fichiers] [sys_fichiers...]\n"
-#: misc/fsck.c:1123
+#: misc/fsck.c:1119
#, c-format
msgid "%s: too many devices\n"
msgstr "%s : trop de périphériques\n"
-#: misc/fsck.c:1156 misc/fsck.c:1242
+#: misc/fsck.c:1152 misc/fsck.c:1238
#, c-format
msgid "%s: too many arguments\n"
msgstr "%s : trop d'arguments\n"
@@ -3769,7 +3687,7 @@ msgid "While reading version on %s"
msgstr "Lors de la lecture de la version sur %s"
#: misc/mke2fs.c:104
-#, fuzzy, c-format
+#, c-format
msgid ""
"Usage: %s [-c|-l filename] [-b block-size] [-f fragment-size]\n"
"\t[-i bytes-per-inode] [-I inode-size] [-J journal-options]\n"
@@ -3781,12 +3699,12 @@ msgid ""
msgstr ""
"Usage : %s [-c|-l nom-de-fichier] [-b taille-de-bloc]\n"
"\t[-f taille-de-fragment] [-i octets-par-i-noeud] [-I taille-des-i-noeuds]\n"
-"\t[-J options-de-journal] [-G taille-meta-groupe] [-N nombre-d-i-noeuds]\n"
+"\t[-J options-de-journal] [-G taille-méta-groupe] [-N nombre-d-i-noeuds]\n"
"\t[-m pourcentage-de-blocs-réservés]\n"
"\t[-o système-d-exploitation-de-création] [-g blocs-par-groupe]\n"
"\t[-L étiquette-du-volume] [-M dernier-répertoire-monté]\n"
"\t[-O fonctionnalité[,...]] [-r révision-du-système-de-fichier]\n"
-"\t[-E option-étendue[,...]] [-T type-système-fichier]\n"
+"\t[-E option-étendue[,...]] [-T type-système-fichier] [-U UUID]\n"
"\t[-jnqvFSV] périphérique [nombre-de-blocs]\n"
#: misc/mke2fs.c:206
@@ -3801,22 +3719,17 @@ msgstr "durant la tentative d'ex
#: misc/mke2fs.c:217
msgid "while processing list of bad blocks from program"
-msgstr ""
-"lors du traitement de la liste des blocs défectueux à partir du programme"
+msgstr "lors du traitement de la liste des blocs défectueux à partir du programme"
#: misc/mke2fs.c:244
#, c-format
msgid "Block %d in primary superblock/group descriptor area bad.\n"
-msgstr ""
-"Bloc %d dans la zone du descripteur de superbloc/groupe primaire est "
-"défectueux.\n"
+msgstr "Bloc %d dans la zone du descripteur de superbloc/groupe primaire est défectueux.\n"
#: misc/mke2fs.c:246
#, c-format
msgid "Blocks %u through %u must be good in order to build a filesystem.\n"
-msgstr ""
-"Les blocs de %u à %u doivent être en bon état pour générer le système de "
-"fichiers.\n"
+msgstr "Les blocs de %u à %u doivent être en bon état pour générer le système de fichiers.\n"
#: misc/mke2fs.c:249
msgid "Aborting....\n"
@@ -4055,8 +3968,7 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Attention : le « stripe-width » RAID %u n'est pas multiple impair du "
-"« stride » %u.\n"
+"Attention : le « stripe-width » RAID %u n'est pas multiple impair du « stride » %u.\n"
"\n"
#: misc/mke2fs.c:856
@@ -4069,7 +3981,7 @@ msgstr ""
"\t(%s, ligne n°%d)\n"
"\t%s\n"
-#: misc/mke2fs.c:869 misc/tune2fs.c:353
+#: misc/mke2fs.c:869 misc/tune2fs.c:355
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr "Jeu d'options de système de fichiers invalide : %s\n"
@@ -4081,8 +3993,7 @@ msgid ""
"Warning! Your mke2fs.conf file does not define the %s filesystem type.\n"
msgstr ""
"\n"
-"Attention ! Votre mke2fs.conf ne précise pas le type de système de fichier "
-"de\n"
+"Attention ! Votre mke2fs.conf ne précise pas le type de système de fichier de\n"
"%s.\n"
#: misc/mke2fs.c:982
@@ -4094,50 +4005,50 @@ msgstr ""
"Il vous faut sans doute installer un fichier mke2fs.conf mis à jour.\n"
"\n"
-#: misc/mke2fs.c:1177
+#: misc/mke2fs.c:1176
#, c-format
msgid "invalid block size - %s"
msgstr "taille invalide des blocs - %s"
-#: misc/mke2fs.c:1181
+#: misc/mke2fs.c:1180
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr ""
"Avertissement : la taille de bloc %d n'est pas utilisable\n"
"sur la plupart des systèmes.\n"
-#: misc/mke2fs.c:1197
+#: misc/mke2fs.c:1196
#, c-format
msgid "invalid fragment size - %s"
msgstr "taille de fragment invalide - %s"
-#: misc/mke2fs.c:1203
+#: misc/mke2fs.c:1202
#, c-format
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr "Avertissement : fragments non supportés. L'option -f est ignorée\n"
-#: misc/mke2fs.c:1210
+#: misc/mke2fs.c:1209
msgid "Illegal number for blocks per group"
msgstr "Nombre de blocs par groupe illégal"
-#: misc/mke2fs.c:1215
+#: misc/mke2fs.c:1214
msgid "blocks per group must be multiple of 8"
msgstr "le nombre de blocs par groupe doit être un multiple de 8"
-#: misc/mke2fs.c:1223
+#: misc/mke2fs.c:1222
msgid "Illegal number for flex_bg size"
msgstr "Nombre illégal pour la taille flex_bg"
-#: misc/mke2fs.c:1229
+#: misc/mke2fs.c:1228
msgid "flex_bg size must be a power of 2"
msgstr "La taille flex_bg doit être une puissance de 2"
-#: misc/mke2fs.c:1239
+#: misc/mke2fs.c:1238
#, c-format
msgid "invalid inode ratio %s (min %d/max %d)"
msgstr "taux d'i-noeuds invalides %s (min %d/max %d)"
-#: misc/mke2fs.c:1256
+#: misc/mke2fs.c:1255
msgid "in malloc for bad_blocks_filename"
msgstr "dans malloc pour bad_blocks_filename"
@@ -4161,7 +4072,7 @@ msgstr "taille d'i-noeud invalide - %s"
msgid "bad num inodes - %s"
msgstr "mauvais nombre d'i-noeuds - %s"
-#: misc/mke2fs.c:1380 misc/mke2fs.c:2052
+#: misc/mke2fs.c:1380 misc/mke2fs.c:2068
#, c-format
msgid "while trying to open journal device %s\n"
msgstr "lors de la tentative d'ouverture du périphérique de journal %s\n"
@@ -4185,8 +4096,7 @@ msgstr "blocs de %d octets trop gros pour le syst
#: misc/mke2fs.c:1405
#, c-format
-msgid ""
-"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
+msgid "Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
msgstr ""
"Avertissement : blocs de %d octets trop gros pour le système (max %d),\n"
"poursuite forcée\n"
@@ -4209,10 +4119,9 @@ msgstr ""
"%s: La taille du périphérique %s est trop grande pour pouvoir être\n"
"\t exprimée sur 32 bits, utilisation d'une taille de bloc de %d.\n"
-#: misc/mke2fs.c:1468 resize/main.c:371
+#: misc/mke2fs.c:1468 resize/main.c:374
msgid "while trying to determine filesystem size"
-msgstr ""
-"lors de la tentative de détermination de la taille du système de fichiers"
+msgstr "lors de la tentative de détermination de la taille du système de fichiers"
#: misc/mke2fs.c:1475
msgid ""
@@ -4244,32 +4153,32 @@ msgstr "Syst
msgid "Failed to parse fs types list\n"
msgstr "Échec du parcours de la liste de types de systèmes de fichiers\n"
-#: misc/mke2fs.c:1542
+#: misc/mke2fs.c:1540
msgid "fs_types for mke2fs.conf resolution: "
msgstr "résolution de fs_types pour mke2fs.conf : "
-#: misc/mke2fs.c:1549
+#: misc/mke2fs.c:1547
#, c-format
msgid "Filesystem features not supported with revision 0 filesystems\n"
msgstr ""
"Fonctionnalités du système de fichier non supportées par les systèmes de\n"
"fichier de version 0\n"
-#: misc/mke2fs.c:1556
+#: misc/mke2fs.c:1554
#, c-format
msgid "Sparse superblocks not supported with revision 0 filesystems\n"
msgstr ""
"Les superblocs creux ne sont pas supportés par les systèmes de\n"
"fichier de version 0\n"
-#: misc/mke2fs.c:1568
+#: misc/mke2fs.c:1566
#, c-format
msgid "Journals not supported with revision 0 filesystems\n"
msgstr ""
"Les journaux ne sont pas supportés par les systèmes de\n"
"fichier de version 0\n"
-#: misc/mke2fs.c:1586
+#: misc/mke2fs.c:1584
#, c-format
msgid ""
"The resize_inode and meta_bg features are not compatible.\n"
@@ -4278,43 +4187,40 @@ msgstr ""
"Les fonctionnalités resize_inode et meta_bg ne sont pas compatibles.\n"
"Elles ne peuvent pas être activées simultanément.\n"
-#: misc/mke2fs.c:1603
+#: misc/mke2fs.c:1601
msgid "while trying to determine hardware sector size"
-msgstr ""
-"lors de la tentative de détermination de la taille matérielle de secteur"
+msgstr "lors de la tentative de détermination de la taille matérielle de secteur"
-#: misc/mke2fs.c:1661
+#: misc/mke2fs.c:1658
msgid "reserved online resize blocks not supported on non-sparse filesystem"
msgstr ""
"la réservation de blocs de changement de taille en ligne n'est pas\n"
"supportée sur un système de fichiers non creux"
-#: misc/mke2fs.c:1670
+#: misc/mke2fs.c:1667
msgid "blocks per group count out of range"
msgstr "compteur de blocs par groupe hors limite"
-#: misc/mke2fs.c:1685
+#: misc/mke2fs.c:1682
msgid "Flex_bg feature not enabled, so flex_bg size may not be specified"
-msgstr ""
-"La fonctionnalité flex_bg n'est pas activée, la taille flex_bg ne peut donc "
-"pas être spécifiée"
+msgstr "La fonctionnalité flex_bg n'est pas activée, la taille flex_bg ne peut donc pas être spécifiée"
-#: misc/mke2fs.c:1697
+#: misc/mke2fs.c:1694
#, c-format
msgid "invalid inode size %d (min %d/max %d)"
msgstr "taille d'i-noeud invalide %d (min %d/max %d)"
-#: misc/mke2fs.c:1711
+#: misc/mke2fs.c:1708
#, c-format
msgid "too many inodes (%llu), raise inode ratio?"
msgstr "trop d'i-noeuds (%llu), augmenter le ratio d'i-noeuds ?"
-#: misc/mke2fs.c:1716
+#: misc/mke2fs.c:1713
#, c-format
msgid "too many inodes (%llu), specify < 2^32 inodes"
msgstr "trop d'i-noeuds (%llu), indiquer < 2^32 i-noeuds"
-#: misc/mke2fs.c:1731
+#: misc/mke2fs.c:1728
#, c-format
msgid ""
"inode_size (%u) * inodes_count (%u) too big for a\n"
@@ -4325,55 +4231,58 @@ msgstr ""
"\tsystème de fichier avec %lu blocs, indiquer un ratio_i_noeud (-i)\n"
"\tplus grand ou un nombre d'i-noeud plus petit (-N).\n"
-#: misc/mke2fs.c:1828 misc/tune2fs.c:1462
+#: misc/mke2fs.c:1821 misc/tune2fs.c:1453
+msgid "Couldn't allocate memory for tdb filename\n"
+msgstr "Impossible d'allouer de la mémoire pour le nom du fichier tdb\n"
+
+#: misc/mke2fs.c:1834 misc/tune2fs.c:1475
#, c-format
msgid "while trying to delete %s"
msgstr "lors de la tentative d'effacement de %s"
-#: misc/mke2fs.c:1837
+#: misc/mke2fs.c:1844
#, c-format
msgid ""
"Overwriting existing filesystem; this can be undone using the command:\n"
" e2undo %s %s\n"
"\n"
msgstr ""
-"Écrasement du système de fichiers existant ; cela peut être défait en "
-"utilisant la commande :\n"
+"Écrasement du système de fichiers existant ; cela peut être défait en utilisant la commande :\n"
" e2undo %s %s\n"
"\n"
-#: misc/mke2fs.c:1885
+#: misc/mke2fs.c:1893
msgid "while setting up superblock"
msgstr "lors de l'initialisation du superbloc"
-#: misc/mke2fs.c:1936
+#: misc/mke2fs.c:1952
#, c-format
msgid "unknown os - %s"
msgstr "système d'exploitation inconnu - %s"
-#: misc/mke2fs.c:1990
+#: misc/mke2fs.c:2006
msgid "while trying to allocate filesystem tables"
msgstr "lors de la tentative d'allocation des tables de systèmes de fichiers"
-#: misc/mke2fs.c:2021
+#: misc/mke2fs.c:2037
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr "lors de la mise à zéro du bloc %u à la fin du système de fichiers"
-#: misc/mke2fs.c:2034
+#: misc/mke2fs.c:2050
msgid "while reserving blocks for online resize"
msgstr "lors de la réservation de blocs pour un changement de taille en ligne"
-#: misc/mke2fs.c:2045 misc/tune2fs.c:477
+#: misc/mke2fs.c:2061 misc/tune2fs.c:479
msgid "journal"
msgstr "journal"
-#: misc/mke2fs.c:2057
+#: misc/mke2fs.c:2073
#, c-format
msgid "Adding journal to device %s: "
msgstr "Ajout du journal au périphérique %s : "
-#: misc/mke2fs.c:2064
+#: misc/mke2fs.c:2080
#, c-format
msgid ""
"\n"
@@ -4382,24 +4291,29 @@ msgstr ""
"\n"
"\tlors de la tentative d'ajout d'un journal au périphérique %s"
-#: misc/mke2fs.c:2069 misc/mke2fs.c:2095 misc/tune2fs.c:506 misc/tune2fs.c:520
+#: misc/mke2fs.c:2085 misc/mke2fs.c:2117 misc/tune2fs.c:508 misc/tune2fs.c:522
#, c-format
msgid "done\n"
msgstr "complété\n"
-#: misc/mke2fs.c:2083
+#: misc/mke2fs.c:2094
+#, c-format
+msgid "Skipping journal creation in super-only mode\n"
+msgstr "Pas de création de journal en mode super-seul\n"
+
+#: misc/mke2fs.c:2105
#, c-format
msgid "Creating journal (%u blocks): "
msgstr "Création du journal (%u blocs) : "
-#: misc/mke2fs.c:2100
+#: misc/mke2fs.c:2122
#, c-format
msgid "Writing superblocks and filesystem accounting information: "
msgstr ""
"Écriture des superblocs et de l'information de comptabilité du système de\n"
"fichiers : "
-#: misc/mke2fs.c:2105
+#: misc/mke2fs.c:2127
#, c-format
msgid ""
"\n"
@@ -4408,7 +4322,7 @@ msgstr ""
"\n"
"Attention, des problèmes sont survenus lors de l'écriture des superblocs."
-#: misc/mke2fs.c:2108
+#: misc/mke2fs.c:2130
#, c-format
msgid ""
"done\n"
@@ -4460,7 +4374,7 @@ msgstr "%s: h=%3d s=%3d c=%4d d
msgid "Please run e2fsck on the filesystem.\n"
msgstr "SVP exécutez e2fsck sur le système de fichiers.\n"
-#: misc/tune2fs.c:103
+#: misc/tune2fs.c:105
#, c-format
msgid ""
"Usage: %s [-c max_mounts_count] [-e errors_behavior] [-g group]\n"
@@ -4481,65 +4395,65 @@ msgstr ""
"\t[-E option-étendue[,...]] [-T date-de-dernière-vérification]\n"
"\t[-U UUID] [-I nouvelle-taille-i-noeuds] périphérique\n"
-#: misc/tune2fs.c:188
+#: misc/tune2fs.c:190
msgid "while trying to open external journal"
msgstr "lors de la tentative d'ouverture du journal externe"
-#: misc/tune2fs.c:192
+#: misc/tune2fs.c:194
#, c-format
msgid "%s is not a journal device.\n"
msgstr "%s n'est pas un périphérique de journal.\n"
-#: misc/tune2fs.c:207
+#: misc/tune2fs.c:209
msgid "Journal superblock not found!\n"
msgstr "Le superbloc de journal n'a pas été trouvé !\n"
-#: misc/tune2fs.c:219
+#: misc/tune2fs.c:221
msgid "Filesystem's UUID not found on journal device.\n"
msgstr ""
"L'UUID du système de fichiers n'a pas été trouvé sur le périphérique de\n"
"journal.\n"
-#: misc/tune2fs.c:240
+#: misc/tune2fs.c:242
msgid "Journal NOT removed\n"
msgstr "Le journal N'A PAS été enlevé\n"
-#: misc/tune2fs.c:246
+#: misc/tune2fs.c:248
msgid "Journal removed\n"
msgstr "Journal enlevé\n"
-#: misc/tune2fs.c:286
+#: misc/tune2fs.c:288
msgid "while reading bitmaps"
msgstr "lors de la lecture des bitmaps"
-#: misc/tune2fs.c:294
+#: misc/tune2fs.c:296
msgid "while clearing journal inode"
msgstr "lors de l'effacement de l'i-noeud du journal"
-#: misc/tune2fs.c:305
+#: misc/tune2fs.c:307
msgid "while writing journal inode"
msgstr "lors de l'écriture de l'i-noeud du journal"
-#: misc/tune2fs.c:320
+#: misc/tune2fs.c:322
#, c-format
msgid "Invalid mount option set: %s\n"
msgstr "Jeu d'options pour le montage invalide: %s\n"
-#: misc/tune2fs.c:356
+#: misc/tune2fs.c:358
#, c-format
msgid "Clearing filesystem feature '%s' not supported.\n"
msgstr ""
"La suppression de la fonctionnalité de système de fichier '%s' n'est pas\n"
"supportée.\n"
-#: misc/tune2fs.c:362
+#: misc/tune2fs.c:364
#, c-format
msgid "Setting filesystem feature '%s' not supported.\n"
msgstr ""
"L'ajout de la fonctionnalité de système de fichier '%s' n'est pas\n"
"supporté.\n"
-#: misc/tune2fs.c:371
+#: misc/tune2fs.c:373
msgid ""
"The has_journal feature may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
@@ -4547,7 +4461,7 @@ msgstr ""
"La fonctionnalitié has_journal peut être désactivée uniquement lorsque le\n"
"système de fichiers est démonté ou monté en lecture seule.\n"
-#: misc/tune2fs.c:379
+#: misc/tune2fs.c:381
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
@@ -4555,14 +4469,13 @@ msgstr ""
"Le drapeau needs_recovery est activé. SVP exécutez e2fsck avant\n"
"de désactiver le drapeau has_journal.\n"
-#: misc/tune2fs.c:412
+#: misc/tune2fs.c:414
msgid ""
"Clearing the flex_bg flag would cause the the filesystem to be\n"
"inconsistent.\n"
-msgstr ""
-"Effacer le drapeau flex_bg rendrait le système de fichiers incohérent.\n"
+msgstr "Effacer le drapeau flex_bg rendrait le système de fichiers incohérent.\n"
-#: misc/tune2fs.c:423
+#: misc/tune2fs.c:425
msgid ""
"The huge_file feature may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
@@ -4570,16 +4483,16 @@ msgstr ""
"La fonctionnalité huge_file peut être désactivée uniquement lorsque le\n"
"système de fichiers est démonté ou monté en lecture seule.\n"
-#: misc/tune2fs.c:451
+#: misc/tune2fs.c:453
#, c-format
msgid "(and reboot afterwards!)\n"
msgstr "(et rebootez après !)\n"
-#: misc/tune2fs.c:472
+#: misc/tune2fs.c:474
msgid "The filesystem already has a journal.\n"
msgstr "Le système de fichiers a déjà un journal.\n"
-#: misc/tune2fs.c:490
+#: misc/tune2fs.c:492
#, c-format
msgid ""
"\n"
@@ -4588,21 +4501,21 @@ msgstr ""
"\n"
"\tlors de la tentative d'ouverture du journal sur %s\n"
-#: misc/tune2fs.c:494
+#: misc/tune2fs.c:496
#, c-format
msgid "Creating journal on device %s: "
msgstr "Création du journal sur le périphérique %s : "
-#: misc/tune2fs.c:502
+#: misc/tune2fs.c:504
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr "lors de l'ajout du système de fichiers au journal sur %s"
-#: misc/tune2fs.c:508
+#: misc/tune2fs.c:510
msgid "Creating journal inode: "
msgstr "Création de l'i-noeud du journal : "
-#: misc/tune2fs.c:517
+#: misc/tune2fs.c:519
msgid ""
"\n"
"\twhile trying to create journal file"
@@ -4610,85 +4523,85 @@ msgstr ""
"\n"
"\tlors de la tentative de création du fichier journal"
-#: misc/tune2fs.c:584
+#: misc/tune2fs.c:585
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr "Ne peut analyser la spécification de date/heure : %s"
-#: misc/tune2fs.c:608 misc/tune2fs.c:621
+#: misc/tune2fs.c:609 misc/tune2fs.c:622
#, c-format
msgid "bad mounts count - %s"
msgstr "compteur de montages erroné - %s"
-#: misc/tune2fs.c:637
+#: misc/tune2fs.c:638
#, c-format
msgid "bad error behavior - %s"
msgstr "mauvais comportement en cas d'erreur - %s"
-#: misc/tune2fs.c:664
+#: misc/tune2fs.c:665
#, c-format
msgid "bad gid/group name - %s"
msgstr "nom gid/groupe erroné - %s"
-#: misc/tune2fs.c:697
+#: misc/tune2fs.c:698
#, c-format
msgid "bad interval - %s"
msgstr "intervalle erroné - %s"
-#: misc/tune2fs.c:725
+#: misc/tune2fs.c:727
#, c-format
msgid "bad reserved block ratio - %s"
msgstr "taux de blocs réservés erroné - %s"
-#: misc/tune2fs.c:740
+#: misc/tune2fs.c:742
msgid "-o may only be specified once"
msgstr "-o ne peut être spécifié qu'une fois"
-#: misc/tune2fs.c:750
+#: misc/tune2fs.c:752
msgid "-O may only be specified once"
msgstr "-O ne peut être spécifié qu'une fois"
-#: misc/tune2fs.c:760
+#: misc/tune2fs.c:762
#, c-format
msgid "bad reserved blocks count - %s"
msgstr "compteur de blocs réservés erroné - %s"
-#: misc/tune2fs.c:789
+#: misc/tune2fs.c:791
#, c-format
msgid "bad uid/user name - %s"
msgstr "nom utilisateur/uid erroné - %s"
-#: misc/tune2fs.c:806
+#: misc/tune2fs.c:808
#, c-format
msgid "bad inode size - %s"
msgstr "taille d'i-noeud invalide - %s"
-#: misc/tune2fs.c:813
+#: misc/tune2fs.c:815
#, c-format
msgid "Inode size must be a power of two- %s"
msgstr "La taille des i-noeuds doit être une puissance de deux - %s"
-#: misc/tune2fs.c:900
+#: misc/tune2fs.c:904
#, c-format
msgid "Invalid RAID stride: %s\n"
msgstr "Paramètre « stride RAID » invalide : %s\n"
-#: misc/tune2fs.c:915
+#: misc/tune2fs.c:919
#, c-format
msgid "Invalid RAID stripe-width: %s\n"
msgstr "Paramètre « stripe-width RAID » invalide : %s\n"
-#: misc/tune2fs.c:930
+#: misc/tune2fs.c:934
#, c-format
msgid "Invalid hash algorithm: %s\n"
msgstr "Algorithme de hachage invalide : %s\n"
-#: misc/tune2fs.c:936
+#: misc/tune2fs.c:940
#, c-format
msgid "Setting default hash algorithm to %s (%d)\n"
msgstr "Définition de l'algorithme de hachage par défaut à %s (%d)\n"
-#: misc/tune2fs.c:944
+#: misc/tune2fs.c:948
#, c-format
msgid ""
"\n"
@@ -4717,72 +4630,72 @@ msgstr ""
"\ttest_fs\n"
"\t^test_fs\n"
-#: misc/tune2fs.c:1384 misc/tune2fs.c:1389 resize/resize2fs.c:760
+#: misc/tune2fs.c:1388 misc/tune2fs.c:1393 resize/resize2fs.c:790
msgid "blocks to be moved"
msgstr "blocs à déplacer"
-#: misc/tune2fs.c:1471
-#, fuzzy, c-format
+#: misc/tune2fs.c:1485
+#, c-format
msgid ""
"To undo the tune2fs operation please run the command\n"
" e2undo %s %s\n"
"\n"
msgstr ""
-"Pour défaire les opérations de tune2fs, veuillez lancer la commande\n"
+"Pour défaire l'opération de tune2fs, veuillez lancer la commande\n"
" e2undo %s %s\n"
"\n"
-#: misc/tune2fs.c:1529
+#: misc/tune2fs.c:1546
#, c-format
-msgid "The inode size is already %d\n"
-msgstr "La taille des i-noeuds est déjà %d\n"
+msgid "The inode size is already %lu\n"
+msgstr "La taille des i-noeuds est déjà %lu\n"
-#: misc/tune2fs.c:1534
+#: misc/tune2fs.c:1551
#, c-format
msgid "Shrinking the inode size is not supported\n"
msgstr "La réduction de la taille des i-noeuds n'est pas supportée\n"
-#: misc/tune2fs.c:1577
+#: misc/tune2fs.c:1594
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr "Initialisation du nombre maximal de montages à %d\n"
-#: misc/tune2fs.c:1583
+#: misc/tune2fs.c:1600
#, c-format
msgid "Setting current mount count to %d\n"
msgstr "Initialisation du nombre courant de montages à %d\n"
-#: misc/tune2fs.c:1588
+#: misc/tune2fs.c:1605
#, c-format
msgid "Setting error behavior to %d\n"
msgstr "Initialisation du comportement en cas d'erreur à %d\n"
-#: misc/tune2fs.c:1593
+#: misc/tune2fs.c:1610
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr "Initialisation du gid des blocs réservés à %lu\n"
-#: misc/tune2fs.c:1598
+#: misc/tune2fs.c:1615
#, c-format
msgid "Setting interval between checks to %lu seconds\n"
msgstr "Initialisation de l'intervalle de vérification à %lu secondes\n"
-#: misc/tune2fs.c:1605
+#: misc/tune2fs.c:1622
#, c-format
msgid "Setting reserved blocks percentage to %g%% (%u blocks)\n"
msgstr "Initialisation du pourcentage de blocs réservés à %g%% (%u blocs)\n"
-#: misc/tune2fs.c:1612
+#: misc/tune2fs.c:1629
#, c-format
msgid "reserved blocks count is too big (%lu)"
msgstr "compteur de blocs réservés est trop grand (%lu)"
-#: misc/tune2fs.c:1618
+#: misc/tune2fs.c:1635
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr "Initialisation du compteur des blocs réservés à %lu\n"
-#: misc/tune2fs.c:1624
+#: misc/tune2fs.c:1641
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
@@ -4790,7 +4703,7 @@ msgstr ""
"\n"
"Le système de fichiers a déjà des superblocs creux.\n"
-#: misc/tune2fs.c:1631
+#: misc/tune2fs.c:1648
#, c-format
msgid ""
"\n"
@@ -4799,7 +4712,7 @@ msgstr ""
"\n"
"Drapeau de superbloc creux activé. %s"
-#: misc/tune2fs.c:1636
+#: misc/tune2fs.c:1653
msgid ""
"\n"
"Clearing the sparse superflag not supported.\n"
@@ -4807,35 +4720,37 @@ msgstr ""
"\n"
"La suppression du superflag creux n'est pas supportée.\n"
-#: misc/tune2fs.c:1643
+#: misc/tune2fs.c:1660
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr ""
"Initialisation de la date de la dernière vérification du système de\n"
"fichiers à %s\n"
-#: misc/tune2fs.c:1649
+#: misc/tune2fs.c:1666
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr "Initialisation de l'uid de blocs réservés à %lu\n"
-#: misc/tune2fs.c:1700
+#: misc/tune2fs.c:1717
msgid "Invalid UUID format\n"
msgstr "Format UUID invalide\n"
-#: misc/tune2fs.c:1712
+#: misc/tune2fs.c:1729
msgid "The inode size may only be changed when the filesystem is unmounted.\n"
msgstr ""
"La taille des i-noeuds ne peut être changée que lorsque le système\n"
"de fichiers et démonté.\n"
-#: misc/tune2fs.c:1719
+#: misc/tune2fs.c:1736
msgid ""
"Changing the inode size not supported for filesystems with the flex_bg\n"
"feature enabled.\n"
msgstr ""
+"Changer la taille des i-noeuds n'est pas supporté pour les systèmes de\n"
+"fichiers avec la fonctionalité flex_bg activée.\n"
-#: misc/tune2fs.c:1731
+#: misc/tune2fs.c:1748
msgid ""
"Error in resizing the inode size.\n"
"Run e2undo to undo the file system changes. \n"
@@ -4843,17 +4758,17 @@ msgstr ""
"Erreur lors du changement de la taille des i-noeuds.\n"
"Exécutez e2undo pour défaire les changements du système de fichiers. \n"
-#: misc/tune2fs.c:1735
+#: misc/tune2fs.c:1752
#, c-format
msgid "Setting inode size %lu\n"
msgstr "Définition de la taille des i-noeuds à %lu\n"
-#: misc/tune2fs.c:1745
+#: misc/tune2fs.c:1762
#, c-format
msgid "Setting stride size to %d\n"
msgstr "Définition de la taille de « stride » à %d\n"
-#: misc/tune2fs.c:1750
+#: misc/tune2fs.c:1767
#, c-format
msgid "Setting stripe width to %d\n"
msgstr "Définition de la taille du « stripe width » à %d\n"
@@ -5029,17 +4944,17 @@ msgstr "Passe inconnue
msgid "Begin pass %d (max = %lu)\n"
msgstr "Début de la passe %d (max = %lu)\n"
-#: resize/main.c:264
+#: resize/main.c:265
#, c-format
msgid "while opening %s"
msgstr "lors de l'ouverture de %s"
-#: resize/main.c:276
+#: resize/main.c:277
#, c-format
msgid "while getting stat information for %s"
msgstr "lors de la récupérartion de l'état de %s"
-#: resize/main.c:337
+#: resize/main.c:338
#, c-format
msgid ""
"%s: The combination of flex_bg and\n"
@@ -5048,21 +4963,26 @@ msgstr ""
"%s : La combinaison des fonctionnalités\n"
"\tflex_bg et !resize_inode n'est pas supportée par resize2fs.\n"
-#: resize/main.c:345
+#: resize/main.c:348
#, c-format
msgid "Estimated minimum size of the filesystem: %u\n"
msgstr "Taille minimale estimée du système de fichiers : %u\n"
-#: resize/main.c:381
-#, fuzzy, c-format
+#: resize/main.c:384
+#, c-format
msgid "Invalid new size: %s\n"
-msgstr "taille d'i-noeud invalide - %s"
+msgstr "taille d'i-noeud invalide - %s\n"
+
+#: resize/main.c:396
+#, c-format
+msgid "New size smaller than minimum (%u)\n"
+msgstr "La nouvelle taille est plus petit que le minimum (%u)\n"
-#: resize/main.c:394
+#: resize/main.c:402
msgid "Invalid stride length"
msgstr "Longueur « stride » invalide"
-#: resize/main.c:418
+#: resize/main.c:426
#, c-format
msgid ""
"The containing partition (or device) is only %u (%dk) blocks.\n"
@@ -5073,7 +4993,7 @@ msgstr ""
"Vous avez demandé une nouvelle taille de %u blocs.\n"
"\n"
-#: resize/main.c:425
+#: resize/main.c:433
#, c-format
msgid ""
"The filesystem is already %u blocks long. Nothing to do!\n"
@@ -5082,7 +5002,7 @@ msgstr ""
"Le système de fichiers a déjà %u blocs. Rien à modifier !\n"
"\n"
-#: resize/main.c:436
+#: resize/main.c:444
#, c-format
msgid ""
"Please run 'e2fsck -f %s' first.\n"
@@ -5091,12 +5011,26 @@ msgstr ""
"SVP exécutez « e2fsck -f %s » d'abord.\n"
"\n"
-#: resize/main.c:447
+#: resize/main.c:448
+#, c-format
+msgid "Resizing the filesystem on %s to %u (%dk) blocks.\n"
+msgstr "En train de retailler le système de fichiers sur %s à %u (%dk) blocs.\n"
+
+#: resize/main.c:457
#, c-format
msgid "while trying to resize %s"
msgstr "lors de la tentative de changement de taille de %s"
-#: resize/main.c:452
+#: resize/main.c:460
+#, c-format
+msgid ""
+"Please run 'e2fsck -fy %s' to fix the filesystem\n"
+"after the aborted resize operation.\n"
+msgstr ""
+"Veuillez lancer 'e2fsck -fy %s' pour corriger le système de fichier\n"
+"après l'opération de changement de taille avortée.\n"
+
+#: resize/main.c:466
#, c-format
msgid ""
"The filesystem on %s is now %u blocks long.\n"
@@ -5105,12 +5039,15 @@ msgstr ""
"Le système de fichiers %s a maintenant une taille de %u blocs.\n"
"\n"
+#: resize/main.c:481
+#, c-format
+msgid "while trying to truncate %s"
+msgstr "lors de la troncature de %s"
+
#: resize/online.c:37
#, c-format
msgid "Filesystem at %s is mounted on %s; on-line resizing required\n"
-msgstr ""
-"Le système de fichiers de %s est monté sur %s ; le changement de taille doit "
-"être effectué en ligne\n"
+msgstr "Le système de fichiers de %s est monté sur %s ; le changement de taille doit être effectué en ligne\n"
#: resize/online.c:41
#, c-format
@@ -5119,8 +5056,7 @@ msgstr "La r
#: resize/online.c:61
msgid "Filesystem does not support online resizing"
-msgstr ""
-"Le système de fichiers ne supporte pas le changement de taille en ligne"
+msgstr "Le système de fichiers ne supporte pas le changement de taille en ligne"
#: resize/online.c:68
#, c-format
@@ -5142,9 +5078,7 @@ msgstr "Lors de la v
#: resize/online.c:111
#, c-format
msgid "Performing an on-line resize of %s to %u (%dk) blocks.\n"
-msgstr ""
-"En train d'effectuer un changement de taille en ligne de %s vers %u (%dk) "
-"blocs.\n"
+msgstr "En train d'effectuer un changement de taille en ligne de %s vers %u (%dk) blocs.\n"
#: resize/online.c:121
msgid "While trying to extend the last group"
@@ -5157,47 +5091,41 @@ msgstr "Lors de la tentative d'ajout du groupe num
#: resize/online.c:191
#, c-format
-msgid ""
-"Filesystem at %s is mounted on %s, and on-line resizing is not supported on "
-"this system.\n"
-msgstr ""
-"Le système de fichiers de %s est monté sur %s, et le changement de taille en "
-"ligne n'est pas supporté sur ce système.\n"
+msgid "Filesystem at %s is mounted on %s, and on-line resizing is not supported on this system.\n"
+msgstr "Le système de fichiers de %s est monté sur %s, et le changement de taille en ligne n'est pas supporté sur ce système.\n"
-#: resize/resize2fs.c:322
+#: resize/resize2fs.c:350
#, c-format
msgid "inodes (%llu) must be less than %u"
msgstr "le nombre d'i-noeuds (%llu) doit être plus petit que %u"
-#: resize/resize2fs.c:755
+#: resize/resize2fs.c:582
msgid "reserved blocks"
msgstr "blocs réservés"
-#: resize/resize2fs.c:765
+#: resize/resize2fs.c:795
msgid "meta-data blocks"
msgstr "blocs de métadonnées"
-#: resize/resize2fs.c:1703
+#: resize/resize2fs.c:1752
#, c-format
msgid "Should never happen: resize inode corrupt!\n"
-msgstr ""
-"Ne devrait jamais se produire : i-noeud de redimensionnement corrompu !\n"
+msgstr "Ne devrait jamais se produire : i-noeud de redimensionnement corrompu !\n"
#~ msgid "@S doesn't have has_ at j flag, but has ext3 @j %s.\n"
-#~ msgstr ""
-#~ "Le @S ne semble pas avoir le drapeau has_journal, mais a un %s de @j "
-#~ "ext3.\n"
+#~ msgstr "Le @S ne semble pas avoir le drapeau has_journal, mais a un %s de @j ext3.\n"
#~ msgid "Error while deleting extent: %m\n"
#~ msgstr "Erreur lors de la suppression de l'extent : %m\n"
#~ msgid "Recreate journal to make the filesystem ext3 again?\n"
-#~ msgstr ""
-#~ "Recréer le journal pour rendre le système de fichier ext3 de nouveau ?\n"
+#~ msgstr "Recréer le journal pour rendre le système de fichier ext3 de nouveau ?\n"
+
+#~ msgid "bad block size - %s"
+#~ msgstr "taille des blocs défectueux - %s"
#~ msgid "while retrying to write block bitmaps for %s"
-#~ msgstr ""
-#~ "lors d'une nouvelle tentative d'écriture des bitmaps de blocs pour %s"
+#~ msgstr "lors d'une nouvelle tentative d'écriture des bitmaps de blocs pour %s"
#~ msgid "writing inode bitmaps"
#~ msgstr "l'écriture des bitmaps d'i-noeuds"
@@ -5215,8 +5143,7 @@ msgstr ""
#~ msgstr "BLKGETSIZE ioctl"
#~ msgid "Filesystem %s has unsupported features enabled.\n"
-#~ msgstr ""
-#~ "Le système de fichier %s a des fonctionnalités non supportées activées.\n"
+#~ msgstr "Le système de fichier %s a des fonctionnalités non supportées activées.\n"
#~ msgid "@a in @i %i has a hash (%N) which is @n (must be 0)\n"
#~ msgstr "l'@a dans l'@i %i a un hash (%N) qui est @n (doit être 0)\n"
@@ -5237,17 +5164,14 @@ msgstr ""
#~ msgstr "lors de l'écriture de la table d'i-noeuds (groupe %d)"
#~ msgid "Pass 0: Doing byte-swap of filesystem\n"
-#~ msgstr ""
-#~ "Passe 0 : traitement de l'échange octet par octet du système de fichiers\n"
+#~ msgstr "Passe 0 : traitement de l'échange octet par octet du système de fichiers\n"
#~ msgid ""
#~ "%s: the filesystem must be freshly checked using fsck\n"
#~ "and not mounted before trying to byte-swap it.\n"
#~ msgstr ""
-#~ "%s : le système de fichiers doit avoir été récemment vérifié en "
-#~ "utilisant\n"
-#~ "fsck et ne doit pas avoir été monté avant d'essayer un échange par octet "
-#~ "de\n"
+#~ "%s : le système de fichiers doit avoir été récemment vérifié en utilisant\n"
+#~ "fsck et ne doit pas avoir été monté avant d'essayer un échange par octet de\n"
#~ "celui-ci.\n"
#~ msgid "Byte swap"
@@ -5259,13 +5183,10 @@ msgstr ""
#~ "cette version d'e2fsck\n"
#~ msgid "Incompatible options not allowed when byte-swapping.\n"
-#~ msgstr ""
-#~ "Les options incompatibles ne sont pas autorisées lors de l'échanges "
-#~ "d'octets.\n"
+#~ msgstr "Les options incompatibles ne sont pas autorisées lors de l'échanges d'octets.\n"
#~ msgid "%s: Filesystem byte order already normalized.\n"
-#~ msgstr ""
-#~ "%s : l'ordre des octets du système de fichiers a déjà été normalisé.\n"
+#~ msgstr "%s : l'ordre des octets du système de fichiers a déjà été normalisé.\n"
#~ msgid "invalid test_pattern: %s\n"
#~ msgstr "motif_de_test invalide : %s\n"
@@ -5297,8 +5218,7 @@ msgstr ""
#~ msgid "Warning: %d-byte inodes not usable on older systems\n"
#~ msgstr ""
-#~ "Avertissement : les i-noeuds de %d octets ne sont pas utilisables sur "
-#~ "les\n"
+#~ "Avertissement : les i-noeuds de %d octets ne sont pas utilisables sur les\n"
#~ "anciens systèmes\n"
#~ msgid "bad filesystem size - %s"
@@ -5346,16 +5266,13 @@ msgstr ""
#~ "\tea_ver=<ea_version (1 or 2)\n"
#~ "\n"
#~ msgstr ""
-#~ "Les options étendues sont séparées par des virgules, et peuvent prendre "
-#~ "un argument\n"
-#~ "lequel peut être initialisé par un signe d'égalité ('='). Les options "
-#~ "RAID valides sont:\n"
+#~ "Les options étendues sont séparées par des virgules, et peuvent prendre un argument\n"
+#~ "lequel peut être initialisé par un signe d'égalité ('='). Les options RAID valides sont:\n"
#~ "\tea_ver=<ea_version (1 or 2)\n"
#~ "\n"
#~ msgid "Usage: findsuper device [skipbytes [startkb]]\n"
-#~ msgstr ""
-#~ "Usage : findsuper périphérique [octets_à_escamoter [début_en_Ko]]\n"
+#~ msgstr "Usage : findsuper périphérique [octets_à_escamoter [début_en_Ko]]\n"
#~ msgid "skipbytes should be a number, not %s\n"
#~ msgstr "octets à escamoter doit être un nombre, non pas %s\n"
@@ -5393,17 +5310,14 @@ msgstr ""
#~ msgstr ""
#~ "Usage : %s <périph1> <périph2> <périph3>\n"
#~ "\n"
-#~ "Ce programme affiche les informations des partitions pour un ensemble de "
-#~ "périphériques\n"
+#~ "Ce programme affiche les informations des partitions pour un ensemble de périphériques\n"
#~ "Une façon usuelle d'utiliser ce programme est:\n"
#~ "\n"
#~ "\t%s /dev/hda?\n"
#~ "\n"
#~ msgid "Forcibly clearing HTREE flag on @i %d (%q). (Beta test code)\n"
-#~ msgstr ""
-#~ "Forcer la mise à zéro du drapeau HTREE sur l'@i %d (%q). (Code en phase "
-#~ "beta test)\n"
+#~ msgstr "Forcer la mise à zéro du drapeau HTREE sur l'@i %d (%q). (Code en phase beta test)\n"
#~ msgid "(unknown os)"
#~ msgstr "(système d'exploitation inconnu)"
diff --git a/po/id.gmo b/po/id.gmo
index d2118f6..89ba4d9 100644
Binary files a/po/id.gmo and b/po/id.gmo differ
diff --git a/po/id.po b/po/id.po
index 122f8dd..fd52e11 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
# this file and modified versions, provided that this
# header is not removed and modified versions are marked
# as such.
-# Arif E. Nugroho <arif_endro at yahoo.com>, 2008.
+# Arif E. Nugroho <arif_endro at yahoo.com>, 2008, 2009.
#
#. The strings in e2fsck's problem.c can be very hard to translate,
#. since the strings are expanded in two different ways. First of all,
@@ -67,10 +67,10 @@
#.
msgid ""
msgstr ""
-"Project-Id-Version: e2fsprogs 1.41.1\n"
+"Project-Id-Version: e2fsprogs 1.41.8\n"
"Report-Msgid-Bugs-To: tytso at alum.mit.edu\n"
-"POT-Creation-Date: 2009-01-26 20:41-0500\n"
-"PO-Revision-Date: 2008-09-04 13:11+0700\n"
+"POT-Creation-Date: 2009-07-11 17:49-0400\n"
+"PO-Revision-Date: 2009-09-08 20:00+0700\n"
"Last-Translator: Arif E. Nugroho <arif_endro at yahoo.com>\n"
"Language-Team: Indonesian <translation-team-id at lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -91,10 +91,10 @@ msgid "while reading the bad blocks inode"
msgstr "ketika membaca inode bad block"
#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:1037 e2fsck/unix.c:1120 misc/badblocks.c:1148
-#: misc/badblocks.c:1156 misc/badblocks.c:1170 misc/badblocks.c:1182
-#: misc/dumpe2fs.c:505 misc/e2image.c:576 misc/e2image.c:672
-#: misc/e2image.c:688 misc/mke2fs.c:181 misc/tune2fs.c:1515 resize/main.c:309
+#: e2fsck/unix.c:1057 e2fsck/unix.c:1140 misc/badblocks.c:1155
+#: misc/badblocks.c:1163 misc/badblocks.c:1177 misc/badblocks.c:1189
+#: misc/dumpe2fs.c:510 misc/e2image.c:583 misc/e2image.c:679
+#: misc/e2image.c:695 misc/mke2fs.c:181 misc/tune2fs.c:1532 resize/main.c:310
#, c-format
msgid "while trying to open %s"
msgstr "ketika mencoba untuk membuka %s"
@@ -115,8 +115,7 @@ msgstr "ketika memperbarui inode bad block"
#: e2fsck/badblocks.c:130
#, c-format
msgid "Warning: illegal block %u found in bad block inode. Cleared.\n"
-msgstr ""
-"Peringatan: illegal block %u ditemukan dalam inode bad block. Dihapus.\n"
+msgstr "Peringatan: illegal block %u ditemukan dalam inode bad block. Dihapus.\n"
#: e2fsck/ehandler.c:54
#, c-format
@@ -189,21 +188,21 @@ msgstr "BLKFLSBUF ioctl tidak disupport! Tidak dapat memflush buffer.\n"
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr "Penggunaan: %s [-F] [-I inode_buffer_block] perangkat\n"
-#: e2fsck/iscan.c:83 e2fsck/unix.c:818
+#: e2fsck/iscan.c:83 e2fsck/unix.c:817
#, c-format
msgid "while opening %s for flushing"
msgstr "ketika membuka %s untuk flushing"
-#: e2fsck/iscan.c:88 e2fsck/unix.c:824 resize/main.c:285
+#: e2fsck/iscan.c:88 e2fsck/unix.c:823 resize/main.c:286
#, c-format
msgid "while trying to flush %s"
msgstr "ketika mencoba untuk memflush %s"
-#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:482
+#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:489
msgid "while opening inode scan"
msgstr "ketika mencoba membuka inode scan"
-#: e2fsck/iscan.c:129 misc/e2image.c:500
+#: e2fsck/iscan.c:129 misc/e2image.c:507
msgid "while getting next inode"
msgstr "ketika memperoleh inode berikutnya"
@@ -226,17 +225,17 @@ msgstr "%s: journal superblock tidak valid ditemukan\n"
msgid "%s: journal too short\n"
msgstr "%s: journal terlalu pendek\n"
-#: e2fsck/journal.c:858
+#: e2fsck/journal.c:860
#, c-format
msgid "%s: recovering journal\n"
msgstr "%s: merecovery journal\n"
-#: e2fsck/journal.c:860
+#: e2fsck/journal.c:862
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
msgstr "%s: tidak akan melakukan journal recovery ketika read-only\n"
-#: e2fsck/journal.c:881
+#: e2fsck/journal.c:887
#, c-format
msgid "while trying to re-open %s"
msgstr "ketika mencoba untuk membuka %s"
@@ -441,30 +440,30 @@ msgstr "socket"
msgid "unknown file type with mode 0%o"
msgstr "tipe file tidak diketahui dengan mode 0%o"
-#: e2fsck/pass1b.c:215
+#: e2fsck/pass1b.c:220
msgid "multiply claimed inode map"
msgstr "multiply diklaim inode map"
-#: e2fsck/pass1b.c:567 e2fsck/pass1b.c:700
+#: e2fsck/pass1b.c:581 e2fsck/pass1b.c:714
#, c-format
msgid "internal error: can't find dup_blk for %u\n"
msgstr "internal error: tidak dapat menemukan dup_blk untuk %u\n"
-#: e2fsck/pass1b.c:743
+#: e2fsck/pass1b.c:757
msgid "returned from clone_file_block"
msgstr "kembali dari clone_file_block"
-#: e2fsck/pass1b.c:762
+#: e2fsck/pass1b.c:776
#, c-format
msgid "internal error: couldn't lookup EA block record for %u"
msgstr "internal error: tidak dapat menemukan EA block record untuk %u"
-#: e2fsck/pass1b.c:774
+#: e2fsck/pass1b.c:788
#, c-format
msgid "internal error: couldn't lookup EA inode record for %u"
msgstr "internal error: tidak dapat menemukan EA inode record untuk %u"
-#: e2fsck/pass1.c:430 e2fsck/pass2.c:780
+#: e2fsck/pass1.c:430 e2fsck/pass2.c:782
msgid "reading directory block"
msgstr "membaca direktori block"
@@ -492,39 +491,39 @@ msgstr "membuka inode scan"
msgid "getting next inode from scan"
msgstr "memperoleh inode selanjutnya dari scan"
-#: e2fsck/pass1.c:1122
+#: e2fsck/pass1.c:1123
msgid "Pass 1"
msgstr "Tahap 1"
-#: e2fsck/pass1.c:1181
+#: e2fsck/pass1.c:1180
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr "membaca indirect block dari inode %u"
-#: e2fsck/pass1.c:1225
+#: e2fsck/pass1.c:1224
msgid "bad inode map"
msgstr "inode map buruk"
-#: e2fsck/pass1.c:1247
+#: e2fsck/pass1.c:1246
msgid "inode in bad block map"
msgstr "inode dalam bad block map"
-#: e2fsck/pass1.c:1267
+#: e2fsck/pass1.c:1266
msgid "imagic inode map"
msgstr "imagic inode map"
-#: e2fsck/pass1.c:1294
+#: e2fsck/pass1.c:1293
msgid "multiply claimed block map"
msgstr "multiply diklaim block map"
-#: e2fsck/pass1.c:1393
+#: e2fsck/pass1.c:1392
msgid "ext attr block map"
msgstr "ext attr block map"
#: e2fsck/pass1.c:2134
-#, fuzzy, c-format
+#, c-format
msgid "%6lu(%c): expecting %6lu got phys %6lu (blkcnt %lld)\n"
-msgstr "%6lu: diperkirakan %6lu diperoleh phys %6lu (blkcnt %lld)\n"
+msgstr "%6lu(%c): diperkirakan %6lu diperoleh phys %6lu (blkcnt %lld)\n"
#: e2fsck/pass1.c:2449
msgid "block bitmap"
@@ -538,35 +537,35 @@ msgstr "inode bitmap"
msgid "inode table"
msgstr "inode table"
-#: e2fsck/pass2.c:284
+#: e2fsck/pass2.c:283
msgid "Pass 2"
msgstr "Tahap 2"
-#: e2fsck/pass2.c:803
+#: e2fsck/pass2.c:805
msgid "Can not continue."
msgstr "Tidak dapat melanjutkan."
-#: e2fsck/pass3.c:79
+#: e2fsck/pass3.c:76
msgid "inode done bitmap"
msgstr "inode selesai bitmap"
-#: e2fsck/pass3.c:90
+#: e2fsck/pass3.c:84
msgid "Peak memory"
msgstr "Puncak pemakaian memori"
-#: e2fsck/pass3.c:146
+#: e2fsck/pass3.c:134
msgid "Pass 3"
msgstr "Tahap 3"
-#: e2fsck/pass3.c:334
+#: e2fsck/pass3.c:320
msgid "inode loop detection bitmap"
msgstr "inode deteksi loop bitmap"
-#: e2fsck/pass4.c:196
+#: e2fsck/pass4.c:191
msgid "Pass 4"
msgstr "Tahap 4"
-#: e2fsck/pass5.c:70
+#: e2fsck/pass5.c:64
msgid "Pass 5"
msgstr "Tahap 5"
@@ -772,8 +771,7 @@ msgstr ""
"@S tidak dapat dibaca atau tidak dapat menjelaskan ext2 dengan benar\n"
"@f. Jika @v tidak valid dan ini berisi sebuah ext2\n"
"@f (dan bukan swap atau ufs atau sesuatu yang lain), maka @S\n"
-"korup, dan anda mungkin bisa mencoba menjalankan e2fsck secara alternatif "
-"@S:\n"
+"korup, dan anda mungkin bisa mencoba menjalankan e2fsck secara alternatif @S:\n"
" e2fsck -b %S <@v>\n"
"\n"
@@ -800,8 +798,7 @@ msgid ""
"from the @b size.\n"
msgstr ""
"@S @b_size = %b, fragsize = %c.\n"
-"Versi e2fsck ini tidak mengimplementasikan untuk ukuran fragment yang "
-"berbeda\n"
+"Versi e2fsck ini tidak mengimplementasikan untuk ukuran fragment yang berbeda\n"
"dari @b.\n"
#. @-expanded: superblock blocks_per_group = %b, should have been %c\n
@@ -863,9 +860,9 @@ msgstr "Hurd tidak mendukung layanan filetype.\n"
#. @-expanded: superblock has an invalid journal (inode %i).\n
#: e2fsck/problem.c:187
-#, fuzzy, c-format
+#, c-format
msgid "@S has an @n @j (@i %i).\n"
-msgstr "@S memiliki sebuah @n ext3 @j (@i %i).\n"
+msgstr "@S memiliki sebuah @n @j (@i %i).\n"
#. @-expanded: External journal has multiple filesystem users (unsupported).\n
#: e2fsck/problem.c:192
@@ -892,113 +889,91 @@ msgstr "External @j tidak melayani ini @f\n"
#. @-expanded: format.\n
#. @-expanded: It is also possible the journal superblock is corrupt.\n
#: e2fsck/problem.c:212
-#, fuzzy
msgid ""
"@f @j @S is unknown type %N (unsupported).\n"
-"It is likely that your copy of e2fsck is old and/or doesn't support this @j "
-"format.\n"
+"It is likely that your copy of e2fsck is old and/or doesn't support this @j format.\n"
"It is also possible the @j @S is corrupt.\n"
msgstr ""
-"Ext3 @j @S memiliki tipe yang tidak diketahui %N (tidak disupport).\n"
-"Ini sangan memungkinkan jika kopi dari e2fsck adalah tua dan/atau tidak "
-"melayani format @j ini.\n"
-"Ini juga mungkin jika @j @S adalah korup.\n"
+"@f @j @S memiliki tipe yang tidak diketahui %N (tidak disupport).\n"
+"Ini sangat memungkinkan jika salinan dari e2fsck sudah lama dan/atau tidak melayani format @j ini.\n"
+"Ini juga mungkin jika @j @S telah terkorupsi.\n"
#. @-expanded: journal superblock is corrupt.\n
#: e2fsck/problem.c:220
-#, fuzzy
msgid "@j @S is corrupt.\n"
-msgstr "Ext3 @j @S adalah korup.\n"
+msgstr "@j @S telah terkorupsi.\n"
#. @-expanded: superblock has_journal flag is clear, but a journal %s is present.\n
#: e2fsck/problem.c:225
-#, fuzzy, c-format
+#, c-format
msgid "@S has_ at j flag is clear, but a @j %s is present.\n"
-msgstr "ext3 tanda recovery sudah hilang, tetapi @j memiliki data.\n"
+msgstr "@S tanda has_ at j hilang, tetapi @j %s ada.\n"
#. @-expanded: superblock needs_recovery flag is set, but no journal is present.\n
#: e2fsck/problem.c:230
-#, fuzzy
msgid "@S needs_recovery flag is set, but no @j is present.\n"
-msgstr "@S memiliki ext3 tanda recovery, tetapi tidak memiliki @j.\n"
+msgstr "@S tanda needs_recovery ada, tetapi tidak memiliki @j.\n"
#. @-expanded: superblock needs_recovery flag is clear, but journal has data.\n
#: e2fsck/problem.c:235
-#, fuzzy
msgid "@S needs_recovery flag is clear, but @j has data.\n"
-msgstr "ext3 tanda recovery sudah hilang, tetapi @j memiliki data.\n"
+msgstr "@S tanda need_recovery sudah hilang, tetapi @j memiliki data.\n"
#. @-expanded: Clear journal
#: e2fsck/problem.c:240
msgid "Clear @j"
msgstr "Hapus @j"
-#. @-expanded: Run journal anyway
-#: e2fsck/problem.c:245
-msgid "Run @j anyway"
-msgstr "Jalankan @j bagaimanapun"
-
-#. @-expanded: Recovery flag not set in backup superblock, so running journal anyway.\n
-#: e2fsck/problem.c:250
-msgid "Recovery flag not set in backup @S, so running @j anyway.\n"
-msgstr ""
-"Recovery flag tidak diset dalam backup @S, jadi menjalankan @j "
-"bagaimanapun.\n"
+#. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem.
+#: e2fsck/problem.c:245 e2fsck/problem.c:647
+msgid "@f has feature flag(s) set, but is a revision 0 @f. "
+msgstr "@f memiliki feature flag(s) set, tetapi memiliki sebuah revisi 0 @f."
#. @-expanded: %s orphaned inode %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n
-#: e2fsck/problem.c:255
+#: e2fsck/problem.c:250
msgid "%s @o @i %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n"
msgstr "%s @o @i %i (uid=%Iu, gid=%Ig, mode=%Im, ukuran=%Is)\n"
#. @-expanded: illegal block #%B (%b) found in orphaned inode %i.\n
-#: e2fsck/problem.c:260
+#: e2fsck/problem.c:255
msgid "@I @b #%B (%b) found in @o @i %i.\n"
msgstr "@I @b #%B (%b) ditemukan dalam @o @i %i.\n"
#. @-expanded: Already cleared block #%B (%b) found in orphaned inode %i.\n
-#: e2fsck/problem.c:265
+#: e2fsck/problem.c:260
msgid "Already cleared @b #%B (%b) found in @o @i %i.\n"
msgstr "Sudah dihapus @b #%B (%b) ditemukan dalam @o @i %i.\n"
#. @-expanded: illegal orphaned inode %i in superblock.\n
-#: e2fsck/problem.c:270
+#: e2fsck/problem.c:265
#, c-format
msgid "@I @o @i %i in @S.\n"
msgstr "@I @o @i %i dalam @S.\n"
#. @-expanded: illegal inode %i in orphaned inode list.\n
-#: e2fsck/problem.c:275
+#: e2fsck/problem.c:270
#, c-format
msgid "@I @i %i in @o @i list.\n"
msgstr "@I @i %i dalam daftar @o @i.\n"
-#. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem.
-#: e2fsck/problem.c:280 e2fsck/problem.c:647
-msgid "@f has feature flag(s) set, but is a revision 0 @f. "
-msgstr "@f memiliki feature flag(s) set, tetapi memiliki sebuah revisi 0 @f."
-
#. @-expanded: journal superblock has an unknown read-only feature flag set.\n
-#: e2fsck/problem.c:285
-#, fuzzy
+#: e2fsck/problem.c:275
msgid "@j @S has an unknown read-only feature flag set.\n"
-msgstr "Ext3 @j @S memiliki sebuah feature yang tidak diketahui terset.\n"
+msgstr "@j @S memiliki sebuah feature yang tidak diketahui aktif.\n"
#. @-expanded: journal superblock has an unknown incompatible feature flag set.\n
-#: e2fsck/problem.c:290
-#, fuzzy
+#: e2fsck/problem.c:280
msgid "@j @S has an unknown incompatible feature flag set.\n"
-msgstr ""
-"Ext3 @j @S memiliki sebuah feature yang tidak kompatibel yang tidak "
-"diketahui yang di set.\n"
+msgstr "@j @S memiliki sebuah feature yang tidak kompatibel yang tidak diketahui aktif.\n"
#. @-expanded: journal version not supported by this e2fsck.\n
-#: e2fsck/problem.c:295
+#: e2fsck/problem.c:285
msgid "@j version not supported by this e2fsck.\n"
msgstr "versi @j tidak disupport oleh e2fsck ini.\n"
#. @-expanded: Moving journal from /%s to hidden inode.\n
#. @-expanded: \n
-#: e2fsck/problem.c:300
+#: e2fsck/problem.c:290
#, c-format
msgid ""
"Moving @j from /%s to hidden @i.\n"
@@ -1009,7 +984,7 @@ msgstr ""
#. @-expanded: Error moving journal: %m\n
#. @-expanded: \n
-#: e2fsck/problem.c:305
+#: e2fsck/problem.c:295
#, c-format
msgid ""
"Error moving @j: %m\n"
@@ -1021,7 +996,7 @@ msgstr ""
#. @-expanded: Found invalid V2 journal superblock fields (from V1 journal).\n
#. @-expanded: Clearing fields beyond the V1 journal superblock...\n
#. @-expanded: \n
-#: e2fsck/problem.c:310
+#: e2fsck/problem.c:300
msgid ""
"Found @n V2 @j @S fields (from V1 @j).\n"
"Clearing fields beyond the V1 @j @S...\n"
@@ -1031,6 +1006,16 @@ msgstr ""
"Menghapus field diatas dari V1 @j @S...\n"
"\n"
+#. @-expanded: Run journal anyway
+#: e2fsck/problem.c:306
+msgid "Run @j anyway"
+msgstr "Jalankan @j bagaimanapun"
+
+#. @-expanded: Recovery flag not set in backup superblock, so running journal anyway.\n
+#: e2fsck/problem.c:311
+msgid "Recovery flag not set in backup @S, so running @j anyway.\n"
+msgstr "Recovery flag tidak diset dalam backup @S, jadi menjalankan @j bagaimanapun.\n"
+
#. @-expanded: Backing up journal inode block information.\n
#. @-expanded: \n
#: e2fsck/problem.c:316
@@ -1122,7 +1107,7 @@ msgstr "Jurnal transaksi %i terkorupsi, balasan dibatalkan.\n"
#: e2fsck/problem.c:385
msgid "The test_fs flag is set (and ext4 is available). "
-msgstr ""
+msgstr "Tanda test_fs telah aktif (dan ext4 tersedia). "
#. @-expanded: Pass 1: Checking inodes, blocks, and sizes\n
#: e2fsck/problem.c:392
@@ -1137,8 +1122,7 @@ msgstr "@r bukan sebuah @d. "
#. @-expanded: root inode has dtime set (probably due to old mke2fs).
#: e2fsck/problem.c:401
msgid "@r has dtime set (probably due to old mke2fs). "
-msgstr ""
-"@r memiliki dtime terset (mungkin karena penggunaan mke2fs versi lama). "
+msgstr "@r memiliki dtime terset (mungkin karena penggunaan mke2fs versi lama). "
#. @-expanded: Reserved inode %i (%Q) has invalid mode.
#: e2fsck/problem.c:406
@@ -1297,16 +1281,12 @@ msgstr "Peringatan: Grup %g's @S (b) buruk.\n"
#. @-expanded: Warning: Group %g's copy of the group descriptors has a bad block (%b).\n
#: e2fsck/problem.c:535
msgid "Warning: Group %g's copy of the @g descriptors has a bad @b (%b).\n"
-msgstr ""
-"Peringatan: Grup %g's salinan dari deskripsi @g memiliki sebuah @b (%b) "
-"buruk.\n"
+msgstr "Peringatan: Grup %g's salinan dari deskripsi @g memiliki sebuah @b (%b) buruk.\n"
#. @-expanded: Programming error? block #%b claimed for no reason in process_bad_block.\n
#: e2fsck/problem.c:541
msgid "Programming error? @b #%b claimed for no reason in process_bad_ at b.\n"
-msgstr ""
-"Programming error? @b #%b terklaim untuk tidak ada alasan dalam "
-"process_bad_ at b.\n"
+msgstr "Programming error? @b #%b terklaim untuk tidak ada alasan dalam process_bad_ at b.\n"
#. @-expanded: error allocating %N contiguous block(s) in block group %g for %s: %m\n
#: e2fsck/problem.c:547
@@ -1341,7 +1321,7 @@ msgid "Warning: could not write @b %b for %s: %m\n"
msgstr "Peringatan: tidak dapat menulis @b %b untuk %s: %m\n"
#. @-expanded: error allocating inode bitmap (%N): %m\n
-#: e2fsck/problem.c:577 e2fsck/problem.c:1378
+#: e2fsck/problem.c:577 e2fsck/problem.c:1383
msgid "@A @i @B (%N): %m\n"
msgstr "@A @i @B (%N): %m\n"
@@ -1438,8 +1418,7 @@ msgstr "@i %i adalah bagian dari daftar @o @i. "
#. @-expanded: inodes that were part of a corrupted orphan linked list found.
#: e2fsck/problem.c:668
msgid "@is that were part of a corrupted orphan linked list found. "
-msgstr ""
-"@i adalah bagian dari orphan terkorupsi yang ditemukan dari linked list. "
+msgstr "@i adalah bagian dari orphan terkorupsi yang ditemukan dari linked list. "
#. @-expanded: error allocating refcount structure (%N): %m\n
#: e2fsck/problem.c:673
@@ -1544,8 +1523,7 @@ msgstr "@h %i memiliki sebuah versi hash yang tidak dilayani (%N)\n"
#: e2fsck/problem.c:767
#, c-format
msgid "@h %i uses an incompatible htree root node flag.\n"
-msgstr ""
-"@h %i menggunakan sebuah htree yang tidak kompatible di titik root flag.\n"
+msgstr "@h %i menggunakan sebuah htree yang tidak kompatible di titik root flag.\n"
#. @-expanded: HTREE directory inode %i has a tree depth (%N) which is too big\n
#: e2fsck/problem.c:772
@@ -1578,22 +1556,20 @@ msgstr "@i %i memiliki sebuah ukuran extra (%IS) yang berisi @n\n"
msgid "@a in @i %i has a namelen (%N) which is @n\n"
msgstr "@a dalam @i %i memiliki sebuah panjang nama (%N) yang berisi @n\n"
-#. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n
-#: e2fsck/problem.c:798
-msgid "@a in @i %i has a value size (%N) which is @n\n"
-msgstr ""
-"@a dalam @i %i memiliki sebuah nilai yang berukuran (%N) yang berisi @n\n"
-
#. @-expanded: extended attribute in inode %i has a value offset (%N) which is invalid\n
-#: e2fsck/problem.c:803
+#: e2fsck/problem.c:798
msgid "@a in @i %i has a value offset (%N) which is @n\n"
msgstr "@a dalam @i %i memiliki nilai ofset (%N) yang berisi @n\n"
#. @-expanded: extended attribute in inode %i has a value block (%N) which is invalid (must be 0)\n
-#: e2fsck/problem.c:808
+#: e2fsck/problem.c:803
msgid "@a in @i %i has a value @b (%N) which is @n (must be 0)\n"
-msgstr ""
-"@a dalam @i %i memiliki sebuah nilai @b (%N) yang berisi @n (seharusnya 0)\n"
+msgstr "@a dalam @i %i memiliki sebuah nilai @b (%N) yang berisi @n (seharusnya 0)\n"
+
+#. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n
+#: e2fsck/problem.c:808
+msgid "@a in @i %i has a value size (%N) which is @n\n"
+msgstr "@a dalam @i %i memiliki sebuah nilai yang berukuran (%N) yang berisi @n\n"
#. @-expanded: extended attribute in inode %i has a hash (%N) which is invalid\n
#: e2fsck/problem.c:813
@@ -1603,8 +1579,7 @@ msgstr "@a dalam @i %i memiliki sebuah hash (%N) yang berisi @n\n"
#. @-expanded: inode %i is a %It but it looks like it is really a directory.\n
#: e2fsck/problem.c:818
msgid "@i %i is a %It but it looks like it is really a directory.\n"
-msgstr ""
-"@i %i adalah sebuah %It tetapi sepertinya benar benar sebuah direktori.\n"
+msgstr "@i %i adalah sebuah %It tetapi sepertinya benar benar sebuah direktori.\n"
#. @-expanded: Error while reading over extent tree in inode %i: %m\n
#: e2fsck/problem.c:823
@@ -1619,6 +1594,8 @@ msgid ""
"Failed to iterate extents in @i %i\n"
"\t(op %s, blk %b, lblk %c): %m\n"
msgstr ""
+"Gagal mengiterasi extens dalam @i %i\n"
+"\t(op %s, blk %b, lblk %c): %m\n"
#. @-expanded: inode %i has an invalid extent\n
#. @-expanded: \t(logical block %c, invalid physical block %b, len %N)\n
@@ -1676,7 +1653,7 @@ msgstr ""
#. @-expanded: inode %i has an invalid extent node (blk %b, lblk %c)\n
#: e2fsck/problem.c:868
msgid "@i %i has an invalid extent node (blk %b, lblk %c)\n"
-msgstr ""
+msgstr "@i %i memiliki sebuah titik ekstensi tidak valid (blk %b, lblk %c)\n"
#. @-expanded: \n
#. @-expanded: Running additional passes to resolve blocks claimed by more than one inode...\n
@@ -1688,8 +1665,7 @@ msgid ""
"Pass 1B: Rescanning for @m @bs\n"
msgstr ""
"\n"
-"Menjalankan tahap tambahan untuk meresolve @bs diklaim oleh lebih dari satu "
-"@i...\n"
+"Menjalankan tahap tambahan untuk meresolve @bs diklaim oleh lebih dari satu @i...\n"
"Tahap 1B: Menscan kembali untuk @m @bs\n"
#. @-expanded: multiply-claimed block(s) in inode %i:
@@ -1920,7 +1896,7 @@ msgstr "@E adalah salinan '.' @e.\n"
msgid "@E is duplicate '..' @e.\n"
msgstr "@E adalah duplikasi dari '..' @e.\n"
-#: e2fsck/problem.c:1108 e2fsck/problem.c:1403
+#: e2fsck/problem.c:1108 e2fsck/problem.c:1408
#, c-format
msgid "Internal error: couldn't find dir_info for %i.\n"
msgstr "Internal error: tidak dapat mencari dir_info untuk %i.\n"
@@ -1988,8 +1964,7 @@ msgstr "Setting filetype untuk @E ke %N.\n"
#. @-expanded: entry '%Dn' in %p (%i) has an incorrect filetype (was %Dt, should be %N).\n
#: e2fsck/problem.c:1168
msgid "@E has an incorrect filetype (was %Dt, @s %N).\n"
-msgstr ""
-"@E memiliki sebuah tipe berkas yang tidak benar (sebelumnya %Dt, @s %N).\n"
+msgstr "@E memiliki sebuah tipe berkas yang tidak benar (sebelumnya %Dt, @s %N).\n"
#. @-expanded: entry '%Dn' in %p (%i) has filetype set.\n
#: e2fsck/problem.c:1173
@@ -2113,102 +2088,105 @@ msgstr "Tidak terduga @b dalam @h %d (%q).\n"
#. @-expanded: entry '%Dn' in %p (%i) references inode %Di in group %g where _INODE_UNINIT is set.\n
#: e2fsck/problem.c:1281
-#, fuzzy
msgid "@E references @i %Di in @g %g where _INODE_UNINIT is set.\n"
-msgstr "@i %i ditemukan dalam @g %g dimana _INODE_UNINIT telah diset. "
+msgstr "@E referensi @i %Di dalam @g %g dimana _INODE_UNINIT telah diset.\n"
#. @-expanded: entry '%Dn' in %p (%i) references inode %Di found in group %g's unused inodes area.\n
#: e2fsck/problem.c:1286
-#, fuzzy
msgid "@E references @i %Di found in @g %g's unused inodes area.\n"
-msgstr "@i %i ditemukan dalam @g %g daerah inode yang tidak digunakan. "
+msgstr "@E referensi @i %Di ditemukan dalam @g %g's di daerah inode yang tidak digunakan.\n"
+
+#. @-expanded: i_file_acl_hi for inode %i (%Q) is %N, should be zero.\n
+#: e2fsck/problem.c:1291
+msgid "i_file_acl_hi @F %N, @s zero.\n"
+msgstr "i_file_acl_hi @F %N, @s nol.\n"
#. @-expanded: Pass 3: Checking directory connectivity\n
-#: e2fsck/problem.c:1293
+#: e2fsck/problem.c:1298
msgid "Pass 3: Checking @d connectivity\n"
msgstr "Tahap 3: Memeriksa konektivitas @d\n"
#. @-expanded: root inode not allocated.
-#: e2fsck/problem.c:1298
+#: e2fsck/problem.c:1303
msgid "@r not allocated. "
msgstr "@r tidak dialokasikan. "
#. @-expanded: No room in lost+found directory.
-#: e2fsck/problem.c:1303
+#: e2fsck/problem.c:1308
msgid "No room in @l @d. "
msgstr "Tidak ada ruang dalam @l @d. "
#. @-expanded: Unconnected directory inode %i (%p)\n
-#: e2fsck/problem.c:1308
+#: e2fsck/problem.c:1313
#, c-format
msgid "Unconnected @d @i %i (%p)\n"
msgstr "Tidak terhubung @d @i %i (%p)\n"
#. @-expanded: /lost+found not found.
-#: e2fsck/problem.c:1313
+#: e2fsck/problem.c:1318
msgid "/@l not found. "
msgstr "/@l tidak ditemukan. "
#. @-expanded: '..' in %Q (%i) is %P (%j), should be %q (%d).\n
-#: e2fsck/problem.c:1318
+#: e2fsck/problem.c:1323
msgid "'..' in %Q (%i) is %P (%j), @s %q (%d).\n"
msgstr "'..' dalam %Q (%i) adalah %P (%j), @s %q (%d).\n"
#. @-expanded: Bad or non-existent /lost+found. Cannot reconnect.\n
-#: e2fsck/problem.c:1323
+#: e2fsck/problem.c:1328
msgid "Bad or non-existent /@l. Cannot reconnect.\n"
msgstr "Buruk atau tidak ada /@l. Tidak dapat dihubungkan kembali.\n"
#. @-expanded: Could not expand /lost+found: %m\n
-#: e2fsck/problem.c:1328
+#: e2fsck/problem.c:1333
#, c-format
msgid "Could not expand /@l: %m\n"
msgstr "Tidak dapat mengexpan /@l: %m\n"
-#: e2fsck/problem.c:1333
+#: e2fsck/problem.c:1338
#, c-format
msgid "Could not reconnect %i: %m\n"
msgstr "Tidak dapat menghubungkan %i: %m\n"
#. @-expanded: Error while trying to find /lost+found: %m\n
-#: e2fsck/problem.c:1338
+#: e2fsck/problem.c:1343
#, c-format
msgid "Error while trying to find /@l: %m\n"
msgstr "Error ketika mencoba mencari /@l: %m\n"
#. @-expanded: ext2fs_new_block: %m while trying to create /lost+found directory\n
-#: e2fsck/problem.c:1343
+#: e2fsck/problem.c:1348
#, c-format
msgid "ext2fs_new_ at b: %m while trying to create /@l @d\n"
msgstr "ext2fs_new_ at b: %m ketika mencoba untuk membuat /@l @d\n"
#. @-expanded: ext2fs_new_inode: %m while trying to create /lost+found directory\n
-#: e2fsck/problem.c:1348
+#: e2fsck/problem.c:1353
#, c-format
msgid "ext2fs_new_ at i: %m while trying to create /@l @d\n"
msgstr "ext2fs_new_ at i: %m ketika mencoba untuk membuat /@l @d\n"
#. @-expanded: ext2fs_new_dir_block: %m while creating new directory block\n
-#: e2fsck/problem.c:1353
+#: e2fsck/problem.c:1358
#, c-format
msgid "ext2fs_new_dir_ at b: %m while creating new @d @b\n"
msgstr "ext2fs_new_dir_ at b: %m ketika membuat @d @b baru\n"
#. @-expanded: ext2fs_write_dir_block: %m while writing the directory block for /lost+found\n
-#: e2fsck/problem.c:1358
+#: e2fsck/problem.c:1363
#, c-format
msgid "ext2fs_write_dir_ at b: %m while writing the @d @b for /@l\n"
msgstr "ext2fs_write_dir_ at b: %m ketika menulis @d @b untuk /@l\n"
#. @-expanded: Error while adjusting inode count on inode %i\n
-#: e2fsck/problem.c:1363
+#: e2fsck/problem.c:1368
#, c-format
msgid "Error while adjusting @i count on @i %i\n"
msgstr "Error ketika menyesuaikan jumlah @i di @i %i\n"
#. @-expanded: Couldn't fix parent of inode %i: %m\n
#. @-expanded: \n
-#: e2fsck/problem.c:1368
+#: e2fsck/problem.c:1373
#, c-format
msgid ""
"Couldn't fix parent of @i %i: %m\n"
@@ -2219,7 +2197,7 @@ msgstr ""
#. @-expanded: Couldn't fix parent of inode %i: Couldn't find parent directory entry\n
#. @-expanded: \n
-#: e2fsck/problem.c:1373
+#: e2fsck/problem.c:1378
#, c-format
msgid ""
"Couldn't fix parent of @i %i: Couldn't find parent @d @e\n"
@@ -2229,169 +2207,156 @@ msgstr ""
"\n"
#. @-expanded: Error creating root directory (%s): %m\n
-#: e2fsck/problem.c:1383
+#: e2fsck/problem.c:1388
#, c-format
msgid "Error creating root @d (%s): %m\n"
msgstr "Error membuat root @d (%s): %m\n"
#. @-expanded: Error creating /lost+found directory (%s): %m\n
-#: e2fsck/problem.c:1388
+#: e2fsck/problem.c:1393
#, c-format
msgid "Error creating /@l @d (%s): %m\n"
msgstr "Error membuat /@l @d (%s): %m\n"
#. @-expanded: root inode is not a directory; aborting.\n
-#: e2fsck/problem.c:1393
+#: e2fsck/problem.c:1398
msgid "@r is not a @d; aborting.\n"
msgstr "@r bukan sebuah @d: membatalkan.\n"
#. @-expanded: Cannot proceed without a root inode.\n
-#: e2fsck/problem.c:1398
+#: e2fsck/problem.c:1403
msgid "Cannot proceed without a @r.\n"
msgstr "Tidak dapat melanjutkan tanpa sebuah @r.\n"
#. @-expanded: /lost+found is not a directory (ino=%i)\n
-#: e2fsck/problem.c:1408
+#: e2fsck/problem.c:1413
#, c-format
msgid "/@l is not a @d (ino=%i)\n"
msgstr "/@l bukan sebuah @d (ino=%i)\n"
-#: e2fsck/problem.c:1415
+#: e2fsck/problem.c:1420
msgid "Pass 3A: Optimizing directories\n"
msgstr "Tahap 3A: Mengoptimasi direktori\n"
-#: e2fsck/problem.c:1420
-#, fuzzy, c-format
+#: e2fsck/problem.c:1425
+#, c-format
msgid "Failed to create dirs_to_hash iterator: %m\n"
-msgstr "Gagal membuat dirs_to_hash iterator: %m"
+msgstr "Gagal membuat peng-iterasi dirs_to_hash: %m\n"
-#: e2fsck/problem.c:1425
-#, fuzzy
+#: e2fsck/problem.c:1430
msgid "Failed to optimize directory %q (%d): %m\n"
-msgstr "Gagal untuk mengoptimasi direktori %q (%d): %m"
+msgstr "Gagal mengoptimasi direktori %q (%d): %m\n"
-#: e2fsck/problem.c:1430
+#: e2fsck/problem.c:1435
msgid "Optimizing directories: "
msgstr "Mengoptimasi direktori: "
-#: e2fsck/problem.c:1447
+#: e2fsck/problem.c:1452
msgid "Pass 4: Checking reference counts\n"
msgstr "Tahap 4: Memeriksa jumlah referensi\n"
#. @-expanded: unattached zero-length inode %i.
-#: e2fsck/problem.c:1452
+#: e2fsck/problem.c:1457
#, c-format
msgid "@u @z @i %i. "
msgstr "@u @z @i %i. "
#. @-expanded: unattached inode %i\n
-#: e2fsck/problem.c:1457
+#: e2fsck/problem.c:1462
#, c-format
msgid "@u @i %i\n"
msgstr "@u @i %i\n"
#. @-expanded: inode %i ref count is %Il, should be %N.
-#: e2fsck/problem.c:1462
+#: e2fsck/problem.c:1467
msgid "@i %i ref count is %Il, @s %N. "
msgstr "@i %i ref count adalah %Il, @s %N. "
#. @-expanded: WARNING: PROGRAMMING BUG IN E2FSCK!\n
#. @-expanded: \tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n
#. @-expanded: inode_link_info[%i] is %N, inode.i_links_count is %Il. They should be the same!\n
-#: e2fsck/problem.c:1466
+#: e2fsck/problem.c:1471
msgid ""
"WARNING: PROGRAMMING BUG IN E2FSCK!\n"
"\tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n"
"@i_link_info[%i] is %N, @i.i_links_count is %Il. They @s the same!\n"
msgstr ""
"PERINGATAN: BUG DALAM PEMROGRAMAN E2FSCK!\n"
-"\tATAU SEORANG BONEHEAD (ANDA) SEDANG MEMERIKAN SEBUAH FILESYSTEM (HIDUP) "
-"YANG TERPASANG.\n"
-"@i_link_info[%i] adalah %N, @i.i_links_count adalah %Il. Mereka @s adalah "
-"sama!\n"
+"\tATAU SEORANG BONEHEAD (ANDA) SEDANG MEMERIKAN SEBUAH FILESYSTEM (HIDUP) YANG TERPASANG.\n"
+"@i_link_info[%i] adalah %N, @i.i_links_count adalah %Il. Mereka @s adalah sama!\n"
#. @-expanded: Pass 5: Checking group summary information\n
-#: e2fsck/problem.c:1476
+#: e2fsck/problem.c:1481
msgid "Pass 5: Checking @g summary information\n"
msgstr "Tahap 5: Memeriksa ringkasan informasi @g\n"
#. @-expanded: Padding at end of inode bitmap is not set.
-#: e2fsck/problem.c:1481
+#: e2fsck/problem.c:1486
msgid "Padding at end of @i @B is not set. "
msgstr "Menambahkan pad diakhir dari @i @B yang tidak terset. "
#. @-expanded: Padding at end of block bitmap is not set.
-#: e2fsck/problem.c:1486
+#: e2fsck/problem.c:1491
msgid "Padding at end of @b @B is not set. "
msgstr "Menambahkan pad di akhir dari @b @B adalah ter set. "
#. @-expanded: block bitmap differences:
-#: e2fsck/problem.c:1491
+#: e2fsck/problem.c:1496
msgid "@b @B differences: "
msgstr "@b @B perbedaan: "
#. @-expanded: inode bitmap differences:
-#: e2fsck/problem.c:1511
+#: e2fsck/problem.c:1516
msgid "@i @B differences: "
msgstr "@i @B perbedaan: "
#. @-expanded: Free inodes count wrong for group #%g (%i, counted=%j).\n
-#: e2fsck/problem.c:1531
+#: e2fsck/problem.c:1536
msgid "Free @is count wrong for @g #%g (%i, counted=%j).\n"
msgstr "Kosong @is terhitung salah untuk @g #%g (%i, terhitung=%j).\n"
#. @-expanded: Directories count wrong for group #%g (%i, counted=%j).\n
-#: e2fsck/problem.c:1536
+#: e2fsck/problem.c:1541
msgid "Directories count wrong for @g #%g (%i, counted=%j).\n"
msgstr "Direktori terhitung salah untuk @g #%g (%i, terhitung=%j).\n"
#. @-expanded: Free inodes count wrong (%i, counted=%j).\n
-#: e2fsck/problem.c:1541
+#: e2fsck/problem.c:1546
msgid "Free @is count wrong (%i, counted=%j).\n"
msgstr "Kosong @is terhitung salah (%i, terhitung=%j).\n"
#. @-expanded: Free blocks count wrong for group #%g (%b, counted=%c).\n
-#: e2fsck/problem.c:1546
+#: e2fsck/problem.c:1551
msgid "Free @bs count wrong for @g #%g (%b, counted=%c).\n"
msgstr "Kosong @bs terhitung salah untuk @g #%g (%b, terhitung=%c).\n"
#. @-expanded: Free blocks count wrong (%b, counted=%c).\n
-#: e2fsck/problem.c:1551
+#: e2fsck/problem.c:1556
msgid "Free @bs count wrong (%b, counted=%c).\n"
msgstr "Kosong @bs terhitung salah (%b, terhitung=%c).\n"
#. @-expanded: PROGRAMMING ERROR: filesystem (#%N) bitmap endpoints (%b, %c) don't match calculated bitmap
#. @-expanded: endpoints (%i, %j)\n
-#: e2fsck/problem.c:1556
-msgid ""
-"PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B "
-"endpoints (%i, %j)\n"
-msgstr ""
-"PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) tidak dapat mencocokan "
-"perhitungan @B titik ujung (%i, %j)\n"
+#: e2fsck/problem.c:1561
+msgid "PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B endpoints (%i, %j)\n"
+msgstr "PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) tidak dapat mencocokan perhitungan @B titik ujung (%i, %j)\n"
-#: e2fsck/problem.c:1562
+#: e2fsck/problem.c:1567
msgid "Internal error: fudging end of bitmap (%N)\n"
msgstr "Internal error: fudging berakhir dari bitmap (%N)\n"
#. @-expanded: Error copying in replacement inode bitmap: %m\n
-#: e2fsck/problem.c:1567
+#: e2fsck/problem.c:1572
#, c-format
msgid "Error copying in replacement @i @B: %m\n"
msgstr "Error menyalin dalam mengganti @i @B: %m\n"
#. @-expanded: Error copying in replacement block bitmap: %m\n
-#: e2fsck/problem.c:1572
+#: e2fsck/problem.c:1577
#, c-format
msgid "Error copying in replacement @b @B: %m\n"
msgstr "Error menyalin dalam mengganti @b @B: %m\n"
-#. @-expanded: Recreate journal
-#: e2fsck/problem.c:1597
-#, fuzzy
-msgid "Recreate @j"
-msgstr "Buat kembali"
-
#. @-expanded: group %g block(s) in use but group is marked BLOCK_UNINIT\n
#: e2fsck/problem.c:1602
#, c-format
@@ -2404,12 +2369,17 @@ msgstr "@g %g @b(s) sedang digunakan tetapi @g tertanda BLOCK_UNINIT\n"
msgid "@g %g @i(s) in use but @g is marked INODE_UNINIT\n"
msgstr "@g %g @i(s) sedang digunakan tetapi @g tertanda INODE_UNINIT\n"
-#: e2fsck/problem.c:1725
+#. @-expanded: Recreate journal
+#: e2fsck/problem.c:1614
+msgid "Recreate @j"
+msgstr "Membuat kembali @j"
+
+#: e2fsck/problem.c:1732
#, c-format
msgid "Unhandled error code (0x%x)!\n"
msgstr "Kode error tidak tertangani (0x%x)!\n"
-#: e2fsck/problem.c:1820
+#: e2fsck/problem.c:1827
msgid "IGNORED"
msgstr "DIABAIKAN"
@@ -2470,8 +2440,7 @@ msgid ""
" -p Automatic repair (no questions)\n"
" -n Make no changes to the filesystem\n"
" -y Assume \"yes\" to all questions\n"
-" -c Check for bad blocks and add them to the badblock "
-"list\n"
+" -c Check for bad blocks and add them to the badblock list\n"
" -f Force checking even if filesystem is marked clean\n"
msgstr ""
"\n"
@@ -2479,8 +2448,7 @@ msgstr ""
" -p Otomatis perbaikan (tanpa pertanyaan)\n"
" -n Tidak membuat perubahan di filesystem\n"
" -y Mengasumsi \"yes\" untuk semua pertanyaan\n"
-" -c Memeriksa blok buruk dan menambahkan hasilnya ke "
-"daftar blok buruk\n"
+" -c Memeriksa blok buruk dan menambahkan hasilnya ke daftar blok buruk\n"
" -f Memaksa memeriksa walaupun filesystem ditandai bersih\n"
#: e2fsck/unix.c:88
@@ -2495,8 +2463,7 @@ msgid ""
msgstr ""
" -v Tampilkan pesan pesan\n"
" -b super blok Gunakan superblok lain\n"
-" -B ukuran blok Paksa menggunakan ukuran blok ketika mencari super "
-"blok\n"
+" -B ukuran blok Paksa menggunakan ukuran blok ketika mencari super blok\n"
" -j external_journal Set lokasi dari journal luar\n"
" -l bad_blok_file Tambahkan ke daftar blok buruk\n"
" -L bad_blok_file Set daftar blok buruk\n"
@@ -2516,8 +2483,8 @@ msgstr " # dari inodes dengan ind/dind/tind blok: %u/%u/%u\n"
msgid " Extent depth histogram: "
msgstr " Kedalaman Extensi histogram: "
-#: e2fsck/unix.c:207 misc/badblocks.c:916 misc/tune2fs.c:1567 misc/util.c:151
-#: resize/main.c:248
+#: e2fsck/unix.c:207 misc/badblocks.c:928 misc/tune2fs.c:1584 misc/util.c:151
+#: resize/main.c:249
#, c-format
msgid "while determining whether %s is mounted."
msgstr "ketika sedang menentukan apakah %s sedang dimount."
@@ -2551,8 +2518,7 @@ msgid ""
msgstr ""
"\n"
"\n"
-"\a\a\a\aPERINGATAN!!! Menjalankan e2fsck di sebuah filesystem yang sedang "
-"dimount bisa menyebabkan\n"
+"\a\a\a\aPERINGATAN!!! Menjalankan e2fsck di sebuah filesystem yang sedang dimount bisa menyebabkan\n"
"kerusakan PARAH di filesystem.\a\a\a\n"
"\n"
@@ -2584,9 +2550,7 @@ msgstr " telah dimount %u kali tanpa dilakukan pemeriksaan"
#: e2fsck/unix.c:324
msgid " has filesystem last checked time in the future"
-msgstr ""
-" memiliki filesystem yang waktu terakhir diperiksa berada di masa yang akan "
-"datang"
+msgstr " memiliki filesystem yang waktu terakhir diperiksa berada di masa yang akan datang"
#: e2fsck/unix.c:330
#, c-format
@@ -2650,26 +2614,24 @@ msgstr "Informasi File berkas completion tidak valid"
#: e2fsck/unix.c:699
msgid "Only one of the options -p/-a, -n or -y may be specified."
-msgstr ""
-"Hanya salah satu dari opsi -p/-a, -n atau -y yang boleh dispesifikasikan."
+msgstr "Hanya salah satu dari opsi -p/-a, -n atau -y yang boleh dispesifikasikan."
#: e2fsck/unix.c:720
#, c-format
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr "Opsi -t tidak dilayani dalam versi e2fsck ini.\n"
-#: e2fsck/unix.c:801 misc/tune2fs.c:549 misc/tune2fs.c:833 misc/tune2fs.c:850
+#: e2fsck/unix.c:801 misc/tune2fs.c:550 misc/tune2fs.c:835 misc/tune2fs.c:853
#, c-format
msgid "Unable to resolve '%s'"
msgstr "Tidak dapat meresolve '%s'"
-#: e2fsck/unix.c:831
+#: e2fsck/unix.c:830
#, c-format
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
-msgstr ""
-"Opsi -c dan -l/-L tidak boleh digunakan secara bersamaan dalam satu waktu.\n"
+msgstr "Opsi -c dan -l/-L tidak boleh digunakan secara bersamaan dalam satu waktu.\n"
-#: e2fsck/unix.c:879
+#: e2fsck/unix.c:878
#, c-format
msgid ""
"E2FSCK_JBD_DEBUG \"%s\" not an integer\n"
@@ -2678,7 +2640,7 @@ msgstr ""
"E2FSCK_JBD_DEBUG \"%s\" bukan sebuah integer\n"
"\n"
-#: e2fsck/unix.c:888
+#: e2fsck/unix.c:887
#, c-format
msgid ""
"\n"
@@ -2689,38 +2651,43 @@ msgstr ""
"Argument bukan numerik tidak valid untuk -%c (\"%s\")\n"
"\n"
-#: e2fsck/unix.c:929
+#: e2fsck/unix.c:961
#, c-format
msgid "Error: ext2fs library version out of date!\n"
msgstr "Error: ext2fs versi librari ketinggalan jaman!\n"
-#: e2fsck/unix.c:937
+#: e2fsck/unix.c:969
msgid "while trying to initialize program"
msgstr "ketika mencoba untuk menginisialisasi aplikasi"
-#: e2fsck/unix.c:951
+#: e2fsck/unix.c:980
#, c-format
msgid "\tUsing %s, %s\n"
msgstr "\tMenggunakan %s, %s\n"
-#: e2fsck/unix.c:963
+#: e2fsck/unix.c:992
msgid "need terminal for interactive repairs"
msgstr "butuh terminal untuk reparasi interactive"
-#: e2fsck/unix.c:1010
+#: e2fsck/unix.c:1021
#, c-format
msgid "%s: %s trying backup blocks...\n"
msgstr "%s: %s mencoba membackup blok...\n"
-#: e2fsck/unix.c:1012
+#: e2fsck/unix.c:1023
msgid "Superblock invalid,"
msgstr "Superblok tidak valid,"
-#: e2fsck/unix.c:1013
+#: e2fsck/unix.c:1024
msgid "Group descriptors look bad..."
msgstr "Deskripsi grup terlihat buruk..."
-#: e2fsck/unix.c:1040
+#: e2fsck/unix.c:1034
+#, c-format
+msgid "%s: going back to original superblock\n"
+msgstr "%s: kembali ke superblock asli\n"
+
+#: e2fsck/unix.c:1060
#, c-format
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
@@ -2731,75 +2698,69 @@ msgstr ""
"(Atau filesystem superblok terkorupsi)\n"
"\n"
-#: e2fsck/unix.c:1046
+#: e2fsck/unix.c:1066
#, c-format
msgid "Could this be a zero-length partition?\n"
msgstr "Mungkinkan ini sebuah partisi dengan panjang nol?\n"
-#: e2fsck/unix.c:1048
+#: e2fsck/unix.c:1068
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr "Anda harus memiliki %s akses ke filesystem atau menjadi root\n"
-#: e2fsck/unix.c:1053
+#: e2fsck/unix.c:1073
#, c-format
msgid "Possibly non-existent or swap device?\n"
msgstr "Mungkin tidak ada atau sebuah perangkat swap?\n"
-#: e2fsck/unix.c:1055
+#: e2fsck/unix.c:1075
#, c-format
msgid "Filesystem mounted or opened exclusively by another program?\n"
-msgstr ""
-"Filesystem dimount atau dibuka secara exclusively oleh aplikasi lain?\n"
+msgstr "Filesystem dimount atau dibuka secara exclusively oleh aplikasi lain?\n"
-#: e2fsck/unix.c:1059
+#: e2fsck/unix.c:1079
#, c-format
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
"check of the device.\n"
msgstr ""
-"Disk terproteksi untuk ditulis; gunakan opsi -n untuk melakukan secara baca-"
-"saja\n"
+"Disk terproteksi untuk ditulis; gunakan opsi -n untuk melakukan secara baca-saja\n"
"dalam memeriksa perangkat.\n"
-#: e2fsck/unix.c:1123
+#: e2fsck/unix.c:1143
msgid "Get a newer version of e2fsck!"
msgstr "Dapatkan versi yang lebih baru dari e2fsck!"
-#: e2fsck/unix.c:1147
+#: e2fsck/unix.c:1173
#, c-format
msgid "while checking ext3 journal for %s"
msgstr "ketika memeriksa ext3 jurnal untuk %s"
-#: e2fsck/unix.c:1158
+#: e2fsck/unix.c:1184
#, c-format
-msgid ""
-"Warning: skipping journal recovery because doing a read-only filesystem "
-"check.\n"
-msgstr ""
-"Peringatan: melewatkan recovery jurnal karena sedang melakukan pemeriksaan "
-"di filesystem yang baca-saja (read-only).\n"
+msgid "Warning: skipping journal recovery because doing a read-only filesystem check.\n"
+msgstr "Peringatan: melewatkan recovery jurnal karena sedang melakukan pemeriksaan di filesystem yang baca-saja (read-only).\n"
-#: e2fsck/unix.c:1171
+#: e2fsck/unix.c:1197
#, c-format
msgid "unable to set superblock flags on %s\n"
msgstr "tidak dapat menset superblok flag di %s\n"
-#: e2fsck/unix.c:1177
+#: e2fsck/unix.c:1203
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr "ketika merecovery ext3 jurnal dari %s"
-#: e2fsck/unix.c:1201
+#: e2fsck/unix.c:1228
#, c-format
msgid "%s has unsupported feature(s):"
msgstr "%s memiliki feature yang tidak disupport:"
-#: e2fsck/unix.c:1217
+#: e2fsck/unix.c:1244
msgid "Warning: compression support is experimental.\n"
msgstr "Peringatan: support untuk kompresi adalah experimental.\n"
-#: e2fsck/unix.c:1222
+#: e2fsck/unix.c:1249
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
@@ -2808,26 +2769,25 @@ msgstr ""
"E2fsck tidak dikompilasi dengan layanan HTREE,\n"
"\t tetapi filesystem %s memiliki direktori HTREE.\n"
-#: e2fsck/unix.c:1276
+#: e2fsck/unix.c:1302
msgid "while reading bad blocks inode"
msgstr "ketika sedang membaca inode blok buruk"
-#: e2fsck/unix.c:1278
+#: e2fsck/unix.c:1304
#, c-format
msgid "This doesn't bode well, but we'll try to go on...\n"
-msgstr ""
-"Ini bukan pertanda baik, tapi kita akan tetap mencoba untuk meneruskan...\n"
+msgstr "Ini bukan pertanda baik, tapi kita akan tetap mencoba untuk meneruskan...\n"
-#: e2fsck/unix.c:1304
+#: e2fsck/unix.c:1330
msgid "Couldn't determine journal size"
msgstr "Tidak dapat menentukan ukuran jurnal"
-#: e2fsck/unix.c:1307
+#: e2fsck/unix.c:1333
#, c-format
msgid "Creating journal (%d blocks): "
msgstr "Membuat jurnal (%d blok): "
-#: e2fsck/unix.c:1314 misc/mke2fs.c:2091
+#: e2fsck/unix.c:1340 misc/mke2fs.c:2113
msgid ""
"\n"
"\twhile trying to create journal"
@@ -2835,12 +2795,12 @@ msgstr ""
"\n"
"\tketika mencoba untuk membuat jurnal"
-#: e2fsck/unix.c:1317
+#: e2fsck/unix.c:1343
#, c-format
msgid " Done.\n"
msgstr " Selesai.\n"
-#: e2fsck/unix.c:1318
+#: e2fsck/unix.c:1344
#, c-format
msgid ""
"\n"
@@ -2849,25 +2809,25 @@ msgstr ""
"\n"
"*** jurnal telah dibuat kembali - filesystem sekarang ext3 lagi ***\n"
-#: e2fsck/unix.c:1325
+#: e2fsck/unix.c:1351
#, c-format
msgid "Restarting e2fsck from the beginning...\n"
msgstr "Mengulang kembali e2fsck dari awal...\n"
-#: e2fsck/unix.c:1329
+#: e2fsck/unix.c:1355
msgid "while resetting context"
msgstr "ketika mereset context"
-#: e2fsck/unix.c:1336
+#: e2fsck/unix.c:1362
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr "%s: e2fsck dibatalkan.\n"
-#: e2fsck/unix.c:1341
+#: e2fsck/unix.c:1367
msgid "aborted"
msgstr "dibatalkan"
-#: e2fsck/unix.c:1353
+#: e2fsck/unix.c:1379
#, c-format
msgid ""
"\n"
@@ -2876,12 +2836,12 @@ msgstr ""
"\n"
"%s: ***** FILE SYSTEM TELAH TERMODIFIKASI *****\n"
-#: e2fsck/unix.c:1356
+#: e2fsck/unix.c:1382
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr "%s: ***** REBOOT LINUX *****\n"
-#: e2fsck/unix.c:1364
+#: e2fsck/unix.c:1390
#, c-format
msgid ""
"\n"
@@ -2892,7 +2852,7 @@ msgstr ""
"%s: ********** PERINGATAN: Filesystem masih memiliki errors *********\n"
"\n"
-#: e2fsck/unix.c:1400
+#: e2fsck/unix.c:1426
msgid "while setting block group checksum info"
msgstr "ketika sedang menset informasi checksum di grup blok"
@@ -2987,41 +2947,40 @@ msgid ""
msgstr ""
"\n"
"\n"
-"%s: TERJADI INKONSITENSI YANG TIDAK DIHARAPKAN; JALANKAN fsck SECARA "
-"MANUAL.\n"
+"%s: TERJADI INKONSITENSI YANG TIDAK DIHARAPKAN; JALANKAN fsck SECARA MANUAL.\n"
"\t(i.e, tanpa opsi -a atau -p)\n"
-#: e2fsck/util.c:336
+#: e2fsck/util.c:341
#, c-format
-msgid "Memory used: %dk/%dk (%dk/%dk), "
-msgstr "Memory yang digunakan: %dk/%dk (%dk/%dk), "
+msgid "Memory used: %luk/%luk (%luk/%luk), "
+msgstr "Memori yang digunakan: %luk/%luk (%luk/%luk), "
-#: e2fsck/util.c:340
+#: e2fsck/util.c:345
#, c-format
-msgid "Memory used: %d, "
-msgstr "Memori yang digunakan: %d, "
+msgid "Memory used: %lu, "
+msgstr "Memori yang digunakan: %lu, "
-#: e2fsck/util.c:346
+#: e2fsck/util.c:352
#, c-format
msgid "time: %5.2f/%5.2f/%5.2f\n"
msgstr "waktu: %5.2f/%5.2f/%5.2f\n"
-#: e2fsck/util.c:351
+#: e2fsck/util.c:357
#, c-format
msgid "elapsed time: %6.3f\n"
msgstr "waktu yang dijalani: %6.3f\n"
-#: e2fsck/util.c:385 e2fsck/util.c:399
+#: e2fsck/util.c:391 e2fsck/util.c:405
#, c-format
-msgid "while reading inode %ld in %s"
-msgstr "ketika membaca inode %ld dalam %s"
+msgid "while reading inode %lu in %s"
+msgstr "ketika membaca inode %lu dalam %s"
-#: e2fsck/util.c:413 e2fsck/util.c:426
+#: e2fsck/util.c:419 e2fsck/util.c:432
#, c-format
-msgid "while writing inode %ld in %s"
-msgstr "ketika menulis inode %ld dalam %s"
+msgid "while writing inode %lu in %s"
+msgstr "ketika menulis inode %lu dalam %s"
-#: e2fsck/util.c:575
+#: e2fsck/util.c:581
msgid "while allocating zeroizing buffer"
msgstr "ketika mengalokasikan zeroizing buffer"
@@ -3033,15 +2992,12 @@ msgstr "selesai \n"
#, c-format
msgid ""
"Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnf]\n"
-" [-c blocks_at_once] [-d delay_factor_between_reads] [-e "
-"max_bad_blocks]\n"
+" [-c blocks_at_once] [-d delay_factor_between_reads] [-e max_bad_blocks]\n"
" [-p num_passes] [-t test_pattern [-t test_pattern [...]]]\n"
" device [last_block [first_block]]\n"
msgstr ""
-"Penggunaan: %s [-b ukuran_blok] [-i berkas_masukan] [-o berkas_keluaran] [-"
-"svwnf]\n"
-" [-c blok_di_sekali] [-p jumlah_tahap] [-e maksimal_blok_buruk] [-d "
-"faktor_delay_antara_baca]\n"
+"Penggunaan: %s [-b ukuran_blok] [-i berkas_masukan] [-o berkas_keluaran] [-svwnf]\n"
+" [-c blok_di_sekali] [-p jumlah_tahap] [-e maksimal_blok_buruk] [-d faktor_delay_antara_baca]\n"
" [-e pattern_tes] [-t pattern_test [...]]]\n"
" perangkat [blok_terakhir [blok_pertama]]\n"
@@ -3057,77 +3013,77 @@ msgstr ""
#: misc/badblocks.c:202
#, c-format
msgid "%6.2f%% done, %s elapsed"
-msgstr ""
+msgstr "%6.2f%% selesai, %s berjalan"
-#: misc/badblocks.c:289
+#: misc/badblocks.c:293
msgid "Testing with random pattern: "
msgstr "Memeriksa dengan pattern random: "
-#: misc/badblocks.c:307
+#: misc/badblocks.c:311
msgid "Testing with pattern 0x"
msgstr "Memeriksa dengan pattern 0x"
-#: misc/badblocks.c:335 misc/badblocks.c:404
+#: misc/badblocks.c:339 misc/badblocks.c:408
msgid "during seek"
msgstr "ketika mencari(seek)"
-#: misc/badblocks.c:346
+#: misc/badblocks.c:350
#, c-format
msgid "Weird value (%ld) in do_read\n"
msgstr "Nilai aneh (%ld) dalam do_read\n"
-#: misc/badblocks.c:424
+#: misc/badblocks.c:428
msgid "during ext2fs_sync_device"
msgstr "ketika ext2fs_sync_device"
-#: misc/badblocks.c:440 misc/badblocks.c:699
+#: misc/badblocks.c:447 misc/badblocks.c:711
msgid "while beginning bad block list iteration"
msgstr "ketika di awal iterasi daftara blok buruk"
-#: misc/badblocks.c:454 misc/badblocks.c:551 misc/badblocks.c:709
+#: misc/badblocks.c:461 misc/badblocks.c:563 misc/badblocks.c:721
msgid "while allocating buffers"
msgstr "ketika mengalokasikan buffer"
-#: misc/badblocks.c:458
+#: misc/badblocks.c:465
#, c-format
msgid "Checking blocks %lu to %lu\n"
msgstr "Memeriksa blok %lu ke %lu\n"
-#: misc/badblocks.c:463
+#: misc/badblocks.c:470
msgid "Checking for bad blocks in read-only mode\n"
msgstr "Memeriksa blok buruk dalam mode baca-saja (read-only)\n"
-#: misc/badblocks.c:472
+#: misc/badblocks.c:479
msgid "Checking for bad blocks (read-only test): "
msgstr "Memeriksa blok buruk (pemeriksaan baca-saja): "
-#: misc/badblocks.c:480 misc/badblocks.c:583 misc/badblocks.c:628
-#: misc/badblocks.c:772
+#: misc/badblocks.c:487 misc/badblocks.c:595 misc/badblocks.c:640
+#: misc/badblocks.c:784
msgid "Too many bad blocks, aborting test\n"
msgstr "Terlalu banyak blok buruk, membatalkan pemeriksaan\n"
-#: misc/badblocks.c:558
+#: misc/badblocks.c:570
msgid "Checking for bad blocks in read-write mode\n"
msgstr "Memeriksa untuk blok buruk dalam mode baca-tulis\n"
-#: misc/badblocks.c:560 misc/badblocks.c:722
+#: misc/badblocks.c:572 misc/badblocks.c:734
#, c-format
msgid "From block %lu to %lu\n"
msgstr "Dari blok %lu ke %lu\n"
-#: misc/badblocks.c:618
+#: misc/badblocks.c:630
msgid "Reading and comparing: "
msgstr "Membaca dan membandingkan: "
-#: misc/badblocks.c:721
+#: misc/badblocks.c:733
msgid "Checking for bad blocks in non-destructive read-write mode\n"
msgstr "Memeriksa untuk blok buruk dalal mode tidak-merusak baca-tulis\n"
-#: misc/badblocks.c:727
+#: misc/badblocks.c:739
msgid "Checking for bad blocks (non-destructive read-write test)\n"
msgstr "Memeriksa untuk blok buruk (pemeriksaan tidak-merusak baca-tulis)\n"
-#: misc/badblocks.c:734
+#: misc/badblocks.c:746
msgid ""
"\n"
"Interrupt caught, cleaning up\n"
@@ -3135,58 +3091,52 @@ msgstr ""
"\n"
"Interupsi tertangkap, membersihkan\n"
-#: misc/badblocks.c:810
+#: misc/badblocks.c:822
#, c-format
msgid "during test data write, block %lu"
msgstr "ketika memerikas data ditulis, blok %lu"
-#: misc/badblocks.c:921 misc/util.c:156
+#: misc/badblocks.c:933 misc/util.c:156
#, c-format
msgid "%s is mounted; "
msgstr "%s sedang dimount; "
-#: misc/badblocks.c:923
+#: misc/badblocks.c:935
msgid "badblocks forced anyway. Hope /etc/mtab is incorrect.\n"
msgstr "badbloks tetap dipaksakan. Mudah-mudahan /etc/mtab tidak benar\n"
-#: misc/badblocks.c:928
+#: misc/badblocks.c:940
msgid "it's not safe to run badblocks!\n"
msgstr "ini tidak aman untuk menjalankan badblocks!\n"
-#: misc/badblocks.c:933 misc/util.c:167
+#: misc/badblocks.c:945 misc/util.c:167
#, c-format
msgid "%s is apparently in use by the system; "
msgstr "%s kelihatannya sedang digunakan oleh system; "
-#: misc/badblocks.c:936
+#: misc/badblocks.c:948
msgid "badblocks forced anyway.\n"
msgstr "badblocks dipaksakan saja.\n"
-#: misc/badblocks.c:956
+#: misc/badblocks.c:968
#, c-format
msgid "invalid %s - %s"
msgstr "tidak valid %s - %s"
-#: misc/badblocks.c:1015
-#, c-format
-msgid "bad block size - %s"
-msgstr "ukuran blok buruk - %s"
-
-#: misc/badblocks.c:1070
+#: misc/badblocks.c:1077
#, c-format
msgid "can't allocate memory for test_pattern - %s"
msgstr "tidak dapat mengalokasikan memori untuk test_pattern - %s"
-#: misc/badblocks.c:1097
+#: misc/badblocks.c:1104
msgid "Maximum of one test_pattern may be specified in read-only mode"
-msgstr ""
-"Maksimum dari satu test_pattern boleh dispesifikasi dalam mode baca-saja"
+msgstr "Maksimum dari satu test_pattern boleh dispesifikasi dalam mode baca-saja"
-#: misc/badblocks.c:1103
+#: misc/badblocks.c:1110
msgid "Random test_pattern is not allowed in read-only mode"
msgstr "Random test_pattern tidak diperbolehkan dalam mode baca-saja"
-#: misc/badblocks.c:1117
+#: misc/badblocks.c:1124
msgid ""
"Couldn't determine device size; you must specify\n"
"the size manually\n"
@@ -3194,86 +3144,91 @@ msgstr ""
"Tidak dapat menentukan ukuran perangkat; anda harus menspesifikasikan\n"
"ukuran perangkat secara manual\n"
-#: misc/badblocks.c:1123
+#: misc/badblocks.c:1130
msgid "while trying to determine device size"
msgstr "ketika mencoba untuk menentukakn ukuran perangkat"
-#: misc/badblocks.c:1128
+#: misc/badblocks.c:1135
msgid "last block"
msgstr "blok terakhir"
-#: misc/badblocks.c:1134
+#: misc/badblocks.c:1141
msgid "first block"
msgstr "blok pertama"
-#: misc/badblocks.c:1137
+#: misc/badblocks.c:1144
#, c-format
msgid "invalid starting block (%lu): must be less than %lu"
msgstr "awal blok tidak valid (%lu): harus lebih kecil dari %lu"
-#: misc/badblocks.c:1193
+#: misc/badblocks.c:1200
msgid "while creating in-memory bad blocks list"
msgstr "ketika membuat daftar blok buruk dalam memori"
-#: misc/badblocks.c:1208
+#: misc/badblocks.c:1215
msgid "while adding to in-memory bad block list"
msgstr "ketika menambahkan daftar blok buruk dalam memori"
-#: misc/badblocks.c:1232
+#: misc/badblocks.c:1239
#, c-format
msgid "Pass completed, %u bad blocks found.\n"
msgstr "Tahap selesai, %u blok buruk ditemukan.\n"
#: misc/chattr.c:85
#, c-format
-msgid "Usage: %s [-RVf] [-+=AacDdijsSu] [-v version] files...\n"
-msgstr "Penggunaan: %s [-RVf] [-+=AacDdijsSu] [-v versi] berkas...\n"
+msgid "Usage: %s [-RVf] [-+=AacDdeijsSu] [-v version] files...\n"
+msgstr "Penggunaan: %s [-RVf] [-+=AacDdeijsSu] [-v versi] berkas...\n"
-#: misc/chattr.c:152
+#: misc/chattr.c:153
#, c-format
msgid "bad version - %s\n"
msgstr "versi buruk - %s\n"
-#: misc/chattr.c:198 misc/lsattr.c:113
+#: misc/chattr.c:200 misc/lsattr.c:115
#, c-format
msgid "while trying to stat %s"
msgstr "ketika mencoba untuk melakukan statistik %s"
-#: misc/chattr.c:204 misc/chattr.c:222
-#, c-format
-msgid "Flags of %s set as "
-msgstr "Flags dari %s diset sebagai "
-
-#: misc/chattr.c:214
+#: misc/chattr.c:207
#, c-format
msgid "while reading flags on %s"
msgstr "ketika membaca flags di %s"
-#: misc/chattr.c:231
+#: misc/chattr.c:216 misc/chattr.c:235
+#, c-format
+msgid "Clearing extent flag not supported on %s"
+msgstr "Menghapus tanda ekstensi yang tidak didukung di %s"
+
+#: misc/chattr.c:221 misc/chattr.c:240
+#, c-format
+msgid "Flags of %s set as "
+msgstr "Flags dari %s diset sebagai "
+
+#: misc/chattr.c:249
#, c-format
msgid "while setting flags on %s"
msgstr "ketika menset flags di %s"
-#: misc/chattr.c:239
+#: misc/chattr.c:257
#, c-format
msgid "Version of %s set as %lu\n"
msgstr "Versi dari %s diset sebagai %lu\n"
-#: misc/chattr.c:243
+#: misc/chattr.c:261
#, c-format
msgid "while setting version on %s"
msgstr "ketika menset versi di %s"
-#: misc/chattr.c:263
+#: misc/chattr.c:281
#, c-format
msgid "Couldn't allocate path variable in chattr_dir_proc"
msgstr "Tidak dapat mengalokasikan variable path di chattr_dir_proc"
-#: misc/chattr.c:302
+#: misc/chattr.c:320
msgid "= is incompatible with - and +\n"
msgstr "= tidak kompatibel dengan - dan +\n"
-#: misc/chattr.c:310
+#: misc/chattr.c:328
msgid "Must use '-v', =, - or +\n"
msgstr "Harus menggunakan '-v', =, - atau +\n"
@@ -3362,32 +3317,32 @@ msgstr " Blok bebas: "
msgid " Free inodes: "
msgstr " Inode bebas: "
-#: misc/dumpe2fs.c:264
+#: misc/dumpe2fs.c:268
msgid "while printing bad block list"
msgstr "ketika mencetak daftar blok buruk"
-#: misc/dumpe2fs.c:270
+#: misc/dumpe2fs.c:274
#, c-format
msgid "Bad blocks: %u"
msgstr "Blok buruk: %u"
-#: misc/dumpe2fs.c:292 misc/tune2fs.c:279
+#: misc/dumpe2fs.c:297 misc/tune2fs.c:281
msgid "while reading journal inode"
msgstr "ketika membaca jurnal inode"
-#: misc/dumpe2fs.c:295
+#: misc/dumpe2fs.c:300
msgid "Journal size: "
msgstr "Ukuran jurnal: "
-#: misc/dumpe2fs.c:319 misc/tune2fs.c:200
+#: misc/dumpe2fs.c:324 misc/tune2fs.c:202
msgid "while reading journal superblock"
msgstr "ketikan membaca superblok jurnal"
-#: misc/dumpe2fs.c:327
+#: misc/dumpe2fs.c:332
msgid "Couldn't find journal superblock magic numbers"
msgstr "Tidak dapat mencari nomor magic di jurnal superblok"
-#: misc/dumpe2fs.c:331
+#: misc/dumpe2fs.c:336
#, c-format
msgid ""
"\n"
@@ -3406,27 +3361,27 @@ msgstr ""
"Awal dari jurnal: %u\n"
"Jumlah pengguna dari jurnal: %u\n"
-#: misc/dumpe2fs.c:344
+#: misc/dumpe2fs.c:349
#, c-format
msgid "Journal users: %s\n"
msgstr "Pengguna jurnal: %s\n"
-#: misc/dumpe2fs.c:360 misc/mke2fs.c:693 misc/tune2fs.c:868
+#: misc/dumpe2fs.c:365 misc/mke2fs.c:693 misc/tune2fs.c:872
#, c-format
msgid "Couldn't allocate memory to parse options!\n"
msgstr "Tidak dapat mengalokasikan memori untuk memparse opsi!\n"
-#: misc/dumpe2fs.c:386
+#: misc/dumpe2fs.c:391
#, c-format
msgid "Invalid superblock parameter: %s\n"
msgstr "Parameter superblok tidak valid: %s\n"
-#: misc/dumpe2fs.c:401
+#: misc/dumpe2fs.c:406
#, c-format
msgid "Invalid blocksize parameter: %s\n"
-msgstr "Parameter ukuranblok tidak valid: %s\n"
+msgstr "Parameter ukuran-blok tidak valid: %s\n"
-#: misc/dumpe2fs.c:412
+#: misc/dumpe2fs.c:417
#, c-format
msgid ""
"\n"
@@ -3447,20 +3402,20 @@ msgstr ""
"\n"
"Opsi extended yang valid adalah:\n"
"\tsuperblock=<nomor superblok>\n"
-"\tblocksize=<ukuranblok>\n"
+"\tblocksize=<besar blok>\n"
-#: misc/dumpe2fs.c:471 misc/mke2fs.c:1355
+#: misc/dumpe2fs.c:476 misc/mke2fs.c:1355
#, c-format
msgid "\tUsing %s\n"
msgstr "\tMenggunakan %s\n"
-#: misc/dumpe2fs.c:507 misc/e2image.c:674 misc/tune2fs.c:1518
-#: resize/main.c:311
+#: misc/dumpe2fs.c:512 misc/e2image.c:681 misc/tune2fs.c:1535
+#: resize/main.c:312
#, c-format
msgid "Couldn't find valid filesystem superblock.\n"
msgstr "Tidak dapat mencari superblok filesystem yang valid.\n"
-#: misc/dumpe2fs.c:532
+#: misc/dumpe2fs.c:537
#, c-format
msgid ""
"\n"
@@ -3519,7 +3474,7 @@ msgstr "e2label: error membaca superblok\n"
msgid "e2label: not an ext2 filesystem\n"
msgstr "e2label: bukan sebuah ext2 filesystem\n"
-#: misc/e2label.c:96 misc/tune2fs.c:1653
+#: misc/e2label.c:96 misc/tune2fs.c:1670
#, c-format
msgid "Warning: label too long, truncating.\n"
msgstr "Peringatan: label terlalu panjang, memotong.\n"
@@ -3534,7 +3489,7 @@ msgstr "e2label: tidak dapat mencari superblok lagi\n"
msgid "e2label: error writing superblock\n"
msgstr "e2label: error menulis superblok\n"
-#: misc/e2label.c:116 misc/tune2fs.c:541
+#: misc/e2label.c:116 misc/tune2fs.c:542
#, c-format
msgid "Usage: e2label device [newlabel]\n"
msgstr "Penggunaan: e2label perangkat [labelbaru]\n"
@@ -3574,8 +3529,7 @@ msgstr "Error ketika menentukan apakah %s sudah dimount.\n"
#: misc/e2undo.c:173
msgid "e2undo should only be run on unmounted file system\n"
-msgstr ""
-"e2undo seharusnya hanya dijalankan di filesystem yang sudah diunmount\n"
+msgstr "e2undo seharusnya hanya dijalankan di filesystem yang sudah diunmount\n"
#: misc/e2undo.c:182
#, c-format
@@ -3585,24 +3539,24 @@ msgstr "Gagal membuka %s\n"
#: misc/e2undo.c:208
#, c-format
msgid "Replayed transaction of size %zd at location %ld\n"
-msgstr "Balasa ukuran transaksi %zd di lokasi %ld\n"
+msgstr "Balasan ukuran transaksi %zd di lokasi %ld\n"
#: misc/e2undo.c:214
#, c-format
msgid "Failed write %s\n"
msgstr "Gagal menulis %s\n"
-#: misc/fsck.c:347
+#: misc/fsck.c:343
#, c-format
msgid "WARNING: couldn't open %s: %s\n"
msgstr "PERINGATAN: tidak dapat membuka %s: %s\n"
-#: misc/fsck.c:357
+#: misc/fsck.c:353
#, c-format
msgid "WARNING: bad format on line %d of %s\n"
msgstr "PERINGATAN: format buruk di bari %d dari %s\n"
-#: misc/fsck.c:372
+#: misc/fsck.c:368
msgid ""
"\a\a\aWARNING: Your /etc/fstab does not contain the fsck passno\n"
"\tfield. I will kludge around things for you, but you\n"
@@ -3614,84 +3568,77 @@ msgstr ""
"\tseharusnya membetulkan berkas /etc/fstab anda secepatnya.\n"
"\n"
-#: misc/fsck.c:481
+#: misc/fsck.c:477
#, c-format
msgid "fsck: %s: not found\n"
msgstr "fsck: %s: tidak ditemukan\n"
-#: misc/fsck.c:597
+#: misc/fsck.c:593
#, c-format
msgid "%s: wait: No more child process?!?\n"
msgstr "%s: tunggu: Tidak ada lagi proses anak?!?\n"
-#: misc/fsck.c:619
+#: misc/fsck.c:615
#, c-format
msgid "Warning... %s for device %s exited with signal %d.\n"
msgstr "Peringatan... %s untuk perangkat %s keluar dengan sinyal %d.\n"
-#: misc/fsck.c:625
+#: misc/fsck.c:621
#, c-format
msgid "%s %s: status is %x, should never happen.\n"
msgstr "%s %s: status adalah %x, seharusnya tidak pernah terjadi.\n"
-#: misc/fsck.c:664
+#: misc/fsck.c:660
#, c-format
msgid "Finished with %s (exit status %d)\n"
msgstr "Berakhir dengan %s (status keluar %d)\n"
-#: misc/fsck.c:724
+#: misc/fsck.c:720
#, c-format
msgid "%s: Error %d while executing fsck.%s for %s\n"
msgstr "%s: Error %d ketika menjalankan fsck.%s untuk %s\n"
-#: misc/fsck.c:745
+#: misc/fsck.c:741
msgid ""
"Either all or none of the filesystem types passed to -t must be prefixed\n"
"with 'no' or '!'.\n"
msgstr ""
-"Semua atau tidak sama sekali dari tipe filesystem dilewatkan melalui opsi -t "
-"harus diwali\n"
+"Semua atau tidak sama sekali dari tipe filesystem dilewatkan melalui opsi -t harus diwali\n"
"dengan 'no' atau '!'.\n"
-#: misc/fsck.c:764
+#: misc/fsck.c:760
msgid "Couldn't allocate memory for filesystem types\n"
msgstr "Tidak dapat mengalokasikan memori untuk tipe filesystem\n"
-#: misc/fsck.c:887
+#: misc/fsck.c:883
#, c-format
-msgid ""
-"%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
-"number\n"
-msgstr ""
-"%s: melewatkan baris buruk di /etc/fstab: bind mount dengan tidak nol fsck "
-"tahap nomor\n"
+msgid "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number\n"
+msgstr "%s: melewatkan baris buruk di /etc/fstab: bind mount dengan tidak nol fsck tahap nomor\n"
-#: misc/fsck.c:914
+#: misc/fsck.c:910
#, c-format
msgid "fsck: cannot check %s: fsck.%s not found\n"
msgstr "fsck: tidak dapat memeriksa %s: fsck.%s tidak ditemukan\n"
-#: misc/fsck.c:970
+#: misc/fsck.c:966
msgid "Checking all file systems.\n"
msgstr "Memeriksa semua filesytem.\n"
-#: misc/fsck.c:1061
+#: misc/fsck.c:1057
#, c-format
msgid "--waiting-- (pass %d)\n"
msgstr "--menunggu-- (tahap %d)\n"
-#: misc/fsck.c:1081
-msgid ""
-"Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
-msgstr ""
-"Penggunaan: fsck [-AMNPRTV] -C [fd] ] [-t fstype] [fs-opsi] [filesys ...]\n"
+#: misc/fsck.c:1077
+msgid "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
+msgstr "Penggunaan: fsck [-AMNPRTV] -C [fd] ] [-t fstype] [fs-opsi] [filesys ...]\n"
-#: misc/fsck.c:1123
+#: misc/fsck.c:1119
#, c-format
msgid "%s: too many devices\n"
msgstr "%s: terlalu banyak perangkat\n"
-#: misc/fsck.c:1156 misc/fsck.c:1242
+#: misc/fsck.c:1152 misc/fsck.c:1238
#, c-format
msgid "%s: too many arguments\n"
msgstr "%s: terlalu banyak argumen\n"
@@ -3712,7 +3659,7 @@ msgid "While reading version on %s"
msgstr "Ketika membaca versi di %s"
#: misc/mke2fs.c:104
-#, fuzzy, c-format
+#, c-format
msgid ""
"Usage: %s [-c|-l filename] [-b block-size] [-f fragment-size]\n"
"\t[-i bytes-per-inode] [-I inode-size] [-J journal-options]\n"
@@ -3728,7 +3675,7 @@ msgstr ""
"\t[-m persentasi-reserved-blok] [-o os-pembuat]\n"
"\t[-g blok-per-grup] [-L label-volume] [-M direktori-terakhir-dimount]\n"
"\t[-O feature[,...]] [-r revisi-fs] [-E opsi-extended[,...]]\n"
-"\t[-T type-fs] [-jnqvFSV] perangkat [jumlah-blok]\n"
+"\t[-T type-fs] [-U UUID] [-jnqvFSV] perangkat [jumlah-blok]\n"
#: misc/mke2fs.c:206
#, c-format
@@ -3752,8 +3699,7 @@ msgstr "Blok %d dalam daerah deskripsi superblok/grup utama buruk.\n"
#: misc/mke2fs.c:246
#, c-format
msgid "Blocks %u through %u must be good in order to build a filesystem.\n"
-msgstr ""
-"Blok %u sampai %u harus dalam keadaan baik untuk membuat sebuah filesystem.\n"
+msgstr "Blok %u sampai %u harus dalam keadaan baik untuk membuat sebuah filesystem.\n"
#: misc/mke2fs.c:249
msgid "Aborting....\n"
@@ -3872,12 +3818,12 @@ msgstr "Tipe OS: "
#: misc/mke2fs.c:612
#, c-format
msgid "Block size=%u (log=%u)\n"
-msgstr "Blok ukuran=%u (log=%u)\n"
+msgstr "Ukuran blok=%u (log=%u)\n"
#: misc/mke2fs.c:614
#, c-format
msgid "Fragment size=%u (log=%u)\n"
-msgstr "Potongan ukuran=%u (log=%u)\n"
+msgstr "Ukuran pecahan=%u (log=%u)\n"
#: misc/mke2fs.c:616
#, c-format
@@ -4000,7 +3946,7 @@ msgstr ""
"Syntax error dalam mke2fs berkas konfigurasi (%s, baris #%d)\n"
"\t%s\n"
-#: misc/mke2fs.c:869 misc/tune2fs.c:353
+#: misc/mke2fs.c:869 misc/tune2fs.c:355
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr "Opsi filesystem tidak valid diset: %s\n"
@@ -4012,8 +3958,7 @@ msgid ""
"Warning! Your mke2fs.conf file does not define the %s filesystem type.\n"
msgstr ""
"\n"
-"Peringatan! Berkas mke2fs.conf anda tidak mendefinisikan tipe filesystem %"
-"s.\n"
+"Peringatan! Berkas mke2fs.conf anda tidak mendefinisikan tipe filesystem %s.\n"
#: misc/mke2fs.c:982
#, c-format
@@ -4024,48 +3969,48 @@ msgstr ""
"Anda mungkin butuh untuk memasang sebuah update dari berkas mke2fs.conf.\n"
"\n"
-#: misc/mke2fs.c:1177
+#: misc/mke2fs.c:1176
#, c-format
msgid "invalid block size - %s"
msgstr "Ukuran blok tidak valid - %s"
-#: misc/mke2fs.c:1181
+#: misc/mke2fs.c:1180
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr "Peringatan: ukuranblok %d tidak berguna dalam kebanyakan system.\n"
-#: misc/mke2fs.c:1197
+#: misc/mke2fs.c:1196
#, c-format
msgid "invalid fragment size - %s"
msgstr "ukuran potongan/fragmen tidak valid - %s"
-#: misc/mke2fs.c:1203
+#: misc/mke2fs.c:1202
#, c-format
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr "Peringatan: fragment tidak dilayani. Mengabaikan opsi -f\n"
-#: misc/mke2fs.c:1210
+#: misc/mke2fs.c:1209
msgid "Illegal number for blocks per group"
msgstr "Jumlah ilegal untuk blok per grup"
-#: misc/mke2fs.c:1215
+#: misc/mke2fs.c:1214
msgid "blocks per group must be multiple of 8"
msgstr "blok per grup harus kelipatan dari 8"
-#: misc/mke2fs.c:1223
+#: misc/mke2fs.c:1222
msgid "Illegal number for flex_bg size"
msgstr "Jumlah ilegal untuk ukuran flex_bg"
-#: misc/mke2fs.c:1229
+#: misc/mke2fs.c:1228
msgid "flex_bg size must be a power of 2"
msgstr "ukuran flex_bg harus kelipatan dari 2"
-#: misc/mke2fs.c:1239
+#: misc/mke2fs.c:1238
#, c-format
msgid "invalid inode ratio %s (min %d/max %d)"
msgstr "rasio dari inode tidak valid %s (min %d/max %d)"
-#: misc/mke2fs.c:1256
+#: misc/mke2fs.c:1255
msgid "in malloc for bad_blocks_filename"
msgstr "dalam malloc untuk bad_block_filename"
@@ -4089,7 +4034,7 @@ msgstr "ukuran inode tidak valid - %s"
msgid "bad num inodes - %s"
msgstr "jumlah inode buruk - %s"
-#: misc/mke2fs.c:1380 misc/mke2fs.c:2052
+#: misc/mke2fs.c:1380 misc/mke2fs.c:2068
#, c-format
msgid "while trying to open journal device %s\n"
msgstr "ketika mencoba membuka perangkat jurnal %s\n"
@@ -4097,8 +4042,7 @@ msgstr "ketika mencoba membuka perangkat jurnal %s\n"
#: misc/mke2fs.c:1386
#, c-format
msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n"
-msgstr ""
-"Perangkat jurnal ukuranblok (%d) lebih kecil daripada minimum ukuranblok %d\n"
+msgstr "Perangkat jurnal ukuranblok (%d) lebih kecil daripada minimum ukuranblok %d\n"
#: misc/mke2fs.c:1392
#, c-format
@@ -4112,11 +4056,8 @@ msgstr "%d-byte bloks terlalu besar untuk system (maksimal %d)"
#: misc/mke2fs.c:1405
#, c-format
-msgid ""
-"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
-msgstr ""
-"Peringatan: %d-byte blok terlalu besar untuk system (maksimal %d), dipaksa "
-"untuk melanjutkan\n"
+msgid "Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
+msgstr "Peringatan: %d-byte blok terlalu besar untuk system (maksimal %d), dipaksa untuk melanjutkan\n"
#: misc/mke2fs.c:1413
#, c-format
@@ -4136,7 +4077,7 @@ msgstr ""
"%s: Ukuran dari perangkat %s terlalu besar untuk diexpresikan dalam 32 bit\n"
"\tmenggunakan sebuah ukuranblok dari %d.\n"
-#: misc/mke2fs.c:1468 resize/main.c:371
+#: misc/mke2fs.c:1468 resize/main.c:374
msgid "while trying to determine filesystem size"
msgstr "ketika mencoba untuk menentukan ukuran filesystem"
@@ -4155,11 +4096,9 @@ msgid ""
"\ta modified partition being busy and in use. You may need to reboot\n"
"\tto re-read your partition table.\n"
msgstr ""
-"Ukuran perangkat yang dilaporkan nol. Partisi yang dispesifikasikan tidak "
-"valid, atau\n"
+"Ukuran perangkat yang dilaporkan nol. Partisi yang dispesifikasikan tidak valid, atau\n"
"\ttabel partisi tidak dibaca kembali setelah menjalankan fdisk, karena\n"
-"\tpartisi yang diubah sedang sibuk dan sedang digunakan. Anda bisa melakukan "
-"reboot\n"
+"\tpartisi yang diubah sedang sibuk dan sedang digunakan. Anda bisa melakukan reboot\n"
"\tuntuk membaca kembali tabel partisi.\n"
#: misc/mke2fs.c:1500
@@ -4171,26 +4110,26 @@ msgstr "Filesystem lebih besar dari ukuran perangkat yang terlihat."
msgid "Failed to parse fs types list\n"
msgstr "Gagal untuk memparse daftar type fs\n"
-#: misc/mke2fs.c:1542
+#: misc/mke2fs.c:1540
msgid "fs_types for mke2fs.conf resolution: "
msgstr "fs_types untuk mke2fs.conf resolution: "
-#: misc/mke2fs.c:1549
+#: misc/mke2fs.c:1547
#, c-format
msgid "Filesystem features not supported with revision 0 filesystems\n"
msgstr "Filesystem features tidak dilayani dengan filesystem revisi 0\n"
-#: misc/mke2fs.c:1556
+#: misc/mke2fs.c:1554
#, c-format
msgid "Sparse superblocks not supported with revision 0 filesystems\n"
msgstr "Sparse superblok tidak dilayani dengan filesystem revisi 0\n"
-#: misc/mke2fs.c:1568
+#: misc/mke2fs.c:1566
#, c-format
msgid "Journals not supported with revision 0 filesystems\n"
msgstr "Jurnal tidak dilayani dengan filesystem revisi 0\n"
-#: misc/mke2fs.c:1586
+#: misc/mke2fs.c:1584
#, c-format
msgid ""
"The resize_inode and meta_bg features are not compatible.\n"
@@ -4199,40 +4138,38 @@ msgstr ""
"resize_inode dan meta_bg feature tidak saling kompatibel.\n"
"Meraka tidak dapat diaktifkan secara bersamaan.\n"
-#: misc/mke2fs.c:1603
+#: misc/mke2fs.c:1601
msgid "while trying to determine hardware sector size"
msgstr "ketika mencoba untuk menentukan ukuran sektor perangkat"
-#: misc/mke2fs.c:1661
+#: misc/mke2fs.c:1658
msgid "reserved online resize blocks not supported on non-sparse filesystem"
msgstr "reserved online resize blok tidak dilayani di non-sparse filesystem"
-#: misc/mke2fs.c:1670
+#: misc/mke2fs.c:1667
msgid "blocks per group count out of range"
msgstr "jumlah blok per grup diluar jangkauan"
-#: misc/mke2fs.c:1685
+#: misc/mke2fs.c:1682
msgid "Flex_bg feature not enabled, so flex_bg size may not be specified"
-msgstr ""
-"Flex_bg feature tidak diaktifkan, jadi ukuran flex_bw mungkin tidak dapat "
-"dispesifikasikan"
+msgstr "Flex_bg feature tidak diaktifkan, jadi ukuran flex_bw mungkin tidak dapat dispesifikasikan"
-#: misc/mke2fs.c:1697
+#: misc/mke2fs.c:1694
#, c-format
msgid "invalid inode size %d (min %d/max %d)"
msgstr "ukuran inode tidak valid %d (min %d/max %d)"
-#: misc/mke2fs.c:1711
+#: misc/mke2fs.c:1708
#, c-format
msgid "too many inodes (%llu), raise inode ratio?"
msgstr "terlalu banyak inode (%llu), naikkan rasio inode?"
-#: misc/mke2fs.c:1716
+#: misc/mke2fs.c:1713
#, c-format
msgid "too many inodes (%llu), specify < 2^32 inodes"
msgstr "terlalu banyak inode (%llu), spesifikasikan < 2³2 inode"
-#: misc/mke2fs.c:1731
+#: misc/mke2fs.c:1728
#, c-format
msgid ""
"inode_size (%u) * inodes_count (%u) too big for a\n"
@@ -4243,55 +4180,58 @@ msgstr ""
"\tfilesystem dengan %lu blok, spesifikan lebih tinggi inode_ratio (-i)\n"
"\tatau lebih rendah jumlah inode (-N).\n"
-#: misc/mke2fs.c:1828 misc/tune2fs.c:1462
+#: misc/mke2fs.c:1821 misc/tune2fs.c:1453
+msgid "Couldn't allocate memory for tdb filename\n"
+msgstr "Tidak dapat mengalokasikan memori untuk nama berkas tdb\n"
+
+#: misc/mke2fs.c:1834 misc/tune2fs.c:1475
#, c-format
msgid "while trying to delete %s"
msgstr "ketika mencoba untuk menghapus %s"
-#: misc/mke2fs.c:1837
+#: misc/mke2fs.c:1844
#, c-format
msgid ""
"Overwriting existing filesystem; this can be undone using the command:\n"
" e2undo %s %s\n"
"\n"
msgstr ""
-"Memaksa menulis filesystem yang sudah ada; ini tidak dapat diundo dengan "
-"perintah:\n"
+"Memaksa menulis filesystem yang sudah ada; ini tidak dapat diundo dengan perintah:\n"
" e2undo %s %s\n"
"\n"
-#: misc/mke2fs.c:1885
+#: misc/mke2fs.c:1893
msgid "while setting up superblock"
msgstr "ketika mensetup superblok"
-#: misc/mke2fs.c:1936
+#: misc/mke2fs.c:1952
#, c-format
msgid "unknown os - %s"
msgstr "os tidak diketahui - %s"
-#: misc/mke2fs.c:1990
+#: misc/mke2fs.c:2006
msgid "while trying to allocate filesystem tables"
msgstr "ketika mencoba mengalokasikan tabel filesystem"
-#: misc/mke2fs.c:2021
+#: misc/mke2fs.c:2037
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr "ketika mengkosongkan blok %u di akhir dari filesystem"
-#: misc/mke2fs.c:2034
+#: misc/mke2fs.c:2050
msgid "while reserving blocks for online resize"
msgstr "ketika menreserve blok untuk online resize"
-#: misc/mke2fs.c:2045 misc/tune2fs.c:477
+#: misc/mke2fs.c:2061 misc/tune2fs.c:479
msgid "journal"
msgstr "jurnal"
-#: misc/mke2fs.c:2057
+#: misc/mke2fs.c:2073
#, c-format
msgid "Adding journal to device %s: "
msgstr "Menambahkan jurnal ke perangkat %s: "
-#: misc/mke2fs.c:2064
+#: misc/mke2fs.c:2080
#, c-format
msgid ""
"\n"
@@ -4300,22 +4240,27 @@ msgstr ""
"\n"
"\tketika mencoba untuk menambahkan jurnal ke perangkat %s"
-#: misc/mke2fs.c:2069 misc/mke2fs.c:2095 misc/tune2fs.c:506 misc/tune2fs.c:520
+#: misc/mke2fs.c:2085 misc/mke2fs.c:2117 misc/tune2fs.c:508 misc/tune2fs.c:522
#, c-format
msgid "done\n"
msgstr "selesai\n"
-#: misc/mke2fs.c:2083
+#: misc/mke2fs.c:2094
+#, c-format
+msgid "Skipping journal creation in super-only mode\n"
+msgstr "Melewatkan pembuatan jurnal dalam mode super-saja\n"
+
+#: misc/mke2fs.c:2105
#, c-format
msgid "Creating journal (%u blocks): "
msgstr "Membuat jurnal (%u blok): "
-#: misc/mke2fs.c:2100
+#: misc/mke2fs.c:2122
#, c-format
msgid "Writing superblocks and filesystem accounting information: "
msgstr "Menulis superblok dan informasi akuntasi filesystem: "
-#: misc/mke2fs.c:2105
+#: misc/mke2fs.c:2127
#, c-format
msgid ""
"\n"
@@ -4324,7 +4269,7 @@ msgstr ""
"\n"
"Peringatan, memiliki masalah menulis diluar superblok."
-#: misc/mke2fs.c:2108
+#: misc/mke2fs.c:2130
#, c-format
msgid ""
"done\n"
@@ -4377,7 +4322,7 @@ msgstr "%s: h=%3d s=%3d c=%4d awal=%8d ukuran=%8lu akhir=%6d\n"
msgid "Please run e2fsck on the filesystem.\n"
msgstr "Tolong jalankan e2fsck untuk filesystem.\n"
-#: misc/tune2fs.c:103
+#: misc/tune2fs.c:105
#, c-format
msgid ""
"Usage: %s [-c max_mounts_count] [-e errors_behavior] [-g group]\n"
@@ -4391,64 +4336,63 @@ msgstr ""
"Penggunaan: %s [-c jumlah_max_mount] [-e errors_behavior] [-g grup]\n"
"\t[-t interval[d|m|w]] [-j] [-J opsi_jurnal] [-l]\n"
"\t[-m persentasi_reserved_blok] [-o [^]opsi_mount[,...]] \n"
-"\t[-r jumlah_reserved_blok] [-u pengguna] [-C jumlah_mount] [-L "
-"label_volume]\n"
+"\t[-r jumlah_reserved_blok] [-u pengguna] [-C jumlah_mount] [-L label_volume]\n"
"\t[-E opsi-extended[,...]] [-T waktu_terakhir_diperiksa] [-U UUID]\n"
"\t[-I ukuran_inode_baru] perangkat\n"
-#: misc/tune2fs.c:188
+#: misc/tune2fs.c:190
msgid "while trying to open external journal"
msgstr "ketika mencoba membuka jurnal external"
-#: misc/tune2fs.c:192
+#: misc/tune2fs.c:194
#, c-format
msgid "%s is not a journal device.\n"
msgstr "%s bukan sebuah perangkat jurnal.\n"
-#: misc/tune2fs.c:207
+#: misc/tune2fs.c:209
msgid "Journal superblock not found!\n"
msgstr "Jurnal superblok tidak ditemukan!\n"
-#: misc/tune2fs.c:219
+#: misc/tune2fs.c:221
msgid "Filesystem's UUID not found on journal device.\n"
msgstr "Filesystem's UUID tidak ditemukan dalam perangkat jurnal.\n"
-#: misc/tune2fs.c:240
+#: misc/tune2fs.c:242
msgid "Journal NOT removed\n"
msgstr "Jurnal TIDAK dihapus\n"
-#: misc/tune2fs.c:246
+#: misc/tune2fs.c:248
msgid "Journal removed\n"
msgstr "Jurnal dihapus\n"
-#: misc/tune2fs.c:286
+#: misc/tune2fs.c:288
msgid "while reading bitmaps"
msgstr "ketika membaca bitmap"
-#: misc/tune2fs.c:294
+#: misc/tune2fs.c:296
msgid "while clearing journal inode"
msgstr "ketika menghapus inode jurnal"
-#: misc/tune2fs.c:305
+#: misc/tune2fs.c:307
msgid "while writing journal inode"
msgstr "ketika menulis inode jurnal"
-#: misc/tune2fs.c:320
+#: misc/tune2fs.c:322
#, c-format
msgid "Invalid mount option set: %s\n"
msgstr "opsi mount tidak valid diset: %s\n"
-#: misc/tune2fs.c:356
+#: misc/tune2fs.c:358
#, c-format
msgid "Clearing filesystem feature '%s' not supported.\n"
msgstr "Menghapus feature filesystem '%s' tidak dilayani.\n"
-#: misc/tune2fs.c:362
+#: misc/tune2fs.c:364
#, c-format
msgid "Setting filesystem feature '%s' not supported.\n"
msgstr "Menset filesystem feature '%s' tidak dilayani.\n"
-#: misc/tune2fs.c:371
+#: misc/tune2fs.c:373
msgid ""
"The has_journal feature may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
@@ -4456,7 +4400,7 @@ msgstr ""
"Has_journal feature mungkin hanya bisa dihapus ketika filesystem sedang\n"
"dimount baca-saja atau tidak dimount.\n"
-#: misc/tune2fs.c:379
+#: misc/tune2fs.c:381
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
@@ -4464,7 +4408,7 @@ msgstr ""
"Needs_recovery flag diset. Tolong jalankan e2fsck sebelum menghapus\n"
"has_journal flag.\n"
-#: misc/tune2fs.c:412
+#: misc/tune2fs.c:414
msgid ""
"Clearing the flex_bg flag would cause the the filesystem to be\n"
"inconsistent.\n"
@@ -4472,7 +4416,7 @@ msgstr ""
"Menghapus flex_bg flag akan mengakibatkan filesystem menjadi\n"
"tidak konsisten.\n"
-#: misc/tune2fs.c:423
+#: misc/tune2fs.c:425
msgid ""
"The huge_file feature may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
@@ -4480,16 +4424,16 @@ msgstr ""
"Huge_file feature hanya boleh dihapus ketika filesystem sedang\n"
"dimount baca-saja atau tidak dimount.\n"
-#: misc/tune2fs.c:451
+#: misc/tune2fs.c:453
#, c-format
msgid "(and reboot afterwards!)\n"
msgstr "(dan reboot setelah ini!)\n"
-#: misc/tune2fs.c:472
+#: misc/tune2fs.c:474
msgid "The filesystem already has a journal.\n"
msgstr "Filesystem telah memiliki sebuah jurnal.\n"
-#: misc/tune2fs.c:490
+#: misc/tune2fs.c:492
#, c-format
msgid ""
"\n"
@@ -4498,21 +4442,21 @@ msgstr ""
"\n"
"\tketika mencoba untuk membuka jurnal di %s\n"
-#: misc/tune2fs.c:494
+#: misc/tune2fs.c:496
#, c-format
msgid "Creating journal on device %s: "
msgstr "Membuat jurnal di perangkat %s: "
-#: misc/tune2fs.c:502
+#: misc/tune2fs.c:504
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr "ketika menambahkan filesystem di jurnal di %s"
-#: misc/tune2fs.c:508
+#: misc/tune2fs.c:510
msgid "Creating journal inode: "
msgstr "Membuat jurnal inode: "
-#: misc/tune2fs.c:517
+#: misc/tune2fs.c:519
msgid ""
"\n"
"\twhile trying to create journal file"
@@ -4520,85 +4464,85 @@ msgstr ""
"\n"
"\tketika mencoba membuat file jurnal"
-#: misc/tune2fs.c:584
+#: misc/tune2fs.c:585
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr "Tidak dapat memparse date/time specifier: %s"
-#: misc/tune2fs.c:608 misc/tune2fs.c:621
+#: misc/tune2fs.c:609 misc/tune2fs.c:622
#, c-format
msgid "bad mounts count - %s"
msgstr "jumlah mount buruk - %s"
-#: misc/tune2fs.c:637
+#: misc/tune2fs.c:638
#, c-format
msgid "bad error behavior - %s"
msgstr "perilaku error buruk - %s"
-#: misc/tune2fs.c:664
+#: misc/tune2fs.c:665
#, c-format
msgid "bad gid/group name - %s"
msgstr "nama gid/grup buruk - %s"
-#: misc/tune2fs.c:697
+#: misc/tune2fs.c:698
#, c-format
msgid "bad interval - %s"
msgstr "interval buruk - %s"
-#: misc/tune2fs.c:725
+#: misc/tune2fs.c:727
#, c-format
msgid "bad reserved block ratio - %s"
msgstr "rasio reserved blok buruk - %s"
-#: misc/tune2fs.c:740
+#: misc/tune2fs.c:742
msgid "-o may only be specified once"
msgstr "-o hanya boleh dispesifikasikan sekali"
-#: misc/tune2fs.c:750
+#: misc/tune2fs.c:752
msgid "-O may only be specified once"
msgstr "-O hanya boleh dispesifikasikan sekali"
-#: misc/tune2fs.c:760
+#: misc/tune2fs.c:762
#, c-format
msgid "bad reserved blocks count - %s"
msgstr "jumlah reserved blok buruk - %s"
-#: misc/tune2fs.c:789
+#: misc/tune2fs.c:791
#, c-format
msgid "bad uid/user name - %s"
msgstr "nama uid/pengguna buruk - %s"
-#: misc/tune2fs.c:806
+#: misc/tune2fs.c:808
#, c-format
msgid "bad inode size - %s"
msgstr "ukuran inode buruk - %s"
-#: misc/tune2fs.c:813
+#: misc/tune2fs.c:815
#, c-format
msgid "Inode size must be a power of two- %s"
msgstr "Ukuran inode harus kelipatan dari dua - %s"
-#: misc/tune2fs.c:900
+#: misc/tune2fs.c:904
#, c-format
msgid "Invalid RAID stride: %s\n"
msgstr "Invalid RAID stride: %s\n"
-#: misc/tune2fs.c:915
+#: misc/tune2fs.c:919
#, c-format
msgid "Invalid RAID stripe-width: %s\n"
msgstr "Invalid RAID stripe-width: %s\n"
-#: misc/tune2fs.c:930
+#: misc/tune2fs.c:934
#, c-format
msgid "Invalid hash algorithm: %s\n"
msgstr "Algoritma hash tidak valid: %s\n"
-#: misc/tune2fs.c:936
+#: misc/tune2fs.c:940
#, c-format
msgid "Setting default hash algorithm to %s (%d)\n"
msgstr "Menset default algoritma hash ke %s (%d)\n"
-#: misc/tune2fs.c:944
+#: misc/tune2fs.c:948
#, c-format
msgid ""
"\n"
@@ -4627,72 +4571,72 @@ msgstr ""
"\ttest_fs\n"
"\t^test_fs\n"
-#: misc/tune2fs.c:1384 misc/tune2fs.c:1389 resize/resize2fs.c:760
+#: misc/tune2fs.c:1388 misc/tune2fs.c:1393 resize/resize2fs.c:790
msgid "blocks to be moved"
msgstr "blok akan dipindahkan"
-#: misc/tune2fs.c:1471
-#, fuzzy, c-format
+#: misc/tune2fs.c:1485
+#, c-format
msgid ""
"To undo the tune2fs operation please run the command\n"
" e2undo %s %s\n"
"\n"
msgstr ""
-"Untuk undo operasi tune2fs tolong jalankan perintah\n"
+"Untuk mengembalikan operasi tune2fs mohon jalankan perintah\n"
" e2undo %s %s\n"
"\n"
-#: misc/tune2fs.c:1529
+#: misc/tune2fs.c:1546
#, c-format
-msgid "The inode size is already %d\n"
-msgstr "Ukuran inode telah %d\n"
+msgid "The inode size is already %lu\n"
+msgstr "Ukuran inode telah %lu\n"
-#: misc/tune2fs.c:1534
+#: misc/tune2fs.c:1551
#, c-format
msgid "Shrinking the inode size is not supported\n"
msgstr "Mengecilkan ukuran inode yang tidak dilayani\n"
-#: misc/tune2fs.c:1577
+#: misc/tune2fs.c:1594
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr "Menset maksimal jumlah mount ke %d\n"
-#: misc/tune2fs.c:1583
+#: misc/tune2fs.c:1600
#, c-format
msgid "Setting current mount count to %d\n"
msgstr "Menset jumlah mount sekarang ke %d\n"
-#: misc/tune2fs.c:1588
+#: misc/tune2fs.c:1605
#, c-format
msgid "Setting error behavior to %d\n"
msgstr "Menset perilaku error ke %d\n"
-#: misc/tune2fs.c:1593
+#: misc/tune2fs.c:1610
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr "Menset gid reserved blok ke %lu\n"
-#: misc/tune2fs.c:1598
+#: misc/tune2fs.c:1615
#, c-format
msgid "Setting interval between checks to %lu seconds\n"
msgstr "Menset interval diantara check ke %lu detik\n"
-#: misc/tune2fs.c:1605
+#: misc/tune2fs.c:1622
#, c-format
msgid "Setting reserved blocks percentage to %g%% (%u blocks)\n"
msgstr "Menset persentasi reserved blok ke %g%% (%u blok)\n"
-#: misc/tune2fs.c:1612
+#: misc/tune2fs.c:1629
#, c-format
msgid "reserved blocks count is too big (%lu)"
msgstr "jumlah reserved blok terlalu besar (%lu)"
-#: misc/tune2fs.c:1618
+#: misc/tune2fs.c:1635
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr "Menset jumlah reserved blok ke %lu\n"
-#: misc/tune2fs.c:1624
+#: misc/tune2fs.c:1641
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
@@ -4700,7 +4644,7 @@ msgstr ""
"\n"
"Filesystem telah memiliki sparse superblok.\n"
-#: misc/tune2fs.c:1631
+#: misc/tune2fs.c:1648
#, c-format
msgid ""
"\n"
@@ -4709,7 +4653,7 @@ msgstr ""
"\n"
"Sparse superblok flag diset. %s"
-#: misc/tune2fs.c:1636
+#: misc/tune2fs.c:1653
msgid ""
"\n"
"Clearing the sparse superflag not supported.\n"
@@ -4717,31 +4661,33 @@ msgstr ""
"\n"
"Menghapus sparse superflag tidak dilayani.\n"
-#: misc/tune2fs.c:1643
+#: misc/tune2fs.c:1660
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr "Menset waktu filesystem terakhir diperiksa ke %s\n"
-#: misc/tune2fs.c:1649
+#: misc/tune2fs.c:1666
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr "Menset uid reserved blok ke %lu\n"
-#: misc/tune2fs.c:1700
+#: misc/tune2fs.c:1717
msgid "Invalid UUID format\n"
msgstr "Invalid format UUID\n"
-#: misc/tune2fs.c:1712
+#: misc/tune2fs.c:1729
msgid "The inode size may only be changed when the filesystem is unmounted.\n"
msgstr "Ukuran inode mungkin akan berubah ketika filesystem tidak dimount.\n"
-#: misc/tune2fs.c:1719
+#: misc/tune2fs.c:1736
msgid ""
"Changing the inode size not supported for filesystems with the flex_bg\n"
"feature enabled.\n"
msgstr ""
+"Pengubahan ukuran inode tidak didukung untuk sistem berkas dengan flex_bg\n"
+"fitur aktif.\n"
-#: misc/tune2fs.c:1731
+#: misc/tune2fs.c:1748
msgid ""
"Error in resizing the inode size.\n"
"Run e2undo to undo the file system changes. \n"
@@ -4749,17 +4695,17 @@ msgstr ""
"Error dalam mengubah ukuran dari ukuran inode.\n"
"Jalankan e2undo untuk undo perubahan filesystem.\n"
-#: misc/tune2fs.c:1735
+#: misc/tune2fs.c:1752
#, c-format
msgid "Setting inode size %lu\n"
msgstr "Menset ukuran inode %lu\n"
-#: misc/tune2fs.c:1745
+#: misc/tune2fs.c:1762
#, c-format
msgid "Setting stride size to %d\n"
msgstr "Menset ukuran stride ke %d\n"
-#: misc/tune2fs.c:1750
+#: misc/tune2fs.c:1767
#, c-format
msgid "Setting stripe width to %d\n"
msgstr "Menset lebar stripe ke %d\n"
@@ -4779,8 +4725,7 @@ msgid ""
"The device apparently does not exist; did you specify it correctly?\n"
msgstr ""
"\n"
-"Perangkat kelihatannya tidak ada; apakah anda menspesifikasikannya dengan "
-"benar?\n"
+"Perangkat kelihatannya tidak ada; apakah anda menspesifikasikannya dengan benar?\n"
#: misc/util.c:107
#, c-format
@@ -4899,8 +4844,7 @@ msgid ""
"Usage: %s [-d debug_flags] [-f] [-F] [-M] [-P] [-p] device [new_size]\n"
"\n"
msgstr ""
-"Penggunaan: %s [-d debug_flags] [-f] [-F] [-M] [-P] [-p] perangkat "
-"[ukuran_baru]\n"
+"Penggunaan: %s [-d debug_flags] [-f] [-F] [-M] [-P] [-p] perangkat [ukuran_baru]\n"
"\n"
#: resize/main.c:64
@@ -4932,17 +4876,17 @@ msgstr "Tahap tidak diketahui?!?"
msgid "Begin pass %d (max = %lu)\n"
msgstr "Awal tahap %d (max = %lu)\n"
-#: resize/main.c:264
+#: resize/main.c:265
#, c-format
msgid "while opening %s"
msgstr "ketika membuka %s"
-#: resize/main.c:276
+#: resize/main.c:277
#, c-format
msgid "while getting stat information for %s"
msgstr "ketika memperoleh informasi statistik untuk %s"
-#: resize/main.c:337
+#: resize/main.c:338
#, c-format
msgid ""
"%s: The combination of flex_bg and\n"
@@ -4951,21 +4895,26 @@ msgstr ""
"%s: Kombinasi dari flex_bg dan\n"
"\t!resize_inode features tidak dilayani oleh resize2fs.\n"
-#: resize/main.c:345
+#: resize/main.c:348
#, c-format
msgid "Estimated minimum size of the filesystem: %u\n"
msgstr "Estimasi minimum dari ukuran filesystem: %u\n"
-#: resize/main.c:381
-#, fuzzy, c-format
+#: resize/main.c:384
+#, c-format
msgid "Invalid new size: %s\n"
-msgstr "ukuran inode tidak valid - %s"
+msgstr "Ukuran inode baru tidak valid: %s\n"
-#: resize/main.c:394
+#: resize/main.c:396
+#, c-format
+msgid "New size smaller than minimum (%u)\n"
+msgstr "Ukuran baru lebih kecil daripada minimum (%u)\n"
+
+#: resize/main.c:402
msgid "Invalid stride length"
msgstr "Panjang stride tidak valid"
-#: resize/main.c:418
+#: resize/main.c:426
#, c-format
msgid ""
"The containing partition (or device) is only %u (%dk) blocks.\n"
@@ -4975,7 +4924,7 @@ msgstr ""
"Partisi (atau perangkat) hanya berisi %u (%dk) blok.\n"
"Anda meminta ukuran baru %u blok.\n"
-#: resize/main.c:425
+#: resize/main.c:433
#, c-format
msgid ""
"The filesystem is already %u blocks long. Nothing to do!\n"
@@ -4984,7 +4933,7 @@ msgstr ""
"Filesystem telah memiliki panjang %u blok. Tidak ada yang harus dilakukan !\n"
"\n"
-#: resize/main.c:436
+#: resize/main.c:444
#, c-format
msgid ""
"Please run 'e2fsck -f %s' first.\n"
@@ -4993,12 +4942,26 @@ msgstr ""
"Tolong jalankan 'e2fsck -f %s' terlebih dahulu.\n"
"\n"
-#: resize/main.c:447
+#: resize/main.c:448
+#, c-format
+msgid "Resizing the filesystem on %s to %u (%dk) blocks.\n"
+msgstr "Mengubah sistem berkas di %s ke %u (%dk) blok.\n"
+
+#: resize/main.c:457
#, c-format
msgid "while trying to resize %s"
msgstr "ketika mencoba untuk mengubah ukuran %s"
-#: resize/main.c:452
+#: resize/main.c:460
+#, c-format
+msgid ""
+"Please run 'e2fsck -fy %s' to fix the filesystem\n"
+"after the aborted resize operation.\n"
+msgstr ""
+"Mohon jalankan 'e2fsck -fy %s' untuk membetulkan sistem berkas\n"
+"setelah pembatalan operasi pengubahan ukuran.\n"
+
+#: resize/main.c:466
#, c-format
msgid ""
"The filesystem on %s is now %u blocks long.\n"
@@ -5007,6 +4970,11 @@ msgstr ""
"Filesystem di %s sekarang memiliki panjang %u blok.\n"
"\n"
+#: resize/main.c:481
+#, c-format
+msgid "while trying to truncate %s"
+msgstr "ketika mencoba untuk memotong %s"
+
#: resize/online.c:37
#, c-format
msgid "Filesystem at %s is mounted on %s; on-line resizing required\n"
@@ -5054,27 +5022,23 @@ msgstr "Ketika mencoba untuk menambahkan grup #%d"
#: resize/online.c:191
#, c-format
-msgid ""
-"Filesystem at %s is mounted on %s, and on-line resizing is not supported on "
-"this system.\n"
-msgstr ""
-"Filesystem di %s dimount di %s, dan on-line resizing tidak disupport di "
-"system ini.\n"
+msgid "Filesystem at %s is mounted on %s, and on-line resizing is not supported on this system.\n"
+msgstr "Filesystem di %s dimount di %s, dan on-line resizing tidak disupport di system ini.\n"
-#: resize/resize2fs.c:322
+#: resize/resize2fs.c:350
#, c-format
msgid "inodes (%llu) must be less than %u"
msgstr "inode (%llu) harus lebih kecil dari %u"
-#: resize/resize2fs.c:755
+#: resize/resize2fs.c:582
msgid "reserved blocks"
msgstr "reserved blok"
-#: resize/resize2fs.c:765
+#: resize/resize2fs.c:795
msgid "meta-data blocks"
msgstr "meta-data blok"
-#: resize/resize2fs.c:1703
+#: resize/resize2fs.c:1752
#, c-format
msgid "Should never happen: resize inode corrupt!\n"
msgstr "Seharusnya tidak pernah terjadi: resize inode corrupt!\n"
@@ -5088,6 +5052,9 @@ msgstr "Seharusnya tidak pernah terjadi: resize inode corrupt!\n"
#~ msgid "Recreate journal to make the filesystem ext3 again?\n"
#~ msgstr "Membuat kembali jurnal untuk membuat filesystem ext3 lagi?\n"
+#~ msgid "bad block size - %s"
+#~ msgstr "ukuran blok buruk - %s"
+
#~ msgid "while retrying to write block bitmaps for %s"
#~ msgstr "ketika sedang mencoba untuk menulis blok bitmap untuk %s"
diff --git a/po/pl.gmo b/po/pl.gmo
index 9194903..648e131 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index 3ce3d7d..4e8ae46 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,7 @@
# Polish translation for e2fsprogs.
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Theodore Tso (msgids)
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Theodore Tso (msgids)
# This file is distributed under the same license as the e2fsprogs package.
-# Jakub Bogusz <qboosh at pld-linux.org>, 2002-2008.
+# Jakub Bogusz <qboosh at pld-linux.org>, 2002-2009.
#
#. The strings in e2fsck's problem.c can be very hard to translate,
#. since the strings are expanded in two different ways. First of all,
@@ -63,17 +63,16 @@
#.
msgid ""
msgstr ""
-"Project-Id-Version: e2fsprogs 1.41.1\n"
+"Project-Id-Version: e2fsprogs 1.41.8\n"
"Report-Msgid-Bugs-To: tytso at alum.mit.edu\n"
-"POT-Creation-Date: 2009-01-26 20:41-0500\n"
-"PO-Revision-Date: 2008-09-03 00:02+0200\n"
+"POT-Creation-Date: 2009-07-11 17:49-0400\n"
+"PO-Revision-Date: 2009-11-27 15:29+0100\n"
"Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: e2fsck/badblocks.c:22 misc/mke2fs.c:165
#, c-format
@@ -89,10 +88,10 @@ msgid "while reading the bad blocks inode"
msgstr "podczas odczytu i-wêz³a wadliwych bloków"
#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:1037 e2fsck/unix.c:1120 misc/badblocks.c:1148
-#: misc/badblocks.c:1156 misc/badblocks.c:1170 misc/badblocks.c:1182
-#: misc/dumpe2fs.c:505 misc/e2image.c:576 misc/e2image.c:672
-#: misc/e2image.c:688 misc/mke2fs.c:181 misc/tune2fs.c:1515 resize/main.c:309
+#: e2fsck/unix.c:1057 e2fsck/unix.c:1140 misc/badblocks.c:1155
+#: misc/badblocks.c:1163 misc/badblocks.c:1177 misc/badblocks.c:1189
+#: misc/dumpe2fs.c:510 misc/e2image.c:583 misc/e2image.c:679
+#: misc/e2image.c:695 misc/mke2fs.c:181 misc/tune2fs.c:1532 resize/main.c:310
#, c-format
msgid "while trying to open %s"
msgstr "podczas próby otworzenia %s"
@@ -113,9 +112,7 @@ msgstr "podczas uaktualniania i-w
#: e2fsck/badblocks.c:130
#, c-format
msgid "Warning: illegal block %u found in bad block inode. Cleared.\n"
-msgstr ""
-"Uwaga: znaleziono niedopuszczalny blok %u w i-wê¼le wadliwego bloku. "
-"Wyczyszczono.\n"
+msgstr "Uwaga: znaleziono niedopuszczalny blok %u w i-wê¼le wadliwego bloku. Wyczyszczono.\n"
#: e2fsck/ehandler.c:54
#, c-format
@@ -188,21 +185,21 @@ msgstr "ioctl BLKFLSBUF nie obs
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr "Sk³adnia: %s [-F] [-I bloki_bufora_i-wêz³ów] urz±dzenie\n"
-#: e2fsck/iscan.c:83 e2fsck/unix.c:818
+#: e2fsck/iscan.c:83 e2fsck/unix.c:817
#, c-format
msgid "while opening %s for flushing"
msgstr "podczas otwierania %s w celu opró¿nienia"
-#: e2fsck/iscan.c:88 e2fsck/unix.c:824 resize/main.c:285
+#: e2fsck/iscan.c:88 e2fsck/unix.c:823 resize/main.c:286
#, c-format
msgid "while trying to flush %s"
msgstr "podczas próby opró¿nienia %s"
-#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:482
+#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:489
msgid "while opening inode scan"
msgstr "podczas otwierania obrazu i-wêz³ów"
-#: e2fsck/iscan.c:129 misc/e2image.c:500
+#: e2fsck/iscan.c:129 misc/e2image.c:507
msgid "while getting next inode"
msgstr "podczas pobierania nastêpnego i-wêz³a"
@@ -225,18 +222,17 @@ msgstr "%s: nie znaleziono poprawnego superbloku kroniki\n"
msgid "%s: journal too short\n"
msgstr "%s: kronika za krótka\n"
-#: e2fsck/journal.c:858
+#: e2fsck/journal.c:860
#, c-format
msgid "%s: recovering journal\n"
msgstr "%s: odtwarzanie z kroniki\n"
-#: e2fsck/journal.c:860
+#: e2fsck/journal.c:862
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
-msgstr ""
-"%s: odtworzenie z kroniki nie zostanie wykonane w trybie tylko do odczytu\n"
+msgstr "%s: odtworzenie z kroniki nie zostanie wykonane w trybie tylko do odczytu\n"
-#: e2fsck/journal.c:881
+#: e2fsck/journal.c:887
#, c-format
msgid "while trying to re-open %s"
msgstr "podczas próby ponownego otwarcia %s"
@@ -441,30 +437,30 @@ msgstr "gniazdo"
msgid "unknown file type with mode 0%o"
msgstr "nieznany rodzaj pliku typu 0%o"
-#: e2fsck/pass1b.c:215
+#: e2fsck/pass1b.c:220
msgid "multiply claimed inode map"
msgstr "wielokrotnie zadeklarowana mapa i-wêz³ów"
-#: e2fsck/pass1b.c:567 e2fsck/pass1b.c:700
+#: e2fsck/pass1b.c:581 e2fsck/pass1b.c:714
#, c-format
msgid "internal error: can't find dup_blk for %u\n"
msgstr "b³±d wewnêtrzny; nie mo¿na znale¼æ dup_blk dla %u\n"
-#: e2fsck/pass1b.c:743
+#: e2fsck/pass1b.c:757
msgid "returned from clone_file_block"
msgstr "powrót z clone_file_block"
-#: e2fsck/pass1b.c:762
+#: e2fsck/pass1b.c:776
#, c-format
msgid "internal error: couldn't lookup EA block record for %u"
msgstr "b³±d wewnêtrzny: nie mo¿na znale¼æ rekordu bloku EA dla %u"
-#: e2fsck/pass1b.c:774
+#: e2fsck/pass1b.c:788
#, c-format
msgid "internal error: couldn't lookup EA inode record for %u"
msgstr "B³±d wewnêtrzny: nie mo¿na znale¼æ rekordu i-wêz³a EA dla %u"
-#: e2fsck/pass1.c:430 e2fsck/pass2.c:780
+#: e2fsck/pass1.c:430 e2fsck/pass2.c:782
msgid "reading directory block"
msgstr "odczytu bloku katalogu"
@@ -492,39 +488,39 @@ msgstr "rozpoczynania przeszukiwania i-w
msgid "getting next inode from scan"
msgstr "pobierania nastêpnego i-wêz³a"
-#: e2fsck/pass1.c:1122
+#: e2fsck/pass1.c:1123
msgid "Pass 1"
msgstr "Przebieg 1"
-#: e2fsck/pass1.c:1181
+#: e2fsck/pass1.c:1180
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr "odczytu niebezpo¶rednich bloków i-wêz³a %u"
-#: e2fsck/pass1.c:1225
+#: e2fsck/pass1.c:1224
msgid "bad inode map"
msgstr "b³êdna mapa i-wêz³ów"
-#: e2fsck/pass1.c:1247
+#: e2fsck/pass1.c:1246
msgid "inode in bad block map"
msgstr "i-wêze³ w mapie wadliwych bloków"
-#: e2fsck/pass1.c:1267
+#: e2fsck/pass1.c:1266
msgid "imagic inode map"
msgstr "mapa i-wêz³ów imagic"
-#: e2fsck/pass1.c:1294
+#: e2fsck/pass1.c:1293
msgid "multiply claimed block map"
msgstr "wielokrotnie zadeklarowana mapa bloków"
-#: e2fsck/pass1.c:1393
+#: e2fsck/pass1.c:1392
msgid "ext attr block map"
msgstr "mapa bloków rozszerzonych atrybutów"
#: e2fsck/pass1.c:2134
-#, fuzzy, c-format
+#, c-format
msgid "%6lu(%c): expecting %6lu got phys %6lu (blkcnt %lld)\n"
-msgstr "%6lu: oczekiwano %6lu, otrzymano phys %6lu (blkcnt %lld)\n"
+msgstr "%6lu(%c): oczekiwano %6lu, otrzymano phys %6lu (blkcnt %lld)\n"
#: e2fsck/pass1.c:2449
msgid "block bitmap"
@@ -538,35 +534,35 @@ msgstr "bitmapa i-w
msgid "inode table"
msgstr "tablica i-wêz³ów"
-#: e2fsck/pass2.c:284
+#: e2fsck/pass2.c:283
msgid "Pass 2"
msgstr "Przebieg 2"
-#: e2fsck/pass2.c:803
+#: e2fsck/pass2.c:805
msgid "Can not continue."
msgstr "Nie mo¿na kontynuowaæ."
-#: e2fsck/pass3.c:79
+#: e2fsck/pass3.c:76
msgid "inode done bitmap"
msgstr "bitmapa wykonanych i-wêz³ów"
-#: e2fsck/pass3.c:90
+#: e2fsck/pass3.c:84
msgid "Peak memory"
msgstr "Najwiêksze u¿ycie pamiêci"
-#: e2fsck/pass3.c:146
+#: e2fsck/pass3.c:134
msgid "Pass 3"
msgstr "Przebieg 3"
-#: e2fsck/pass3.c:334
+#: e2fsck/pass3.c:320
msgid "inode loop detection bitmap"
msgstr "bitmapa wykrywania pêtli i-wêz³ów"
-#: e2fsck/pass4.c:196
+#: e2fsck/pass4.c:191
msgid "Pass 4"
msgstr "Przebieg 4"
-#: e2fsck/pass5.c:70
+#: e2fsck/pass5.c:64
msgid "Pass 5"
msgstr "Przebieg 5"
@@ -861,15 +857,14 @@ msgstr "Hurd nie obs
#. @-expanded: superblock has an invalid journal (inode %i).\n
#: e2fsck/problem.c:187
-#, fuzzy, c-format
+#, c-format
msgid "@S has an @n @j (@i %i).\n"
-msgstr "@S ma b³êdn± kronikê ext3 (@i %i).\n"
+msgstr "@S ma b³êdn± kronikê (@i %i).\n"
#. @-expanded: External journal has multiple filesystem users (unsupported).\n
#: e2fsck/problem.c:192
msgid "External @j has multiple @f users (unsupported).\n"
-msgstr ""
-"Zewnêtrzna @j ma wielu u¿ytkowników systemu plików (nie obs³ugiwane).\n"
+msgstr "Zewnêtrzna @j ma wielu u¿ytkowników systemu plików (nie obs³ugiwane).\n"
#. @-expanded: Can't find external journal\n
#: e2fsck/problem.c:197
@@ -891,111 +886,92 @@ msgstr "Zewn
#. @-expanded: format.\n
#. @-expanded: It is also possible the journal superblock is corrupt.\n
#: e2fsck/problem.c:212
-#, fuzzy
msgid ""
"@f @j @S is unknown type %N (unsupported).\n"
-"It is likely that your copy of e2fsck is old and/or doesn't support this @j "
-"format.\n"
+"It is likely that your copy of e2fsck is old and/or doesn't support this @j format.\n"
"It is also possible the @j @S is corrupt.\n"
msgstr ""
-"@S kroniki ext3 ma nieznany typ %N (nie obs³ugiwany).\n"
+"@S kroniki systemu plików ma nieznany typ %N (nie obs³ugiwany).\n"
"Mo¿liwe, ¿e ta kopia e2fsck jest stara i/lub nie obs³uguje tego formatu\n"
"kroniki.\n"
"Mo¿liwe te¿, ¿e @S kroniki jest uszkodzony.\n"
#. @-expanded: journal superblock is corrupt.\n
#: e2fsck/problem.c:220
-#, fuzzy
msgid "@j @S is corrupt.\n"
-msgstr "@S kroniki ext3 jest uszkodzony.\n"
+msgstr "@S kroniki jest uszkodzony.\n"
#. @-expanded: superblock has_journal flag is clear, but a journal %s is present.\n
#: e2fsck/problem.c:225
-#, fuzzy, c-format
+#, c-format
msgid "@S has_ at j flag is clear, but a @j %s is present.\n"
-msgstr "flaga odtworzenia ext3 wyzerowana, ale @j zawiera dane.\n"
+msgstr "flaga has_journal @Su jest wyzerowana, ale @j %s istnieje.\n"
#. @-expanded: superblock needs_recovery flag is set, but no journal is present.\n
#: e2fsck/problem.c:230
-#, fuzzy
msgid "@S needs_recovery flag is set, but no @j is present.\n"
msgstr "@S ma ustawion± flagê needs_recovery, ale nie ma kroniki.\n"
#. @-expanded: superblock needs_recovery flag is clear, but journal has data.\n
#: e2fsck/problem.c:235
-#, fuzzy
msgid "@S needs_recovery flag is clear, but @j has data.\n"
-msgstr "flaga odtworzenia ext3 wyzerowana, ale @j zawiera dane.\n"
+msgstr "flaga needs_recovery @Su jest wyzerowana, ale @j zawiera dane.\n"
#. @-expanded: Clear journal
#: e2fsck/problem.c:240
msgid "Clear @j"
msgstr "Wyczy¶ciæ kronikê"
-#. @-expanded: Run journal anyway
-#: e2fsck/problem.c:245
-msgid "Run @j anyway"
-msgstr "Wykonaæ zapisy z kroniki"
-
-#. @-expanded: Recovery flag not set in backup superblock, so running journal anyway.\n
-#: e2fsck/problem.c:250
-msgid "Recovery flag not set in backup @S, so running @j anyway.\n"
-msgstr ""
-"Flaga odtworzenia nie ustawiona w zapasowym @Su,\n"
-"wiêc wykonujê zapisy z kroniki mimo to.\n"
+#. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem.
+#: e2fsck/problem.c:245 e2fsck/problem.c:647
+msgid "@f has feature flag(s) set, but is a revision 0 @f. "
+msgstr "@f ma ustawione flagi cech, ale ma wersjê 0 systemu plików. "
#. @-expanded: %s orphaned inode %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n
-#: e2fsck/problem.c:255
+#: e2fsck/problem.c:250
msgid "%s @o @i %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n"
msgstr "%s @o @i %i (uid=%Iu, gid=%Ig, uprawnienia=%Im, rozmiar=%Is)\n"
#. @-expanded: illegal block #%B (%b) found in orphaned inode %i.\n
-#: e2fsck/problem.c:260
+#: e2fsck/problem.c:255
msgid "@I @b #%B (%b) found in @o @i %i.\n"
msgstr "znaleziono @I @b #%B (%b) w @om i-wê¼le %i.\n"
#. @-expanded: Already cleared block #%B (%b) found in orphaned inode %i.\n
-#: e2fsck/problem.c:265
+#: e2fsck/problem.c:260
msgid "Already cleared @b #%B (%b) found in @o @i %i.\n"
msgstr "Ju¿ wyczyszczono @b #%B (%b) znaleziony w @om i-wê¼le %i.\n"
#. @-expanded: illegal orphaned inode %i in superblock.\n
-#: e2fsck/problem.c:270
+#: e2fsck/problem.c:265
#, c-format
msgid "@I @o @i %i in @S.\n"
msgstr "@I @o @i %i w @Su.\n"
#. @-expanded: illegal inode %i in orphaned inode list.\n
-#: e2fsck/problem.c:275
+#: e2fsck/problem.c:270
#, c-format
msgid "@I @i %i in @o @i list.\n"
msgstr "@I @i %i w li¶cie @och i-wêz³ów.\n"
-#. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem.
-#: e2fsck/problem.c:280 e2fsck/problem.c:647
-msgid "@f has feature flag(s) set, but is a revision 0 @f. "
-msgstr "@f ma ustawione flagi cech, ale ma wersjê 0 systemu plików. "
-
#. @-expanded: journal superblock has an unknown read-only feature flag set.\n
-#: e2fsck/problem.c:285
-#, fuzzy
+#: e2fsck/problem.c:275
msgid "@j @S has an unknown read-only feature flag set.\n"
-msgstr "@S kroniki ext3 ma ustawion± nieznan± flagê tylko do odczytu.\n"
+msgstr "@S kroniki ma ustawion± nieznan± flagê tylko do odczytu.\n"
#. @-expanded: journal superblock has an unknown incompatible feature flag set.\n
-#: e2fsck/problem.c:290
-#, fuzzy
+#: e2fsck/problem.c:280
msgid "@j @S has an unknown incompatible feature flag set.\n"
-msgstr "@S kroniki ext3 ma ustawion± flagê nieznanej cechy.\n"
+msgstr "@S kroniki ma ustawion± flagê nieznanej cechy.\n"
#. @-expanded: journal version not supported by this e2fsck.\n
-#: e2fsck/problem.c:295
+#: e2fsck/problem.c:285
msgid "@j version not supported by this e2fsck.\n"
msgstr "Wersja kroniki nie obs³ugiwana przez ten e2fsck.\n"
#. @-expanded: Moving journal from /%s to hidden inode.\n
#. @-expanded: \n
-#: e2fsck/problem.c:300
+#: e2fsck/problem.c:290
#, c-format
msgid ""
"Moving @j from /%s to hidden @i.\n"
@@ -1006,7 +982,7 @@ msgstr ""
#. @-expanded: Error moving journal: %m\n
#. @-expanded: \n
-#: e2fsck/problem.c:305
+#: e2fsck/problem.c:295
#, c-format
msgid ""
"Error moving @j: %m\n"
@@ -1018,7 +994,7 @@ msgstr ""
#. @-expanded: Found invalid V2 journal superblock fields (from V1 journal).\n
#. @-expanded: Clearing fields beyond the V1 journal superblock...\n
#. @-expanded: \n
-#: e2fsck/problem.c:310
+#: e2fsck/problem.c:300
msgid ""
"Found @n V2 @j @S fields (from V1 @j).\n"
"Clearing fields beyond the V1 @j @S...\n"
@@ -1028,6 +1004,18 @@ msgstr ""
"Czyszczenie pól spoza @Su kroniki V1...\n"
"\n"
+#. @-expanded: Run journal anyway
+#: e2fsck/problem.c:306
+msgid "Run @j anyway"
+msgstr "Wykonaæ zapisy z kroniki"
+
+#. @-expanded: Recovery flag not set in backup superblock, so running journal anyway.\n
+#: e2fsck/problem.c:311
+msgid "Recovery flag not set in backup @S, so running @j anyway.\n"
+msgstr ""
+"Flaga odtworzenia nie ustawiona w zapasowym @Su,\n"
+"wiêc wykonujê zapisy z kroniki mimo to.\n"
+
#. @-expanded: Backing up journal inode block information.\n
#. @-expanded: \n
#: e2fsck/problem.c:316
@@ -1049,8 +1037,7 @@ msgstr ""
#. @-expanded: Resize_inode not enabled, but the resize inode is non-zero.
#: e2fsck/problem.c:327
msgid "Resize_ at i not enabled, but the resize @i is non-zero. "
-msgstr ""
-"Resize_inode nie w³±czone, ale i-wêze³ zmiany rozmiaru jest niezerowy. "
+msgstr "Resize_inode nie w³±czone, ale i-wêze³ zmiany rozmiaru jest niezerowy. "
#. @-expanded: Resize inode not valid.
#: e2fsck/problem.c:332
@@ -1118,7 +1105,7 @@ msgstr "Transakcja %i kroniki by
#: e2fsck/problem.c:385
msgid "The test_fs flag is set (and ext4 is available). "
-msgstr ""
+msgstr "Flags test_fs jest ustawiona (i ext4 jest dostêpny). "
#. @-expanded: Pass 1: Checking inodes, blocks, and sizes\n
#: e2fsck/problem.c:392
@@ -1233,8 +1220,7 @@ msgstr "Podw
#. @-expanded: Bad block %b used as bad block inode indirect block.
#: e2fsck/problem.c:496
msgid "Bad @b %b used as bad @b @i indirect @b. "
-msgstr ""
-"Wadliwy @b %b jest u¿ywany jako niebiezpo¶redni @b i-wê¼³a z wadliwym @biem. "
+msgstr "Wadliwy @b %b jest u¿ywany jako niebiezpo¶redni @b i-wê¼³a z wadliwym @biem. "
#. @-expanded: \n
#. @-expanded: The bad block inode has probably been corrupted. You probably\n
@@ -1333,7 +1319,7 @@ msgid "Warning: could not write @b %b for %s: %m\n"
msgstr "Uwaga: nie mo¿na zapisaæ @bu %b do %s: %m\n"
#. @-expanded: error allocating inode bitmap (%N): %m\n
-#: e2fsck/problem.c:577 e2fsck/problem.c:1378
+#: e2fsck/problem.c:577 e2fsck/problem.c:1383
msgid "@A @i @B (%N): %m\n"
msgstr "@A bitmapy i-wêz³ów (%N): %m\n"
@@ -1369,14 +1355,12 @@ msgstr "B
#. @-expanded: Error storing inode count information (inode=%i, count=%N): %m\n
#: e2fsck/problem.c:607
msgid "Error storing @i count information (@i=%i, count=%N): %m\n"
-msgstr ""
-"B³±d podczas zapisu informacji o liczbie i-wêz³ów (@i=%i, liczba=%N): %m\n"
+msgstr "B³±d podczas zapisu informacji o liczbie i-wêz³ów (@i=%i, liczba=%N): %m\n"
#. @-expanded: Error storing directory block information (inode=%i, block=%b, num=%N): %m\n
#: e2fsck/problem.c:612
msgid "Error storing @d @b information (@i=%i, @b=%b, num=%N): %m\n"
-msgstr ""
-"B³±d podczas zapisu informacji o @dch @bach (@i=%i, @b=%b, liczba=%N): %m\n"
+msgstr "B³±d podczas zapisu informacji o @dch @bach (@i=%i, @b=%b, liczba=%N): %m\n"
#. @-expanded: Error reading inode %i: %m\n
#: e2fsck/problem.c:618
@@ -1479,8 +1463,7 @@ msgstr "@A @bu rozszerzonych atrybut
#. @-expanded: extended attribute block %b is corrupt (allocation collision).
#: e2fsck/problem.c:713
msgid "@a @b %b is corrupt (allocation collision). "
-msgstr ""
-"@b rozszerzonych atrybutów %b jest uszkodzony (kolizja przydzielania). "
+msgstr "@b rozszerzonych atrybutów %b jest uszkodzony (kolizja przydzielania). "
#. @-expanded: extended attribute block %b is corrupt (invalid name).
#: e2fsck/problem.c:718
@@ -1517,8 +1500,7 @@ msgstr "@b #%B (%b) powoduje,
#: e2fsck/problem.c:747
#, c-format
msgid "@i %i has INDEX_FL flag set on @f without htree support.\n"
-msgstr ""
-"@i %i ma ustawion± flagê INDEX_FL na systemie plików bez obs³ugi htree.\n"
+msgstr "@i %i ma ustawion± flagê INDEX_FL na systemie plików bez obs³ugi htree.\n"
#. @-expanded: inode %i has INDEX_FL flag set but is not a directory.\n
#: e2fsck/problem.c:752
@@ -1574,21 +1556,21 @@ msgstr "@i %i ma dodatkowy rozmiar (%IS), co jest b
msgid "@a in @i %i has a namelen (%N) which is @n\n"
msgstr "@a w i-wê¼le %i ma namelen (%N), co jest b³êdne\n"
-#. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n
-#: e2fsck/problem.c:798
-msgid "@a in @i %i has a value size (%N) which is @n\n"
-msgstr "@a w i-wê¼le %i ma rozmiar warto¶ci (%N), co jest b³êdne\n"
-
#. @-expanded: extended attribute in inode %i has a value offset (%N) which is invalid\n
-#: e2fsck/problem.c:803
+#: e2fsck/problem.c:798
msgid "@a in @i %i has a value offset (%N) which is @n\n"
msgstr "@a w i-wê¼le %i ma przesuniêcie warto¶ci (%N), co jest b³êdne\n"
#. @-expanded: extended attribute in inode %i has a value block (%N) which is invalid (must be 0)\n
-#: e2fsck/problem.c:808
+#: e2fsck/problem.c:803
msgid "@a in @i %i has a value @b (%N) which is @n (must be 0)\n"
msgstr "@a w i-wê¼le %i ma @b warto¶ci (%N), co jest b³êdne (musi byæ 0)\n"
+#. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n
+#: e2fsck/problem.c:808
+msgid "@a in @i %i has a value size (%N) which is @n\n"
+msgstr "@a w i-wê¼le %i ma rozmiar warto¶ci (%N), co jest b³êdne\n"
+
#. @-expanded: extended attribute in inode %i has a hash (%N) which is invalid\n
#: e2fsck/problem.c:813
msgid "@a in @i %i has a hash (%N) which is @n\n"
@@ -1612,6 +1594,8 @@ msgid ""
"Failed to iterate extents in @i %i\n"
"\t(op %s, blk %b, lblk %c): %m\n"
msgstr ""
+"Nie uda³o siê przej¶æ fragmentów w i-wê¼le %i\n"
+"\t(op %s, blk %b, lblk %c): %m\n"
#. @-expanded: inode %i has an invalid extent\n
#. @-expanded: \t(logical block %c, invalid physical block %b, len %N)\n
@@ -1637,16 +1621,13 @@ msgstr ""
#: e2fsck/problem.c:844
#, c-format
msgid "@i %i has EXTENTS_FL flag set on @f without extents support.\n"
-msgstr ""
-"@i %i ma ustawion± flagê EXTENTS_FL na systemie plików bez obs³ugi "
-"fragmentów.\n"
+msgstr "@i %i ma ustawion± flagê EXTENTS_FL na systemie plików bez obs³ugi fragmentów.\n"
#. @-expanded: inode %i is in extent format, but superblock is missing EXTENTS feature\n
#: e2fsck/problem.c:849
#, c-format
msgid "@i %i is in extent format, but @S is missing EXTENTS feature\n"
-msgstr ""
-"@i %i ma format z fragmentami, ale w superbloku brakuje w³a¶ciwo¶ci EXTENTS\n"
+msgstr "@i %i ma format z fragmentami, ale w superbloku brakuje w³a¶ciwo¶ci EXTENTS\n"
#. @-expanded: inode %i missing EXTENT_FL, but is in extents format\n
#: e2fsck/problem.c:854
@@ -1672,7 +1653,7 @@ msgstr ""
#. @-expanded: inode %i has an invalid extent node (blk %b, lblk %c)\n
#: e2fsck/problem.c:868
msgid "@i %i has an invalid extent node (blk %b, lblk %c)\n"
-msgstr ""
+msgstr "@i %i ma b³êdny wêze³ fragmentu (blk %b, lblk %c)\n"
#. @-expanded: \n
#. @-expanded: Running additional passes to resolve blocks claimed by more than one inode...\n
@@ -1714,15 +1695,12 @@ msgstr "B
#. @-expanded: Error adjusting refcount for extended attribute block %b (inode %i): %m\n
#: e2fsck/problem.c:911 e2fsck/problem.c:1227
msgid "Error adjusting refcount for @a @b %b (@i %i): %m\n"
-msgstr ""
-"B³±d podczas poprawiania refcount dla @bu rozszerzonych atrybutów %b (@i %"
-"i): %m\n"
+msgstr "B³±d podczas poprawiania refcount dla @bu rozszerzonych atrybutów %b (@i %i): %m\n"
#. @-expanded: Pass 1C: Scanning directories for inodes with multiply-claimed blocks\n
#: e2fsck/problem.c:917
msgid "Pass 1C: Scanning directories for @is with @m @bs\n"
-msgstr ""
-"Przebieg 1C: Przeszukiwanie katalogów pod k±tem i-wêz³ów z @mmi @bami\n"
+msgstr "Przebieg 1C: Przeszukiwanie katalogów pod k±tem i-wêz³ów z @mmi @bami\n"
#. @-expanded: Pass 1D: Reconciling multiply-claimed blocks\n
#: e2fsck/problem.c:923
@@ -1919,7 +1897,7 @@ msgstr "@E jest powielonym @eem '.'.\n"
msgid "@E is duplicate '..' @e.\n"
msgstr "@E jest powielonym @eem '..'.\n"
-#: e2fsck/problem.c:1108 e2fsck/problem.c:1403
+#: e2fsck/problem.c:1108 e2fsck/problem.c:1408
#, c-format
msgid "Internal error: couldn't find dir_info for %i.\n"
msgstr "B³±d wewnêtrzny: nie mo¿na znale¼æ dir_info dla %i.\n"
@@ -2063,8 +2041,7 @@ msgstr "@p i-w
#. @-expanded: problem in HTREE directory inode %d: node (%B) has an unordered hash table\n
#: e2fsck/problem.c:1247
msgid "@p @h %d: node (%B) has an unordered hash table\n"
-msgstr ""
-"@p i-wê¼le @du HTREE %d: wêze³ (%B) ma nie uporz±dkowan± tablicê haszuj±c±\n"
+msgstr "@p i-wê¼le @du HTREE %d: wêze³ (%B) ma nie uporz±dkowan± tablicê haszuj±c±\n"
#. @-expanded: problem in HTREE directory inode %d: node (%B) has invalid depth (%N)\n
#: e2fsck/problem.c:1252
@@ -2112,102 +2089,105 @@ msgstr "Nieoczekiwany @b w i-w
#. @-expanded: entry '%Dn' in %p (%i) references inode %Di in group %g where _INODE_UNINIT is set.\n
#: e2fsck/problem.c:1281
-#, fuzzy
msgid "@E references @i %Di in @g %g where _INODE_UNINIT is set.\n"
-msgstr "@i %i znaleziony w grupie %g, która ma ustawion± flagê _INONE_UNINIT. "
+msgstr "@i %Di znaleziony w grupie %g, która ma ustawion± flagê _INONE_UNINIT.\n"
#. @-expanded: entry '%Dn' in %p (%i) references inode %Di found in group %g's unused inodes area.\n
#: e2fsck/problem.c:1286
-#, fuzzy
msgid "@E references @i %Di found in @g %g's unused inodes area.\n"
-msgstr "@i %i znaleziony w grupie %g obszaru nie u¿ywanych i-wêz³ów. "
+msgstr "@i %Di znaleziony w grupie %g obszaru nie u¿ywanych i-wêz³ów.\n"
+
+#. @-expanded: i_file_acl_hi for inode %i (%Q) is %N, should be zero.\n
+#: e2fsck/problem.c:1291
+msgid "i_file_acl_hi @F %N, @s zero.\n"
+msgstr "i_file_acl_hi @F %N, @s zero.\n"
#. @-expanded: Pass 3: Checking directory connectivity\n
-#: e2fsck/problem.c:1293
+#: e2fsck/problem.c:1298
msgid "Pass 3: Checking @d connectivity\n"
msgstr "Przebieg 3: Sprawdzanie ³±czno¶ci @dów\n"
#. @-expanded: root inode not allocated.
-#: e2fsck/problem.c:1298
+#: e2fsck/problem.c:1303
msgid "@r not allocated. "
msgstr "@r jest nie przydzielony. "
#. @-expanded: No room in lost+found directory.
-#: e2fsck/problem.c:1303
+#: e2fsck/problem.c:1308
msgid "No room in @l @d. "
msgstr "Brak miejsca w @du @l. "
#. @-expanded: Unconnected directory inode %i (%p)\n
-#: e2fsck/problem.c:1308
+#: e2fsck/problem.c:1313
#, c-format
msgid "Unconnected @d @i %i (%p)\n"
msgstr "Nie pod³±czony @i @du %i (%p)\n"
#. @-expanded: /lost+found not found.
-#: e2fsck/problem.c:1313
+#: e2fsck/problem.c:1318
msgid "/@l not found. "
msgstr "Nie znaleziono /@l. "
#. @-expanded: '..' in %Q (%i) is %P (%j), should be %q (%d).\n
-#: e2fsck/problem.c:1318
+#: e2fsck/problem.c:1323
msgid "'..' in %Q (%i) is %P (%j), @s %q (%d).\n"
msgstr "'..' w %Q (%i) jest %P (%j), @s %q (%d).\n"
#. @-expanded: Bad or non-existent /lost+found. Cannot reconnect.\n
-#: e2fsck/problem.c:1323
+#: e2fsck/problem.c:1328
msgid "Bad or non-existent /@l. Cannot reconnect.\n"
msgstr "B³êdny lub nie istniej±cy /@l. Nie mo¿na pod³±czyæ.\n"
#. @-expanded: Could not expand /lost+found: %m\n
-#: e2fsck/problem.c:1328
+#: e2fsck/problem.c:1333
#, c-format
msgid "Could not expand /@l: %m\n"
msgstr "Nie mo¿na rozszerzyæ /@l: %m\n"
-#: e2fsck/problem.c:1333
+#: e2fsck/problem.c:1338
#, c-format
msgid "Could not reconnect %i: %m\n"
msgstr "Nie mo¿na pod³±czyæ %i: %m\n"
#. @-expanded: Error while trying to find /lost+found: %m\n
-#: e2fsck/problem.c:1338
+#: e2fsck/problem.c:1343
#, c-format
msgid "Error while trying to find /@l: %m\n"
msgstr "B³±d podczas szukania /@l: %m\n"
#. @-expanded: ext2fs_new_block: %m while trying to create /lost+found directory\n
-#: e2fsck/problem.c:1343
+#: e2fsck/problem.c:1348
#, c-format
msgid "ext2fs_new_ at b: %m while trying to create /@l @d\n"
msgstr "ext2fs_new_block: %m podczas próby utworzenia @du /@l\n"
#. @-expanded: ext2fs_new_inode: %m while trying to create /lost+found directory\n
-#: e2fsck/problem.c:1348
+#: e2fsck/problem.c:1353
#, c-format
msgid "ext2fs_new_ at i: %m while trying to create /@l @d\n"
msgstr "ext2fs_new_inode: %m podczas próby utworzenia @du /@l\n"
#. @-expanded: ext2fs_new_dir_block: %m while creating new directory block\n
-#: e2fsck/problem.c:1353
+#: e2fsck/problem.c:1358
#, c-format
msgid "ext2fs_new_dir_ at b: %m while creating new @d @b\n"
msgstr "ext2fs_new_dir_block: %m podczas tworzenia nowego @bu @du\n"
#. @-expanded: ext2fs_write_dir_block: %m while writing the directory block for /lost+found\n
-#: e2fsck/problem.c:1358
+#: e2fsck/problem.c:1363
#, c-format
msgid "ext2fs_write_dir_ at b: %m while writing the @d @b for /@l\n"
msgstr "ext2fs_write_dir_block: %m podczas zapisu @bu @du dla /@l\n"
#. @-expanded: Error while adjusting inode count on inode %i\n
-#: e2fsck/problem.c:1363
+#: e2fsck/problem.c:1368
#, c-format
msgid "Error while adjusting @i count on @i %i\n"
msgstr "B³±d podczas poprawiania liczby i-wêz³ów w i-wê¼le %i\n"
#. @-expanded: Couldn't fix parent of inode %i: %m\n
#. @-expanded: \n
-#: e2fsck/problem.c:1368
+#: e2fsck/problem.c:1373
#, c-format
msgid ""
"Couldn't fix parent of @i %i: %m\n"
@@ -2218,7 +2198,7 @@ msgstr ""
#. @-expanded: Couldn't fix parent of inode %i: Couldn't find parent directory entry\n
#. @-expanded: \n
-#: e2fsck/problem.c:1373
+#: e2fsck/problem.c:1378
#, c-format
msgid ""
"Couldn't fix parent of @i %i: Couldn't find parent @d @e\n"
@@ -2228,76 +2208,75 @@ msgstr ""
"\n"
#. @-expanded: Error creating root directory (%s): %m\n
-#: e2fsck/problem.c:1383
+#: e2fsck/problem.c:1388
#, c-format
msgid "Error creating root @d (%s): %m\n"
msgstr "B³±d podczas tworzenia g³ównego @du (%s): %m\n"
#. @-expanded: Error creating /lost+found directory (%s): %m\n
-#: e2fsck/problem.c:1388
+#: e2fsck/problem.c:1393
#, c-format
msgid "Error creating /@l @d (%s): %m\n"
msgstr "B³±d podczas tworzenia @du /@l (%s): %m\n"
#. @-expanded: root inode is not a directory; aborting.\n
-#: e2fsck/problem.c:1393
+#: e2fsck/problem.c:1398
msgid "@r is not a @d; aborting.\n"
msgstr "@r nie jest @diem; przerwanie.\n"
#. @-expanded: Cannot proceed without a root inode.\n
-#: e2fsck/problem.c:1398
+#: e2fsck/problem.c:1403
msgid "Cannot proceed without a @r.\n"
msgstr "Nie mo¿na kontynuowaæ bez g³ównego katalogu.\n"
#. @-expanded: /lost+found is not a directory (ino=%i)\n
-#: e2fsck/problem.c:1408
+#: e2fsck/problem.c:1413
#, c-format
msgid "/@l is not a @d (ino=%i)\n"
msgstr "/@l nie jest @diem (@i=%i)\n"
-#: e2fsck/problem.c:1415
+#: e2fsck/problem.c:1420
msgid "Pass 3A: Optimizing directories\n"
msgstr "Przebieg 3A: Optymalizacja katalogów\n"
-#: e2fsck/problem.c:1420
-#, fuzzy, c-format
+#: e2fsck/problem.c:1425
+#, c-format
msgid "Failed to create dirs_to_hash iterator: %m\n"
-msgstr "Tworzenie iteratora dirs_to_hash nie powiod³o siê: %m"
+msgstr "Tworzenie iteratora dirs_to_hash nie powiod³o siê: %m\n"
-#: e2fsck/problem.c:1425
-#, fuzzy
+#: e2fsck/problem.c:1430
msgid "Failed to optimize directory %q (%d): %m\n"
-msgstr "Optymalizacja katalogu %q (%d) nie powiod³a siê: %m"
+msgstr "Optymalizacja katalogu %q (%d) nie powiod³a siê: %m\n"
-#: e2fsck/problem.c:1430
+#: e2fsck/problem.c:1435
msgid "Optimizing directories: "
msgstr "Optymalizacja katalogów: "
-#: e2fsck/problem.c:1447
+#: e2fsck/problem.c:1452
msgid "Pass 4: Checking reference counts\n"
msgstr "Przebieg 4: Sprawdzanie liczników odwo³añ\n"
#. @-expanded: unattached zero-length inode %i.
-#: e2fsck/problem.c:1452
+#: e2fsck/problem.c:1457
#, c-format
msgid "@u @z @i %i. "
msgstr "@u @i @z %i. "
#. @-expanded: unattached inode %i\n
-#: e2fsck/problem.c:1457
+#: e2fsck/problem.c:1462
#, c-format
msgid "@u @i %i\n"
msgstr "@u @i %i\n"
#. @-expanded: inode %i ref count is %Il, should be %N.
-#: e2fsck/problem.c:1462
+#: e2fsck/problem.c:1467
msgid "@i %i ref count is %Il, @s %N. "
msgstr "licznik odwo³añ i-wêz³a %i wynosi %Il, @s %N. "
#. @-expanded: WARNING: PROGRAMMING BUG IN E2FSCK!\n
#. @-expanded: \tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n
#. @-expanded: inode_link_info[%i] is %N, inode.i_links_count is %Il. They should be the same!\n
-#: e2fsck/problem.c:1466
+#: e2fsck/problem.c:1471
msgid ""
"WARNING: PROGRAMMING BUG IN E2FSCK!\n"
"\tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n"
@@ -2308,87 +2287,77 @@ msgstr ""
"inode_link_info[%i]=%N, inode.i_links_count=%Il. Powinny byæ takie same!\n"
#. @-expanded: Pass 5: Checking group summary information\n
-#: e2fsck/problem.c:1476
+#: e2fsck/problem.c:1481
msgid "Pass 5: Checking @g summary information\n"
msgstr "Przebieg 5: Sprawdzanie sumarycznych informacji o @gch\n"
#. @-expanded: Padding at end of inode bitmap is not set.
-#: e2fsck/problem.c:1481
+#: e2fsck/problem.c:1486
msgid "Padding at end of @i @B is not set. "
msgstr "Wype³nienie na koñcu bitmapy i-wêz³ów nie jest ustawione. "
#. @-expanded: Padding at end of block bitmap is not set.
-#: e2fsck/problem.c:1486
+#: e2fsck/problem.c:1491
msgid "Padding at end of @b @B is not set. "
msgstr "Wype³nienie na koñcu bitmapy @bów nie jest ustawione. "
#. @-expanded: block bitmap differences:
-#: e2fsck/problem.c:1491
+#: e2fsck/problem.c:1496
msgid "@b @B differences: "
msgstr "Ró¿nice bitmapy @bów: "
#. @-expanded: inode bitmap differences:
-#: e2fsck/problem.c:1511
+#: e2fsck/problem.c:1516
msgid "@i @B differences: "
msgstr "Ró¿nice bitmapy i-wêz³ów: "
#. @-expanded: Free inodes count wrong for group #%g (%i, counted=%j).\n
-#: e2fsck/problem.c:1531
+#: e2fsck/problem.c:1536
msgid "Free @is count wrong for @g #%g (%i, counted=%j).\n"
msgstr "B³êdna liczba wolnych i-wêz³ów dla grupy #%g (%i, naliczono %j).\n"
#. @-expanded: Directories count wrong for group #%g (%i, counted=%j).\n
-#: e2fsck/problem.c:1536
+#: e2fsck/problem.c:1541
msgid "Directories count wrong for @g #%g (%i, counted=%j).\n"
msgstr "B³êdna liczba katalogów dla grupy #%g (%i, naliczono %j).\n"
#. @-expanded: Free inodes count wrong (%i, counted=%j).\n
-#: e2fsck/problem.c:1541
+#: e2fsck/problem.c:1546
msgid "Free @is count wrong (%i, counted=%j).\n"
msgstr "B³êdna liczba wolnych i-wêz³ów (%i, naliczono %j).\n"
#. @-expanded: Free blocks count wrong for group #%g (%b, counted=%c).\n
-#: e2fsck/problem.c:1546
+#: e2fsck/problem.c:1551
msgid "Free @bs count wrong for @g #%g (%b, counted=%c).\n"
msgstr "B³êdna liczba wolnych @bów dla grupy #%g (%b, naliczono %c).\n"
#. @-expanded: Free blocks count wrong (%b, counted=%c).\n
-#: e2fsck/problem.c:1551
+#: e2fsck/problem.c:1556
msgid "Free @bs count wrong (%b, counted=%c).\n"
msgstr "B³êdna liczba wolnych @bów (%b, naliczono %c).\n"
#. @-expanded: PROGRAMMING ERROR: filesystem (#%N) bitmap endpoints (%b, %c) don't match calculated bitmap
#. @-expanded: endpoints (%i, %j)\n
-#: e2fsck/problem.c:1556
-msgid ""
-"PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B "
-"endpoints (%i, %j)\n"
-msgstr ""
-"B£¡D PROGRAMU: koñce bitmap systemu plików (#%N) (%b, %c) nie zgadzaj± siê z "
-"policzonymi koñcami bitmap (%i, %j)\n"
+#: e2fsck/problem.c:1561
+msgid "PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B endpoints (%i, %j)\n"
+msgstr "B£¡D PROGRAMU: koñce bitmap systemu plików (#%N) (%b, %c) nie zgadzaj± siê z policzonymi koñcami bitmap (%i, %j)\n"
-#: e2fsck/problem.c:1562
+#: e2fsck/problem.c:1567
msgid "Internal error: fudging end of bitmap (%N)\n"
msgstr "B³±d wewnêtrzny: fa³szywy koniec bitmapy (%N)\n"
#. @-expanded: Error copying in replacement inode bitmap: %m\n
-#: e2fsck/problem.c:1567
+#: e2fsck/problem.c:1572
#, c-format
msgid "Error copying in replacement @i @B: %m\n"
msgstr "B³±d podczas kopiowania w zastêpczej bitmapie i-wêz³ów: %m\n"
#. @-expanded: Error copying in replacement block bitmap: %m\n
-#: e2fsck/problem.c:1572
+#: e2fsck/problem.c:1577
#, c-format
msgid "Error copying in replacement @b @B: %m\n"
msgstr "B³±d podczas kopiowania w zastêpczej bitmapie @bów: %m\n"
-#. @-expanded: Recreate journal
-#: e2fsck/problem.c:1597
-#, fuzzy
-msgid "Recreate @j"
-msgstr "Odtworzyæ"
-
#. @-expanded: group %g block(s) in use but group is marked BLOCK_UNINIT\n
#: e2fsck/problem.c:1602
#, c-format
@@ -2401,12 +2370,17 @@ msgstr "@b(i) grupy %g s
msgid "@g %g @i(s) in use but @g is marked INODE_UNINIT\n"
msgstr "i-wêz³y grupy %g s± u¿ywane, ale @g ma flagê INODE_UNINIT\n"
-#: e2fsck/problem.c:1725
+#. @-expanded: Recreate journal
+#: e2fsck/problem.c:1614
+msgid "Recreate @j"
+msgstr "Odtworzyæ kronikê"
+
+#: e2fsck/problem.c:1732
#, c-format
msgid "Unhandled error code (0x%x)!\n"
msgstr "Nie obs³u¿ony kod b³êdu (0x%x)!\n"
-#: e2fsck/problem.c:1820
+#: e2fsck/problem.c:1827
msgid "IGNORED"
msgstr "ZIGNOROWANO"
@@ -2467,8 +2441,7 @@ msgid ""
" -p Automatic repair (no questions)\n"
" -n Make no changes to the filesystem\n"
" -y Assume \"yes\" to all questions\n"
-" -c Check for bad blocks and add them to the badblock "
-"list\n"
+" -c Check for bad blocks and add them to the badblock list\n"
" -f Force checking even if filesystem is marked clean\n"
msgstr ""
"\n"
@@ -2477,8 +2450,7 @@ msgstr ""
" -n Nie wykonywanie zmian w systemie plików\n"
" -y Przyjêcie odpowiedzi \"tak\" na wszystkie pytania\n"
" -c Szukanie wadliwych bloków i dodanie ich do listy\n"
-" -f Wymuszenie sprawdzenia nawet \"czystego\" systemu "
-"plików\n"
+" -f Wymuszenie sprawdzenia nawet \"czystego\" systemu plików\n"
#: e2fsck/unix.c:88
#, c-format
@@ -2492,8 +2464,7 @@ msgid ""
msgstr ""
" -v Pokazywanie wiêkszej ilo¶ci informacji\n"
" -b superblok U¿ycie innego superbloku\n"
-" -B rozm.bloku Wymuszenie rozmiaru bloku przy poszukiwaniu "
-"superbloku\n"
+" -B rozm.bloku Wymuszenie rozmiaru bloku przy poszukiwaniu superbloku\n"
" -j zewn-kronika Ustawienie po³o¿enia zewnêtrznej kroniki\n"
" -l plik_z³ych_bloków Dodanie do listy wadliwych bloków\n"
" -L plik_z³ych_bloków Ustawienie listy wadliwych bloków\n"
@@ -2513,8 +2484,8 @@ msgstr " liczba i-w
msgid " Extent depth histogram: "
msgstr " Histogram g³êboko¶ci fragmentów: "
-#: e2fsck/unix.c:207 misc/badblocks.c:916 misc/tune2fs.c:1567 misc/util.c:151
-#: resize/main.c:248
+#: e2fsck/unix.c:207 misc/badblocks.c:928 misc/tune2fs.c:1584 misc/util.c:151
+#: resize/main.c:249
#, c-format
msgid "while determining whether %s is mounted."
msgstr "podczas sprawdzania, czy %s jest podmontowany."
@@ -2651,17 +2622,17 @@ msgstr "Mo
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr "Opcja -t nie jest obs³ugiwana przez tê wersjê e2fsck.\n"
-#: e2fsck/unix.c:801 misc/tune2fs.c:549 misc/tune2fs.c:833 misc/tune2fs.c:850
+#: e2fsck/unix.c:801 misc/tune2fs.c:550 misc/tune2fs.c:835 misc/tune2fs.c:853
#, c-format
msgid "Unable to resolve '%s'"
msgstr "Nie uda³o siê rozwi±zaæ '%s'"
-#: e2fsck/unix.c:831
+#: e2fsck/unix.c:830
#, c-format
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
msgstr "Opcje -c oraz -l/-L nie mog± byæ podane jednocze¶nie.\n"
-#: e2fsck/unix.c:879
+#: e2fsck/unix.c:878
#, c-format
msgid ""
"E2FSCK_JBD_DEBUG \"%s\" not an integer\n"
@@ -2670,7 +2641,7 @@ msgstr ""
"E2FSCK_JBD_DEBUG \"%s\" nie jest liczb± ca³kowit±\n"
"\n"
-#: e2fsck/unix.c:888
+#: e2fsck/unix.c:887
#, c-format
msgid ""
"\n"
@@ -2681,38 +2652,43 @@ msgstr ""
"B³êdny argument nieliczbowy dla -%c (\"%s\")\n"
"\n"
-#: e2fsck/unix.c:929
+#: e2fsck/unix.c:961
#, c-format
msgid "Error: ext2fs library version out of date!\n"
msgstr "B³±d: wersja biblioteki ext2fs jest za stara!\n"
-#: e2fsck/unix.c:937
+#: e2fsck/unix.c:969
msgid "while trying to initialize program"
msgstr "podczas próby inicjalizacji programu"
-#: e2fsck/unix.c:951
+#: e2fsck/unix.c:980
#, c-format
msgid "\tUsing %s, %s\n"
msgstr "\tU¿ywane %s, %s\n"
-#: e2fsck/unix.c:963
+#: e2fsck/unix.c:992
msgid "need terminal for interactive repairs"
msgstr "interaktywna naprawa wymaga terminala"
-#: e2fsck/unix.c:1010
+#: e2fsck/unix.c:1021
#, c-format
msgid "%s: %s trying backup blocks...\n"
-msgstr "%s: %s podczas próby wykonania kopii zapasowej bloków...\n"
+msgstr "%s: %s próba u¿ycia zapasowych bloków...\n"
-#: e2fsck/unix.c:1012
+#: e2fsck/unix.c:1023
msgid "Superblock invalid,"
msgstr "Superblok b³êdny,"
-#: e2fsck/unix.c:1013
+#: e2fsck/unix.c:1024
msgid "Group descriptors look bad..."
msgstr "Deskryptory grup wygl±daj± ¼le..."
-#: e2fsck/unix.c:1040
+#: e2fsck/unix.c:1034
+#, c-format
+msgid "%s: going back to original superblock\n"
+msgstr "%s: powracanie do oryginalnego superbloku\n"
+
+#: e2fsck/unix.c:1060
#, c-format
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
@@ -2723,28 +2699,27 @@ msgstr ""
"(lub superblok systemu plików jest uszkodzony)\n"
"\n"
-#: e2fsck/unix.c:1046
+#: e2fsck/unix.c:1066
#, c-format
msgid "Could this be a zero-length partition?\n"
msgstr "Czy to mo¿e jest partycja zerowej d³ugo¶ci?\n"
-#: e2fsck/unix.c:1048
+#: e2fsck/unix.c:1068
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr "Trzeba mieæ dostêp %s do systemu plików lub byæ rootem\n"
-#: e2fsck/unix.c:1053
+#: e2fsck/unix.c:1073
#, c-format
msgid "Possibly non-existent or swap device?\n"
msgstr "Zapewne nie istniej±ce urz±dzenie lub swap?\n"
-#: e2fsck/unix.c:1055
+#: e2fsck/unix.c:1075
#, c-format
msgid "Filesystem mounted or opened exclusively by another program?\n"
-msgstr ""
-"System plików podmontowany lub otwarty na wy³±czno¶æ przez inny program?\n"
+msgstr "System plików podmontowany lub otwarty na wy³±czno¶æ przez inny program?\n"
-#: e2fsck/unix.c:1059
+#: e2fsck/unix.c:1079
#, c-format
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
@@ -2753,44 +2728,42 @@ msgstr ""
"Dysk zabezpieczony przed zapisem; mo¿na u¿yæ opcji -n aby sprawdziæ\n"
"urz±dzenie w trybie tylko do odczytu.\n"
-#: e2fsck/unix.c:1123
+#: e2fsck/unix.c:1143
msgid "Get a newer version of e2fsck!"
msgstr "Potrzeba nowszej wersji e2fsck!"
-#: e2fsck/unix.c:1147
+#: e2fsck/unix.c:1173
#, c-format
msgid "while checking ext3 journal for %s"
msgstr "podczas sprawdzania kroniki ext3 dla %s"
-#: e2fsck/unix.c:1158
+#: e2fsck/unix.c:1184
#, c-format
-msgid ""
-"Warning: skipping journal recovery because doing a read-only filesystem "
-"check.\n"
+msgid "Warning: skipping journal recovery because doing a read-only filesystem check.\n"
msgstr ""
"Uwaga: pominiêto odtwarzanie z kroniki z powodu sprawdzania w trybie tylko\n"
"do odczytu.\n"
-#: e2fsck/unix.c:1171
+#: e2fsck/unix.c:1197
#, c-format
msgid "unable to set superblock flags on %s\n"
msgstr "nie mo¿na ustawiæ flag superbloku na %s\n"
-#: e2fsck/unix.c:1177
+#: e2fsck/unix.c:1203
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr "podczas odtwarzania z kroniki ext3 dla %s"
-#: e2fsck/unix.c:1201
+#: e2fsck/unix.c:1228
#, c-format
msgid "%s has unsupported feature(s):"
msgstr "%s ma w³±czone nie obs³ugiwane cechy:"
-#: e2fsck/unix.c:1217
+#: e2fsck/unix.c:1244
msgid "Warning: compression support is experimental.\n"
msgstr "Uwaga: obs³uga kompresji jest eksperymentalna.\n"
-#: e2fsck/unix.c:1222
+#: e2fsck/unix.c:1249
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
@@ -2799,25 +2772,25 @@ msgstr ""
"E2fsck skompilowany bez obs³ugi HTREE,\n"
"\tale system plików %s ma katalogi HTREE.\n"
-#: e2fsck/unix.c:1276
+#: e2fsck/unix.c:1302
msgid "while reading bad blocks inode"
msgstr "podczas odczytu i-wêz³a wadliwych bloków"
-#: e2fsck/unix.c:1278
+#: e2fsck/unix.c:1304
#, c-format
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr "Nie wró¿y to dobrze, ale spróbujê kontynuowaæ...\n"
-#: e2fsck/unix.c:1304
+#: e2fsck/unix.c:1330
msgid "Couldn't determine journal size"
msgstr "Nie uda³o siê okre¶liæ rozmiaru kroniki"
-#: e2fsck/unix.c:1307
+#: e2fsck/unix.c:1333
#, c-format
msgid "Creating journal (%d blocks): "
msgstr "Tworzenie kroniki (%d bloków): "
-#: e2fsck/unix.c:1314 misc/mke2fs.c:2091
+#: e2fsck/unix.c:1340 misc/mke2fs.c:2113
msgid ""
"\n"
"\twhile trying to create journal"
@@ -2825,12 +2798,12 @@ msgstr ""
"\n"
"\tpodczas próby utworzenia kroniki"
-#: e2fsck/unix.c:1317
+#: e2fsck/unix.c:1343
#, c-format
msgid " Done.\n"
msgstr " Wykonano.\n"
-#: e2fsck/unix.c:1318
+#: e2fsck/unix.c:1344
#, c-format
msgid ""
"\n"
@@ -2839,25 +2812,25 @@ msgstr ""
"\n"
"*** kronika zosta³a ponownie utworzona - system plików to znowu ext3 ***\n"
-#: e2fsck/unix.c:1325
+#: e2fsck/unix.c:1351
#, c-format
msgid "Restarting e2fsck from the beginning...\n"
msgstr "Restart e2fsck od pocz±tku...\n"
-#: e2fsck/unix.c:1329
+#: e2fsck/unix.c:1355
msgid "while resetting context"
msgstr "podczas resetowania kontekstu"
-#: e2fsck/unix.c:1336
+#: e2fsck/unix.c:1362
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr "%s: e2fsck przerwany.\n"
-#: e2fsck/unix.c:1341
+#: e2fsck/unix.c:1367
msgid "aborted"
msgstr "przerwano"
-#: e2fsck/unix.c:1353
+#: e2fsck/unix.c:1379
#, c-format
msgid ""
"\n"
@@ -2866,12 +2839,12 @@ msgstr ""
"\n"
"%s: ***** SYSTEM PLIKÓW ZMODYFIKOWANY *****\n"
-#: e2fsck/unix.c:1356
+#: e2fsck/unix.c:1382
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr "%s: ***** WYMAGANY RESTART LINUKSA *****\n"
-#: e2fsck/unix.c:1364
+#: e2fsck/unix.c:1390
#, c-format
msgid ""
"\n"
@@ -2882,7 +2855,7 @@ msgstr ""
"%s: ********** UWAGA: System plików nadal ma b³êdy **********\n"
"\n"
-#: e2fsck/unix.c:1400
+#: e2fsck/unix.c:1426
msgid "while setting block group checksum info"
msgstr "podczas ustawiania informacji o sumie kontrolnej grupy bloków"
@@ -2980,37 +2953,37 @@ msgstr ""
"%s: NIEOCZEKIWANA NIESPÓJNO¦Æ; TRZEBA URUCHOMIÆ fsck RÊCZNIE.\n"
"\t(tzn. bez opcji -a ani -p)\n"
-#: e2fsck/util.c:336
+#: e2fsck/util.c:341
#, c-format
-msgid "Memory used: %dk/%dk (%dk/%dk), "
-msgstr "U¿yta pamiêæ: %dk/%dk (%dk/%dk), "
+msgid "Memory used: %luk/%luk (%luk/%luk), "
+msgstr "U¿yta pamiêæ: %luk/%luk (%luk/%luk), "
-#: e2fsck/util.c:340
+#: e2fsck/util.c:345
#, c-format
-msgid "Memory used: %d, "
-msgstr "U¿yta pamiêæ: %d, "
+msgid "Memory used: %lu, "
+msgstr "U¿yta pamiêæ: %lu, "
-#: e2fsck/util.c:346
+#: e2fsck/util.c:352
#, c-format
msgid "time: %5.2f/%5.2f/%5.2f\n"
msgstr "czas: %5.2f/%5.2f/%5.2f\n"
-#: e2fsck/util.c:351
+#: e2fsck/util.c:357
#, c-format
msgid "elapsed time: %6.3f\n"
msgstr "up³yn±³ czas: %6.f\n"
-#: e2fsck/util.c:385 e2fsck/util.c:399
+#: e2fsck/util.c:391 e2fsck/util.c:405
#, c-format
-msgid "while reading inode %ld in %s"
-msgstr "podczas odczytu i-wêz³a %ld w %s"
+msgid "while reading inode %lu in %s"
+msgstr "podczas odczytu i-wêz³a %lu w %s"
-#: e2fsck/util.c:413 e2fsck/util.c:426
+#: e2fsck/util.c:419 e2fsck/util.c:432
#, c-format
-msgid "while writing inode %ld in %s"
-msgstr "podczas zapisu i-wêz³a %ld w %s"
+msgid "while writing inode %lu in %s"
+msgstr "podczas zapisu i-wêz³a %lu w %s"
-#: e2fsck/util.c:575
+#: e2fsck/util.c:581
msgid "while allocating zeroizing buffer"
msgstr "podczas przydzielania bufora zeruj±cego"
@@ -3022,8 +2995,7 @@ msgstr "zako
#, c-format
msgid ""
"Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnf]\n"
-" [-c blocks_at_once] [-d delay_factor_between_reads] [-e "
-"max_bad_blocks]\n"
+" [-c blocks_at_once] [-d delay_factor_between_reads] [-e max_bad_blocks]\n"
" [-p num_passes] [-t test_pattern [-t test_pattern [...]]]\n"
" device [last_block [first_block]]\n"
msgstr ""
@@ -3045,77 +3017,77 @@ msgstr ""
#: misc/badblocks.c:202
#, c-format
msgid "%6.2f%% done, %s elapsed"
-msgstr ""
+msgstr "Gotowe w %6.2f%%, minê³o %s"
-#: misc/badblocks.c:289
+#: misc/badblocks.c:293
msgid "Testing with random pattern: "
msgstr "Testowanie wzorcem losowym: "
-#: misc/badblocks.c:307
+#: misc/badblocks.c:311
msgid "Testing with pattern 0x"
msgstr "Testowanie wzorcem 0x"
-#: misc/badblocks.c:335 misc/badblocks.c:404
+#: misc/badblocks.c:339 misc/badblocks.c:408
msgid "during seek"
msgstr "podczas przeskakiwania"
-#: misc/badblocks.c:346
+#: misc/badblocks.c:350
#, c-format
msgid "Weird value (%ld) in do_read\n"
msgstr "Dziwna warto¶æ (%ld) w do_read\n"
-#: misc/badblocks.c:424
+#: misc/badblocks.c:428
msgid "during ext2fs_sync_device"
msgstr "podczas ext2fs_sync_device"
-#: misc/badblocks.c:440 misc/badblocks.c:699
+#: misc/badblocks.c:447 misc/badblocks.c:711
msgid "while beginning bad block list iteration"
msgstr "podczas rozpoczynania iteracji po li¶cie wadliwych bloków"
-#: misc/badblocks.c:454 misc/badblocks.c:551 misc/badblocks.c:709
+#: misc/badblocks.c:461 misc/badblocks.c:563 misc/badblocks.c:721
msgid "while allocating buffers"
msgstr "podczas przydzielania buforów"
-#: misc/badblocks.c:458
+#: misc/badblocks.c:465
#, c-format
msgid "Checking blocks %lu to %lu\n"
msgstr "Sprawdzanie bloków od %lu do %lu\n"
-#: misc/badblocks.c:463
+#: misc/badblocks.c:470
msgid "Checking for bad blocks in read-only mode\n"
msgstr "Poszukiwanie wadliwych bloków w trybie tylko do odczytu\n"
-#: misc/badblocks.c:472
+#: misc/badblocks.c:479
msgid "Checking for bad blocks (read-only test): "
msgstr "Poszukiwanie wadliwych bloków (tylko odczyt): "
-#: misc/badblocks.c:480 misc/badblocks.c:583 misc/badblocks.c:628
-#: misc/badblocks.c:772
+#: misc/badblocks.c:487 misc/badblocks.c:595 misc/badblocks.c:640
+#: misc/badblocks.c:784
msgid "Too many bad blocks, aborting test\n"
msgstr "Zbyt du¿o wadliwych bloków, przerwanie testu\n"
-#: misc/badblocks.c:558
+#: misc/badblocks.c:570
msgid "Checking for bad blocks in read-write mode\n"
msgstr "Poszukiwanie wadliwych bloków w trybie odczytu i zapisu\n"
-#: misc/badblocks.c:560 misc/badblocks.c:722
+#: misc/badblocks.c:572 misc/badblocks.c:734
#, c-format
msgid "From block %lu to %lu\n"
msgstr "Od bloku %lu do %lu\n"
-#: misc/badblocks.c:618
+#: misc/badblocks.c:630
msgid "Reading and comparing: "
msgstr "Odczyt i porównywanie: "
-#: misc/badblocks.c:721
+#: misc/badblocks.c:733
msgid "Checking for bad blocks in non-destructive read-write mode\n"
msgstr "Poszukiwanie wadliwych bloków w trybie z niedestruktywnym zapisem\n"
-#: misc/badblocks.c:727
+#: misc/badblocks.c:739
msgid "Checking for bad blocks (non-destructive read-write test)\n"
msgstr "Poszukiwanie wadliwych bloków (odczyt i niedestruktywny zapis)\n"
-#: misc/badblocks.c:734
+#: misc/badblocks.c:746
msgid ""
"\n"
"Interrupt caught, cleaning up\n"
@@ -3124,57 +3096,52 @@ msgstr ""
"Otrzymano przerwanie, sprz±tam\n"
"\n"
-#: misc/badblocks.c:810
+#: misc/badblocks.c:822
#, c-format
msgid "during test data write, block %lu"
msgstr "podczas zapisu testowych danych, blok %lu"
-#: misc/badblocks.c:921 misc/util.c:156
+#: misc/badblocks.c:933 misc/util.c:156
#, c-format
msgid "%s is mounted; "
msgstr "%s jest podmontowany; "
-#: misc/badblocks.c:923
+#: misc/badblocks.c:935
msgid "badblocks forced anyway. Hope /etc/mtab is incorrect.\n"
msgstr "badblocks wymuszone mimo to. Mam nadziejê, ¿e /etc/mtab siê myli.\n"
-#: misc/badblocks.c:928
+#: misc/badblocks.c:940
msgid "it's not safe to run badblocks!\n"
msgstr "nie jest bezpiecznie uruchamiaæ badblocks!\n"
-#: misc/badblocks.c:933 misc/util.c:167
+#: misc/badblocks.c:945 misc/util.c:167
#, c-format
msgid "%s is apparently in use by the system; "
msgstr "%s jest najwyra¼niej u¿ywany przez system; "
-#: misc/badblocks.c:936
+#: misc/badblocks.c:948
msgid "badblocks forced anyway.\n"
msgstr "badblocks wymuszone mimo to.\n"
-#: misc/badblocks.c:956
+#: misc/badblocks.c:968
#, c-format
msgid "invalid %s - %s"
msgstr "b³êdny %s - %s"
-#: misc/badblocks.c:1015
-#, c-format
-msgid "bad block size - %s"
-msgstr "rozmiar wadliwego bloku - %s"
-
-#: misc/badblocks.c:1070
+#: misc/badblocks.c:1077
#, c-format
msgid "can't allocate memory for test_pattern - %s"
msgstr "nie mo¿na przydzieliæ pamiêci na wzorzec_testowy - %s"
-#: misc/badblocks.c:1097
+#: misc/badblocks.c:1104
msgid "Maximum of one test_pattern may be specified in read-only mode"
msgstr "W trybie odczytu-zapisu mo¿na podaæ najwy¿ej jeden wzorzec testowy"
-#: misc/badblocks.c:1103
+#: misc/badblocks.c:1110
msgid "Random test_pattern is not allowed in read-only mode"
msgstr "W trybie samego odczytu nie mo¿na podaæ wzorca_testowego"
-#: misc/badblocks.c:1117
+#: misc/badblocks.c:1124
msgid ""
"Couldn't determine device size; you must specify\n"
"the size manually\n"
@@ -3182,86 +3149,91 @@ msgstr ""
"Nie mo¿na okre¶liæ rozmiaru urz±dzenia; trzeba podaæ\n"
"rozmiar rêcznie\n"
-#: misc/badblocks.c:1123
+#: misc/badblocks.c:1130
msgid "while trying to determine device size"
msgstr "podczas próby okre¶lenia rozmiaru urz±dzenia"
-#: misc/badblocks.c:1128
+#: misc/badblocks.c:1135
msgid "last block"
msgstr "ostatni blok"
-#: misc/badblocks.c:1134
+#: misc/badblocks.c:1141
msgid "first block"
msgstr "pierwszy blok"
-#: misc/badblocks.c:1137
+#: misc/badblocks.c:1144
#, c-format
msgid "invalid starting block (%lu): must be less than %lu"
msgstr "b³êdny pocz±tkowy blok (%lu): musi byæ mniejszy ni¿ %lu"
-#: misc/badblocks.c:1193
+#: misc/badblocks.c:1200
msgid "while creating in-memory bad blocks list"
msgstr "podczas tworzenia listy wadliwych bloków w pamiêci"
-#: misc/badblocks.c:1208
+#: misc/badblocks.c:1215
msgid "while adding to in-memory bad block list"
msgstr "podczas dodawania do listy wadliwych bloków w pamiêci"
-#: misc/badblocks.c:1232
+#: misc/badblocks.c:1239
#, c-format
msgid "Pass completed, %u bad blocks found.\n"
msgstr "Przebieg zakoñczony, znaleziono %u wadliwych bloków.\n"
#: misc/chattr.c:85
#, c-format
-msgid "Usage: %s [-RVf] [-+=AacDdijsSu] [-v version] files...\n"
-msgstr "Sk³adnia: %s [-RVf] [-+=AacDdijsSu] [-v wersja] pliki...\n"
+msgid "Usage: %s [-RVf] [-+=AacDdeijsSu] [-v version] files...\n"
+msgstr "Sk³adnia: %s [-RVf] [-+=AacDdeijsSu] [-v wersja] pliki...\n"
-#: misc/chattr.c:152
+#: misc/chattr.c:153
#, c-format
msgid "bad version - %s\n"
msgstr "b³êdna wersja - %s\n"
-#: misc/chattr.c:198 misc/lsattr.c:113
+#: misc/chattr.c:200 misc/lsattr.c:115
#, c-format
msgid "while trying to stat %s"
msgstr "podczas próby stat %s"
-#: misc/chattr.c:204 misc/chattr.c:222
-#, c-format
-msgid "Flags of %s set as "
-msgstr "Flagi %s ustawiono jako "
-
-#: misc/chattr.c:214
+#: misc/chattr.c:207
#, c-format
msgid "while reading flags on %s"
msgstr "podczas odczytu flag %s"
-#: misc/chattr.c:231
+#: misc/chattr.c:216 misc/chattr.c:235
+#, c-format
+msgid "Clearing extent flag not supported on %s"
+msgstr "Usuwanie flagi extent nie jest obs³ugiwane na %s"
+
+#: misc/chattr.c:221 misc/chattr.c:240
+#, c-format
+msgid "Flags of %s set as "
+msgstr "Flagi %s ustawiono jako "
+
+#: misc/chattr.c:249
#, c-format
msgid "while setting flags on %s"
msgstr "podczas ustawiania flag %s"
-#: misc/chattr.c:239
+#: misc/chattr.c:257
#, c-format
msgid "Version of %s set as %lu\n"
msgstr "Wersja %s ustawiona jako %lu\n"
-#: misc/chattr.c:243
+#: misc/chattr.c:261
#, c-format
msgid "while setting version on %s"
msgstr "podczas ustawiania wersji %s"
-#: misc/chattr.c:263
+#: misc/chattr.c:281
#, c-format
msgid "Couldn't allocate path variable in chattr_dir_proc"
msgstr "Nie mo¿na przydzieliæ zmiennej path w chattr_dir_proc"
-#: misc/chattr.c:302
+#: misc/chattr.c:320
msgid "= is incompatible with - and +\n"
msgstr "= jest niekompatybilne z - i +\n"
-#: misc/chattr.c:310
+#: misc/chattr.c:328
msgid "Must use '-v', =, - or +\n"
msgstr "Trzeba u¿yæ '-v', =, - lub +\n"
@@ -3350,32 +3322,32 @@ msgstr " Wolne bloki: "
msgid " Free inodes: "
msgstr " Wolne i-wêz³y: "
-#: misc/dumpe2fs.c:264
+#: misc/dumpe2fs.c:268
msgid "while printing bad block list"
msgstr "podczas wypisywania listy wadliwych bloków"
-#: misc/dumpe2fs.c:270
+#: misc/dumpe2fs.c:274
#, c-format
msgid "Bad blocks: %u"
msgstr "Wadliwe bloki: %u"
-#: misc/dumpe2fs.c:292 misc/tune2fs.c:279
+#: misc/dumpe2fs.c:297 misc/tune2fs.c:281
msgid "while reading journal inode"
msgstr "podczas odczytu i-wêz³a kroniki"
-#: misc/dumpe2fs.c:295
+#: misc/dumpe2fs.c:300
msgid "Journal size: "
msgstr "Rozmiar kroniki: "
-#: misc/dumpe2fs.c:319 misc/tune2fs.c:200
+#: misc/dumpe2fs.c:324 misc/tune2fs.c:202
msgid "while reading journal superblock"
msgstr "podczas odczytu superbloku kroniki"
-#: misc/dumpe2fs.c:327
+#: misc/dumpe2fs.c:332
msgid "Couldn't find journal superblock magic numbers"
msgstr "Nie mo¿na znale¼æ magicznych liczb superbloku kroniki"
-#: misc/dumpe2fs.c:331
+#: misc/dumpe2fs.c:336
#, c-format
msgid ""
"\n"
@@ -3394,27 +3366,27 @@ msgstr ""
"Pocz±tek kroniki: %u\n"
"Liczba u¿ytkowników kroniki: %u\n"
-#: misc/dumpe2fs.c:344
+#: misc/dumpe2fs.c:349
#, c-format
msgid "Journal users: %s\n"
msgstr "U¿ytkownicy kroniki: %s\n"
-#: misc/dumpe2fs.c:360 misc/mke2fs.c:693 misc/tune2fs.c:868
+#: misc/dumpe2fs.c:365 misc/mke2fs.c:693 misc/tune2fs.c:872
#, c-format
msgid "Couldn't allocate memory to parse options!\n"
msgstr "Nie mo¿na przydzieliæ pamiêci do analizy opcji!\n"
-#: misc/dumpe2fs.c:386
+#: misc/dumpe2fs.c:391
#, c-format
msgid "Invalid superblock parameter: %s\n"
msgstr "B³êdny parametr superblock: %s\n"
-#: misc/dumpe2fs.c:401
+#: misc/dumpe2fs.c:406
#, c-format
msgid "Invalid blocksize parameter: %s\n"
msgstr "B³êdny parametr blocksize: %s\n"
-#: misc/dumpe2fs.c:412
+#: misc/dumpe2fs.c:417
#, c-format
msgid ""
"\n"
@@ -3437,18 +3409,18 @@ msgstr ""
"\tsuperblock=<numer superbloku>\n"
"\tblocksize=<rozmiar bloku>\n"
-#: misc/dumpe2fs.c:471 misc/mke2fs.c:1355
+#: misc/dumpe2fs.c:476 misc/mke2fs.c:1355
#, c-format
msgid "\tUsing %s\n"
msgstr "\tU¿ywane %s\n"
-#: misc/dumpe2fs.c:507 misc/e2image.c:674 misc/tune2fs.c:1518
-#: resize/main.c:311
+#: misc/dumpe2fs.c:512 misc/e2image.c:681 misc/tune2fs.c:1535
+#: resize/main.c:312
#, c-format
msgid "Couldn't find valid filesystem superblock.\n"
msgstr "Nie mo¿na znale¼æ poprawnego superbloku systemu plików.\n"
-#: misc/dumpe2fs.c:532
+#: misc/dumpe2fs.c:537
#, c-format
msgid ""
"\n"
@@ -3507,7 +3479,7 @@ msgstr "e2label: b
msgid "e2label: not an ext2 filesystem\n"
msgstr "e2label: to nie jest system plików ext2\n"
-#: misc/e2label.c:96 misc/tune2fs.c:1653
+#: misc/e2label.c:96 misc/tune2fs.c:1670
#, c-format
msgid "Warning: label too long, truncating.\n"
msgstr "Uwaga: etykieta za d³uga, skrócono.\n"
@@ -3522,7 +3494,7 @@ msgstr "e2label: nie mo
msgid "e2label: error writing superblock\n"
msgstr "e2label: b³±d podczas zapisu superbloku\n"
-#: misc/e2label.c:116 misc/tune2fs.c:541
+#: misc/e2label.c:116 misc/tune2fs.c:542
#, c-format
msgid "Usage: e2label device [newlabel]\n"
msgstr "Sk³adnia: e2label urz±dzenie [nowa-etykieta]\n"
@@ -3579,17 +3551,17 @@ msgstr "Odtworzono transakcj
msgid "Failed write %s\n"
msgstr "Nie uda³o siê zapisaæ %s\n"
-#: misc/fsck.c:347
+#: misc/fsck.c:343
#, c-format
msgid "WARNING: couldn't open %s: %s\n"
msgstr "UWAGA: nie mo¿na otworzyæ %s: %s\n"
-#: misc/fsck.c:357
+#: misc/fsck.c:353
#, c-format
msgid "WARNING: bad format on line %d of %s\n"
msgstr "UWAGA: z³y format w linii %d pliku %s\n"
-#: misc/fsck.c:372
+#: misc/fsck.c:368
msgid ""
"\a\a\aWARNING: Your /etc/fstab does not contain the fsck passno\n"
"\tfield. I will kludge around things for you, but you\n"
@@ -3600,37 +3572,37 @@ msgstr ""
"Pominê ten b³±d, ale /etc/fstab nale¿y jak najszybciej poprawiæ.\n"
"\n"
-#: misc/fsck.c:481
+#: misc/fsck.c:477
#, c-format
msgid "fsck: %s: not found\n"
msgstr "fsck: %s: nie znaleziono\n"
-#: misc/fsck.c:597
+#: misc/fsck.c:593
#, c-format
msgid "%s: wait: No more child process?!?\n"
msgstr "%s: wait: Nie ma wiêcej procesów potomnych?!?\n"
-#: misc/fsck.c:619
+#: misc/fsck.c:615
#, c-format
msgid "Warning... %s for device %s exited with signal %d.\n"
msgstr "Uwaga... %s dla urz±dzenia %s zakoñczy³ siê sygna³em %d.\n"
-#: misc/fsck.c:625
+#: misc/fsck.c:621
#, c-format
msgid "%s %s: status is %x, should never happen.\n"
msgstr "%s %s: status wynosi %x, to siê nie powinno nigdy zdarzyæ.\n"
-#: misc/fsck.c:664
+#: misc/fsck.c:660
#, c-format
msgid "Finished with %s (exit status %d)\n"
msgstr "Skoñczono z %s (status wyj¶cia %d)\n"
-#: misc/fsck.c:724
+#: misc/fsck.c:720
#, c-format
msgid "%s: Error %d while executing fsck.%s for %s\n"
msgstr "%s: B³±d %d podczas wykonywania fsck.%s dla %s\n"
-#: misc/fsck.c:745
+#: misc/fsck.c:741
msgid ""
"Either all or none of the filesystem types passed to -t must be prefixed\n"
"with 'no' or '!'.\n"
@@ -3638,46 +3610,39 @@ msgstr ""
"Albo wszystkie, albo ¿aden rodzaj systemu plików z podanych po -t musi byæ\n"
"poprzedzony 'no' lub '!'.\n"
-#: misc/fsck.c:764
+#: misc/fsck.c:760
msgid "Couldn't allocate memory for filesystem types\n"
msgstr "Nie mo¿na przydzieliæ pamiêci na rodzaje systemów plików\n"
-#: misc/fsck.c:887
+#: misc/fsck.c:883
#, c-format
-msgid ""
-"%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
-"number\n"
-msgstr ""
-"%s: pominiêto b³êdn± liniê w /etc/fstab: montowanie bind z niezerowym "
-"numerem przebiegu fsck\n"
+msgid "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number\n"
+msgstr "%s: pominiêto b³êdn± liniê w /etc/fstab: montowanie bind z niezerowym numerem przebiegu fsck\n"
-#: misc/fsck.c:914
+#: misc/fsck.c:910
#, c-format
msgid "fsck: cannot check %s: fsck.%s not found\n"
msgstr "fsck: nie mo¿na sprawdziæ %s: fsck.%s nie znaleziony\n"
-#: misc/fsck.c:970
+#: misc/fsck.c:966
msgid "Checking all file systems.\n"
msgstr "Sprawdzanie wszystkich systemów plików.\n"
-#: misc/fsck.c:1061
+#: misc/fsck.c:1057
#, c-format
msgid "--waiting-- (pass %d)\n"
msgstr "--oczekiwanie-- (przebieg %d)\n"
-#: misc/fsck.c:1081
-msgid ""
-"Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
-msgstr ""
-"Sk³adnia: fsck [-AMNPRTV] [ -C [ deskryptor ] ] [-t rodzaj-fs] [opcje-fs] "
-"[system-plików ...]\n"
+#: misc/fsck.c:1077
+msgid "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
+msgstr "Sk³adnia: fsck [-AMNPRTV] [ -C [ deskryptor ] ] [-t rodzaj-fs] [opcje-fs] [system-plików ...]\n"
-#: misc/fsck.c:1123
+#: misc/fsck.c:1119
#, c-format
msgid "%s: too many devices\n"
msgstr "%s: za du¿o urz±dzeñ\n"
-#: misc/fsck.c:1156 misc/fsck.c:1242
+#: misc/fsck.c:1152 misc/fsck.c:1238
#, c-format
msgid "%s: too many arguments\n"
msgstr "%s: za du¿o parametrów\n"
@@ -3698,7 +3663,7 @@ msgid "While reading version on %s"
msgstr "Podczas odczytu wersji %s"
#: misc/mke2fs.c:104
-#, fuzzy, c-format
+#, c-format
msgid ""
"Usage: %s [-c|-l filename] [-b block-size] [-f fragment-size]\n"
"\t[-i bytes-per-inode] [-I inode-size] [-J journal-options]\n"
@@ -3714,7 +3679,7 @@ msgstr ""
"\t[-m procent-rezerw.-bloków] [-o os-twórcy]\n"
"\t[-g bloków-w-grupie] [-L etykieta-wolumenu] [-M ost.-mont.-katalog]\n"
"\t[-O cecha[,...]] [-r wersja-fs] [-E opcja-rozszerzona[,...]]\n"
-"\t[-T rodzaj-fs] [-jnqvFSV] urz±dzenie [liczba-bloków]\n"
+"\t[-T rodzaj-fs] [-U UUID] [-jnqvFSV] urz±dzenie [liczba-bloków]\n"
#: misc/mke2fs.c:206
#, c-format
@@ -3927,15 +3892,12 @@ msgstr "B
#: misc/mke2fs.c:762
#, c-format
msgid "The resize maximum must be greater than the filesystem size.\n"
-msgstr ""
-"Maksymalny rozmiar (resize) musi byæ wiêkszy od rozmiaru systemu plików.\n"
+msgstr "Maksymalny rozmiar (resize) musi byæ wiêkszy od rozmiaru systemu plików.\n"
#: misc/mke2fs.c:786
#, c-format
msgid "On-line resizing not supported with revision 0 filesystems\n"
-msgstr ""
-"Zmiana rozmiaru w locie nie jest obs³ugiwana przez systemy plików w wersji "
-"0\n"
+msgstr "Zmiana rozmiaru w locie nie jest obs³ugiwana przez systemy plików w wersji 0\n"
#: misc/mke2fs.c:808
#, c-format
@@ -3987,7 +3949,7 @@ msgstr ""
"B³±d sk³adni w pliku konfiguracyjnym mke2fs (%s, linia %d)\n"
"\t%s\n"
-#: misc/mke2fs.c:869 misc/tune2fs.c:353
+#: misc/mke2fs.c:869 misc/tune2fs.c:355
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr "Ustawiona b³êdna opcja systemu plików: %s\n"
@@ -4010,48 +3972,48 @@ msgstr ""
"Prawdopodobnie trzeba zainstalowaæ uaktualniony plik mke2fs.conf.\n"
"\n"
-#: misc/mke2fs.c:1177
+#: misc/mke2fs.c:1176
#, c-format
msgid "invalid block size - %s"
msgstr "b³êdny rozmiar bloku - %s"
-#: misc/mke2fs.c:1181
+#: misc/mke2fs.c:1180
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr "Uwaga: rozmiar bloku %d nie u¿ywalny na wiêkszo¶ci systemów.\n"
-#: misc/mke2fs.c:1197
+#: misc/mke2fs.c:1196
#, c-format
msgid "invalid fragment size - %s"
msgstr "z³y rozmiar fragmentu - %s"
-#: misc/mke2fs.c:1203
+#: misc/mke2fs.c:1202
#, c-format
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr "Uwaga: fragmenty nie obs³ugiwane. Opcja -f zignorowana\n"
-#: misc/mke2fs.c:1210
+#: misc/mke2fs.c:1209
msgid "Illegal number for blocks per group"
msgstr "B³êdna liczba bloków w grupie"
-#: misc/mke2fs.c:1215
+#: misc/mke2fs.c:1214
msgid "blocks per group must be multiple of 8"
msgstr "liczba bloków w grupie musi byæ wielokrotno¶ci± 8"
-#: misc/mke2fs.c:1223
+#: misc/mke2fs.c:1222
msgid "Illegal number for flex_bg size"
msgstr "Niedopuszczalny rozmiar flex_bg"
-#: misc/mke2fs.c:1229
+#: misc/mke2fs.c:1228
msgid "flex_bg size must be a power of 2"
msgstr "rozmiar flex_bg musi byæ potêg± 2"
-#: misc/mke2fs.c:1239
+#: misc/mke2fs.c:1238
#, c-format
msgid "invalid inode ratio %s (min %d/max %d)"
msgstr "b³êdny stosunek i-wêz³ów %s (min %d/max %d)"
-#: misc/mke2fs.c:1256
+#: misc/mke2fs.c:1255
msgid "in malloc for bad_blocks_filename"
msgstr "w malloc dla bad_blocks_filename"
@@ -4075,7 +4037,7 @@ msgstr "b
msgid "bad num inodes - %s"
msgstr "b³êdna liczba i-wêz³ów - %s"
-#: misc/mke2fs.c:1380 misc/mke2fs.c:2052
+#: misc/mke2fs.c:1380 misc/mke2fs.c:2068
#, c-format
msgid "while trying to open journal device %s\n"
msgstr "podczas próby otwarcia urz±dzenia kroniki %s\n"
@@ -4097,11 +4059,8 @@ msgstr "%d-bajtowe bloki s
#: misc/mke2fs.c:1405
#, c-format
-msgid ""
-"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
-msgstr ""
-"Uwaga: %d-bajtowe bloki s± zbyt du¿e dla systemu (max %d), wymuszono "
-"kontynuacjê\n"
+msgid "Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
+msgstr "Uwaga: %d-bajtowe bloki s± zbyt du¿e dla systemu (max %d), wymuszono kontynuacjê\n"
#: misc/mke2fs.c:1413
#, c-format
@@ -4121,7 +4080,7 @@ msgstr ""
"%s: Rozmiar urz±dzenia %s jest zbyt du¿y, aby wyraziæ go w 32 bitach\n"
"\tprzy u¿yciu rozmiaru bloku %d.\n"
-#: misc/mke2fs.c:1468 resize/main.c:371
+#: misc/mke2fs.c:1468 resize/main.c:374
msgid "while trying to determine filesystem size"
msgstr "podczas próby okre¶lenia rozmiaru systemu plików"
@@ -4154,27 +4113,26 @@ msgstr "System plik
msgid "Failed to parse fs types list\n"
msgstr "Nie uda³o siê przeanalizowaæ listy typów systemów plików\n"
-#: misc/mke2fs.c:1542
+#: misc/mke2fs.c:1540
msgid "fs_types for mke2fs.conf resolution: "
msgstr "Rozwiniêcie fs_types dla mke2fs.conf: "
-#: misc/mke2fs.c:1549
+#: misc/mke2fs.c:1547
#, c-format
msgid "Filesystem features not supported with revision 0 filesystems\n"
msgstr "Cechy systemu plików nie obs³ugiwane przez systemy plików w wersji 0\n"
-#: misc/mke2fs.c:1556
+#: misc/mke2fs.c:1554
#, c-format
msgid "Sparse superblocks not supported with revision 0 filesystems\n"
-msgstr ""
-"Rzadkie superbloki nie s± obs³ugiwane przez systemy plików w wersji 0\n"
+msgstr "Rzadkie superbloki nie s± obs³ugiwane przez systemy plików w wersji 0\n"
-#: misc/mke2fs.c:1568
+#: misc/mke2fs.c:1566
#, c-format
msgid "Journals not supported with revision 0 filesystems\n"
msgstr "Kroniki nie s± obs³ugiwane przez systemy plików w wersji 0\n"
-#: misc/mke2fs.c:1586
+#: misc/mke2fs.c:1584
#, c-format
msgid ""
"The resize_inode and meta_bg features are not compatible.\n"
@@ -4183,41 +4141,38 @@ msgstr ""
"Cechy resize_inode i meta_bg nie s± kompatybilne.\n"
"Nie mo¿na ich w³±czyæ jednocze¶nie.\n"
-#: misc/mke2fs.c:1603
+#: misc/mke2fs.c:1601
msgid "while trying to determine hardware sector size"
msgstr "podczas próby okre¶lenia rozmiaru sprzêtowego sektora"
-#: misc/mke2fs.c:1661
+#: misc/mke2fs.c:1658
msgid "reserved online resize blocks not supported on non-sparse filesystem"
-msgstr ""
-"zarezerwowane bloki do zmiany rozmiaru w locie nie obs³ugiwane na nieci±g³ym "
-"systemie plików"
+msgstr "zarezerwowane bloki do zmiany rozmiaru w locie nie obs³ugiwane na nieci±g³ym systemie plików"
-#: misc/mke2fs.c:1670
+#: misc/mke2fs.c:1667
msgid "blocks per group count out of range"
msgstr "liczba bloków w grupie spoza zakresu"
-#: misc/mke2fs.c:1685
+#: misc/mke2fs.c:1682
msgid "Flex_bg feature not enabled, so flex_bg size may not be specified"
-msgstr ""
-"Cecha flex_bg nie jest w³±czona, wiêc nie mo¿na okre¶liæ rozmiaru flex_bg"
+msgstr "Cecha flex_bg nie jest w³±czona, wiêc nie mo¿na okre¶liæ rozmiaru flex_bg"
-#: misc/mke2fs.c:1697
+#: misc/mke2fs.c:1694
#, c-format
msgid "invalid inode size %d (min %d/max %d)"
msgstr "b³êdny rozmiar i-wêz³a %d (min %d/max %d)"
-#: misc/mke2fs.c:1711
+#: misc/mke2fs.c:1708
#, c-format
msgid "too many inodes (%llu), raise inode ratio?"
msgstr "zbyt ma³o i-wêz³ów (%llu), zwiêkszyæ wspó³czynnik i-wêz³ów?"
-#: misc/mke2fs.c:1716
+#: misc/mke2fs.c:1713
#, c-format
msgid "too many inodes (%llu), specify < 2^32 inodes"
msgstr "zbyt du¿o i-wêz³ów (%llu), nale¿y podaæ < 2^32"
-#: misc/mke2fs.c:1731
+#: misc/mke2fs.c:1728
#, c-format
msgid ""
"inode_size (%u) * inodes_count (%u) too big for a\n"
@@ -4228,12 +4183,16 @@ msgstr ""
"\tplików o liczbie bloków %lu, nale¿y podaæ wiêkszy wspó³czynnik (-i)\n"
"\tlub mniejsz± liczbê i-wêz³ów (-N).\n"
-#: misc/mke2fs.c:1828 misc/tune2fs.c:1462
+#: misc/mke2fs.c:1821 misc/tune2fs.c:1453
+msgid "Couldn't allocate memory for tdb filename\n"
+msgstr "Nie mo¿na przydzieliæ pamiêci na nazwê plików tdb\n"
+
+#: misc/mke2fs.c:1834 misc/tune2fs.c:1475
#, c-format
msgid "while trying to delete %s"
msgstr "podczas próby usuniêcia %s"
-#: misc/mke2fs.c:1837
+#: misc/mke2fs.c:1844
#, c-format
msgid ""
"Overwriting existing filesystem; this can be undone using the command:\n"
@@ -4244,38 +4203,38 @@ msgstr ""
" e2undo %s %s\n"
"\n"
-#: misc/mke2fs.c:1885
+#: misc/mke2fs.c:1893
msgid "while setting up superblock"
msgstr "podczas ustawiania superbloku"
-#: misc/mke2fs.c:1936
+#: misc/mke2fs.c:1952
#, c-format
msgid "unknown os - %s"
msgstr "nieznany os - %s"
-#: misc/mke2fs.c:1990
+#: misc/mke2fs.c:2006
msgid "while trying to allocate filesystem tables"
msgstr "podczas próby przydzielenia tablic systemu plików"
-#: misc/mke2fs.c:2021
+#: misc/mke2fs.c:2037
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr "podczas zerowania bloku %u na koñcu systemu plików"
-#: misc/mke2fs.c:2034
+#: misc/mke2fs.c:2050
msgid "while reserving blocks for online resize"
msgstr "podczas rezerwowania bloków na zmianê rozmiaru w locie"
-#: misc/mke2fs.c:2045 misc/tune2fs.c:477
+#: misc/mke2fs.c:2061 misc/tune2fs.c:479
msgid "journal"
msgstr "kronika"
-#: misc/mke2fs.c:2057
+#: misc/mke2fs.c:2073
#, c-format
msgid "Adding journal to device %s: "
msgstr "Dodano kronikê do urz±dzenia %s: "
-#: misc/mke2fs.c:2064
+#: misc/mke2fs.c:2080
#, c-format
msgid ""
"\n"
@@ -4284,22 +4243,27 @@ msgstr ""
"\n"
"\tpodczas próby dodania kroniki do urz±dzenia %s"
-#: misc/mke2fs.c:2069 misc/mke2fs.c:2095 misc/tune2fs.c:506 misc/tune2fs.c:520
+#: misc/mke2fs.c:2085 misc/mke2fs.c:2117 misc/tune2fs.c:508 misc/tune2fs.c:522
#, c-format
msgid "done\n"
msgstr "wykonano\n"
-#: misc/mke2fs.c:2083
+#: misc/mke2fs.c:2094
+#, c-format
+msgid "Skipping journal creation in super-only mode\n"
+msgstr "Pominiêto tworzenie kroniki w trybie super-only\n"
+
+#: misc/mke2fs.c:2105
#, c-format
msgid "Creating journal (%u blocks): "
msgstr "Tworzenie kroniki (%u bloków): "
-#: misc/mke2fs.c:2100
+#: misc/mke2fs.c:2122
#, c-format
msgid "Writing superblocks and filesystem accounting information: "
msgstr "Zapis superbloków i podsumowania systemu plików: "
-#: misc/mke2fs.c:2105
+#: misc/mke2fs.c:2127
#, c-format
msgid ""
"\n"
@@ -4308,7 +4272,7 @@ msgstr ""
"\n"
"Uwaga, problemy z zapisem superbloków."
-#: misc/mke2fs.c:2108
+#: misc/mke2fs.c:2130
#, c-format
msgid ""
"done\n"
@@ -4361,7 +4325,7 @@ msgstr "%s: h=%3d s=%3d c=%4d pocz
msgid "Please run e2fsck on the filesystem.\n"
msgstr "Proszê uruchomiæ e2fsck na systemie plików.\n"
-#: misc/tune2fs.c:103
+#: misc/tune2fs.c:105
#, c-format
msgid ""
"Usage: %s [-c max_mounts_count] [-e errors_behavior] [-g group]\n"
@@ -4380,59 +4344,59 @@ msgstr ""
"\t[-E opcja_rozszerzona[,...]] [-T czas_ost._sprawdz.] [-U UUID]\n"
"\t[-I nowy_rozmiar_i-wêz³a] urz±dzenie\n"
-#: misc/tune2fs.c:188
+#: misc/tune2fs.c:190
msgid "while trying to open external journal"
msgstr "podczas próby otworzenia zewnêtrznej kroniki"
-#: misc/tune2fs.c:192
+#: misc/tune2fs.c:194
#, c-format
msgid "%s is not a journal device.\n"
msgstr "%s nie jest urz±dzeniem kroniki.\n"
-#: misc/tune2fs.c:207
+#: misc/tune2fs.c:209
msgid "Journal superblock not found!\n"
msgstr "Nie znaleziono superbloku kroniki!\n"
-#: misc/tune2fs.c:219
+#: misc/tune2fs.c:221
msgid "Filesystem's UUID not found on journal device.\n"
msgstr "UUID systemu plików nie znaleziony na urz±dzeniu kroniki.\n"
-#: misc/tune2fs.c:240
+#: misc/tune2fs.c:242
msgid "Journal NOT removed\n"
msgstr "Kronika NIE usuniêta\n"
-#: misc/tune2fs.c:246
+#: misc/tune2fs.c:248
msgid "Journal removed\n"
msgstr "Kronika usuniêta\n"
-#: misc/tune2fs.c:286
+#: misc/tune2fs.c:288
msgid "while reading bitmaps"
msgstr "podczas odczytu bitmap"
-#: misc/tune2fs.c:294
+#: misc/tune2fs.c:296
msgid "while clearing journal inode"
msgstr "podczas czyszczenia i-wêz³a kroniki"
-#: misc/tune2fs.c:305
+#: misc/tune2fs.c:307
msgid "while writing journal inode"
msgstr "podczas zapisu i-wêz³a kroniki"
-#: misc/tune2fs.c:320
+#: misc/tune2fs.c:322
#, c-format
msgid "Invalid mount option set: %s\n"
msgstr "Ustawiona b³êdna opcja montowania: %s\n"
-#: misc/tune2fs.c:356
+#: misc/tune2fs.c:358
#, c-format
msgid "Clearing filesystem feature '%s' not supported.\n"
msgstr "Usuwanie cechy systemu plików '%s' nie jest obs³ugiwane.\n"
-#: misc/tune2fs.c:362
+#: misc/tune2fs.c:364
#, c-format
msgid "Setting filesystem feature '%s' not supported.\n"
msgstr "Ustawianie cechy systemu plików '%s' nie jest obs³ugiwane.\n"
-#: misc/tune2fs.c:371
+#: misc/tune2fs.c:373
msgid ""
"The has_journal feature may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
@@ -4440,7 +4404,7 @@ msgstr ""
"Flaga has_journal mo¿e byæ wyczyszczona tylko kiedy system plików\n"
"jest odmontowany lub podmontowany tylko do odczytu.\n"
-#: misc/tune2fs.c:379
+#: misc/tune2fs.c:381
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
@@ -4448,13 +4412,13 @@ msgstr ""
"Flaga needs_recovery jest ustawiona. Proszê uruchomiæ e2fsck przed\n"
"czyszczeniem flagi has_journal.\n"
-#: misc/tune2fs.c:412
+#: misc/tune2fs.c:414
msgid ""
"Clearing the flex_bg flag would cause the the filesystem to be\n"
"inconsistent.\n"
msgstr "Wy³±czenie flagi flex_bg spowoduje niespójno¶æ systemu plików.\n"
-#: misc/tune2fs.c:423
+#: misc/tune2fs.c:425
msgid ""
"The huge_file feature may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
@@ -4462,16 +4426,16 @@ msgstr ""
"Flaga huge_file mo¿e byæ wyczyszczona tylko kiedy system plików\n"
"jest odmontowany lub podmontowany tylko do odczytu.\n"
-#: misc/tune2fs.c:451
+#: misc/tune2fs.c:453
#, c-format
msgid "(and reboot afterwards!)\n"
msgstr "(proszê zrestartowaæ potem system!)\n"
-#: misc/tune2fs.c:472
+#: misc/tune2fs.c:474
msgid "The filesystem already has a journal.\n"
msgstr "System plików ju¿ ma kronikê.\n"
-#: misc/tune2fs.c:490
+#: misc/tune2fs.c:492
#, c-format
msgid ""
"\n"
@@ -4480,21 +4444,21 @@ msgstr ""
"\n"
"\tpodczas próby otworzenia kroniki na %s\n"
-#: misc/tune2fs.c:494
+#: misc/tune2fs.c:496
#, c-format
msgid "Creating journal on device %s: "
msgstr "Tworzenie kroniki na urz±dzeniu %s: "
-#: misc/tune2fs.c:502
+#: misc/tune2fs.c:504
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr "podczas dodawania systemu plików do kroniki na %s"
-#: misc/tune2fs.c:508
+#: misc/tune2fs.c:510
msgid "Creating journal inode: "
msgstr "Tworzenie i-wêz³a kroniki: "
-#: misc/tune2fs.c:517
+#: misc/tune2fs.c:519
msgid ""
"\n"
"\twhile trying to create journal file"
@@ -4502,85 +4466,85 @@ msgstr ""
"\n"
"\tpodczas próby utworzenia pliku kroniki"
-#: misc/tune2fs.c:584
+#: misc/tune2fs.c:585
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr "Nie mo¿na przeanalizowaæ podanej daty/czasu: %s"
-#: misc/tune2fs.c:608 misc/tune2fs.c:621
+#: misc/tune2fs.c:609 misc/tune2fs.c:622
#, c-format
msgid "bad mounts count - %s"
msgstr "b³êdna liczba montowañ - %s"
-#: misc/tune2fs.c:637
+#: misc/tune2fs.c:638
#, c-format
msgid "bad error behavior - %s"
msgstr "b³êdne traktowanie b³êdów - %s"
-#: misc/tune2fs.c:664
+#: misc/tune2fs.c:665
#, c-format
msgid "bad gid/group name - %s"
msgstr "b³êdny gid/nazwa grupy - %s"
-#: misc/tune2fs.c:697
+#: misc/tune2fs.c:698
#, c-format
msgid "bad interval - %s"
msgstr "b³êdny odstêp - %s"
-#: misc/tune2fs.c:725
+#: misc/tune2fs.c:727
#, c-format
msgid "bad reserved block ratio - %s"
msgstr "b³êdny procent zarezerwowanych bloków - %s"
-#: misc/tune2fs.c:740
+#: misc/tune2fs.c:742
msgid "-o may only be specified once"
msgstr "-o mo¿e byæ podane tylko raz"
-#: misc/tune2fs.c:750
+#: misc/tune2fs.c:752
msgid "-O may only be specified once"
msgstr "-O mo¿e byæ podane tylko raz"
-#: misc/tune2fs.c:760
+#: misc/tune2fs.c:762
#, c-format
msgid "bad reserved blocks count - %s"
msgstr "b³êdna liczba zarezerwowanych bloków - %s"
-#: misc/tune2fs.c:789
+#: misc/tune2fs.c:791
#, c-format
msgid "bad uid/user name - %s"
msgstr "b³êdny uid/nazwa u¿ytkownika - %s"
-#: misc/tune2fs.c:806
+#: misc/tune2fs.c:808
#, c-format
msgid "bad inode size - %s"
msgstr "b³êdny rozmiar i-wêz³a - %s"
-#: misc/tune2fs.c:813
+#: misc/tune2fs.c:815
#, c-format
msgid "Inode size must be a power of two- %s"
msgstr "Rozmiar i-wêz³a musi byæ potêg± dwójki - %s"
-#: misc/tune2fs.c:900
+#: misc/tune2fs.c:904
#, c-format
msgid "Invalid RAID stride: %s\n"
msgstr "B³êdny parametr RAID stride: %s\n"
-#: misc/tune2fs.c:915
+#: misc/tune2fs.c:919
#, c-format
msgid "Invalid RAID stripe-width: %s\n"
msgstr "B³êdny parametr RAID stripe-width: %s\n"
-#: misc/tune2fs.c:930
+#: misc/tune2fs.c:934
#, c-format
msgid "Invalid hash algorithm: %s\n"
msgstr "B³êdny algorytm haszowania: %s\n"
-#: misc/tune2fs.c:936
+#: misc/tune2fs.c:940
#, c-format
msgid "Setting default hash algorithm to %s (%d)\n"
msgstr "Ustawianie domy¶lnego algorytmu haszowania na %s (%d)\n"
-#: misc/tune2fs.c:944
+#: misc/tune2fs.c:948
#, c-format
msgid ""
"\n"
@@ -4609,72 +4573,72 @@ msgstr ""
"\ttest_fs\n"
"\t^test_fs\n"
-#: misc/tune2fs.c:1384 misc/tune2fs.c:1389 resize/resize2fs.c:760
+#: misc/tune2fs.c:1388 misc/tune2fs.c:1393 resize/resize2fs.c:790
msgid "blocks to be moved"
msgstr "bloki do przeniesienia"
-#: misc/tune2fs.c:1471
-#, fuzzy, c-format
+#: misc/tune2fs.c:1485
+#, c-format
msgid ""
"To undo the tune2fs operation please run the command\n"
" e2undo %s %s\n"
"\n"
msgstr ""
-"Aby wycofaæ operacje tune2fs proszê wydaæ polecenie\n"
+"Aby wycofaæ operacjê tune2fs, proszê wydaæ polecenie\n"
" e2undo %s %s\n"
"\n"
-#: misc/tune2fs.c:1529
+#: misc/tune2fs.c:1546
#, c-format
-msgid "The inode size is already %d\n"
-msgstr "Rozmiar i-wêz³a ju¿ wynosi %d\n"
+msgid "The inode size is already %lu\n"
+msgstr "Rozmiar i-wêz³a ju¿ wynosi %lu\n"
-#: misc/tune2fs.c:1534
+#: misc/tune2fs.c:1551
#, c-format
msgid "Shrinking the inode size is not supported\n"
msgstr "Zmniejszanie rozmiaru i-wêz³a nie jest obs³ugiwane\n"
-#: misc/tune2fs.c:1577
+#: misc/tune2fs.c:1594
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr "Ustawianie maksymalnej liczby montowañ na %d\n"
-#: misc/tune2fs.c:1583
+#: misc/tune2fs.c:1600
#, c-format
msgid "Setting current mount count to %d\n"
msgstr "Ustawianie aktualnego licznika montowañ na %d\n"
-#: misc/tune2fs.c:1588
+#: misc/tune2fs.c:1605
#, c-format
msgid "Setting error behavior to %d\n"
msgstr "Ustawianie traktowania b³êdów na %d\n"
-#: misc/tune2fs.c:1593
+#: misc/tune2fs.c:1610
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr "Ustawianie gid-a zarezerwowanych bloków na %lu\n"
-#: misc/tune2fs.c:1598
+#: misc/tune2fs.c:1615
#, c-format
msgid "Setting interval between checks to %lu seconds\n"
msgstr "Ustawianie odstêpu pomiêdzy sprawdzeniami na %lu sekund\n"
-#: misc/tune2fs.c:1605
+#: misc/tune2fs.c:1622
#, c-format
msgid "Setting reserved blocks percentage to %g%% (%u blocks)\n"
msgstr "Ustawianie procent zarezerwowanych bloków na %g%% (%u bloków)\n"
-#: misc/tune2fs.c:1612
+#: misc/tune2fs.c:1629
#, c-format
msgid "reserved blocks count is too big (%lu)"
msgstr "liczba zarezerwowanych bloków zbyt du¿e (%lu)"
-#: misc/tune2fs.c:1618
+#: misc/tune2fs.c:1635
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr "Ustawianie liczby zarezerwowanych bloków na %lu\n"
-#: misc/tune2fs.c:1624
+#: misc/tune2fs.c:1641
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
@@ -4682,7 +4646,7 @@ msgstr ""
"\n"
"System plików ju¿ ma rzadkie superbloki.\n"
-#: misc/tune2fs.c:1631
+#: misc/tune2fs.c:1648
#, c-format
msgid ""
"\n"
@@ -4691,7 +4655,7 @@ msgstr ""
"\n"
"Flaga rzadkich superbloków ustawiona. %s"
-#: misc/tune2fs.c:1636
+#: misc/tune2fs.c:1653
msgid ""
"\n"
"Clearing the sparse superflag not supported.\n"
@@ -4699,32 +4663,33 @@ msgstr ""
"\n"
"Usuwanie superflagi sparse nie jest obs³ugiwane.\n"
-#: misc/tune2fs.c:1643
+#: misc/tune2fs.c:1660
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr "Ustawianie czasu ostatniego sprawdzenia systemu plików na %s\n"
-#: misc/tune2fs.c:1649
+#: misc/tune2fs.c:1666
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr "Ustawianie uid-a zarezerwowanych bloków na %lu\n"
-#: misc/tune2fs.c:1700
+#: misc/tune2fs.c:1717
msgid "Invalid UUID format\n"
msgstr "B³êdny format UUID-a\n"
-#: misc/tune2fs.c:1712
+#: misc/tune2fs.c:1729
msgid "The inode size may only be changed when the filesystem is unmounted.\n"
-msgstr ""
-"Rozmiar i-wêz³a mo¿na zmieniæ tylko na niezamontowanym systemie plików.\n"
+msgstr "Rozmiar i-wêz³a mo¿na zmieniæ tylko na niezamontowanym systemie plików.\n"
-#: misc/tune2fs.c:1719
+#: misc/tune2fs.c:1736
msgid ""
"Changing the inode size not supported for filesystems with the flex_bg\n"
"feature enabled.\n"
msgstr ""
+"Zmiana rozmiaru i-wêz³a nie jest obs³ugiwana dla systemów plików\n"
+"z w³±czon± cech± flex_bg.\n"
-#: misc/tune2fs.c:1731
+#: misc/tune2fs.c:1748
msgid ""
"Error in resizing the inode size.\n"
"Run e2undo to undo the file system changes. \n"
@@ -4732,17 +4697,17 @@ msgstr ""
"B³±d podczas zmiany rozmiaru i-wêz³a.\n"
"Nale¿y uruchomiæ e2undo w celu wycofania zmian w systemie plików.\n"
-#: misc/tune2fs.c:1735
+#: misc/tune2fs.c:1752
#, c-format
msgid "Setting inode size %lu\n"
msgstr "Ustawianie rozmiaru i-wêz³a na %lu\n"
-#: misc/tune2fs.c:1745
+#: misc/tune2fs.c:1762
#, c-format
msgid "Setting stride size to %d\n"
msgstr "Ustawianie rozmiaru stride na %d\n"
-#: misc/tune2fs.c:1750
+#: misc/tune2fs.c:1767
#, c-format
msgid "Setting stripe width to %d\n"
msgstr "Ustawianie szeroko¶ci stripe na na %d\n"
@@ -4881,8 +4846,7 @@ msgid ""
"Usage: %s [-d debug_flags] [-f] [-F] [-M] [-P] [-p] device [new_size]\n"
"\n"
msgstr ""
-"Sk³adnia: %s [-d flagi_¶ledzenia] [-f] [-F] [-M] [-P] [-p] urz±dzenie "
-"[nowy_rozm]\n"
+"Sk³adnia: %s [-d flagi_¶ledzenia] [-f] [-F] [-M] [-P] [-p] urz±dzenie [nowy_rozm]\n"
"\n"
#: resize/main.c:64
@@ -4914,17 +4878,17 @@ msgstr "Nieznany przebieg?!?"
msgid "Begin pass %d (max = %lu)\n"
msgstr "Pocz±tkowy przebieg %d (maksymalny = %lu)\n"
-#: resize/main.c:264
+#: resize/main.c:265
#, c-format
msgid "while opening %s"
msgstr "podczas otwierania %s"
-#: resize/main.c:276
+#: resize/main.c:277
#, c-format
msgid "while getting stat information for %s"
msgstr "podczas pobierania informacji stat dla %s"
-#: resize/main.c:337
+#: resize/main.c:338
#, c-format
msgid ""
"%s: The combination of flex_bg and\n"
@@ -4933,21 +4897,26 @@ msgstr ""
"%s: Kombinacja cech flex_bg i\n"
"\t!resize_inode nie jest obs³ugiwana przez resize2fs.\n"
-#: resize/main.c:345
+#: resize/main.c:348
#, c-format
msgid "Estimated minimum size of the filesystem: %u\n"
msgstr "Przybli¿ony minimalny rozmiar systemu plików: %u\n"
-#: resize/main.c:381
-#, fuzzy, c-format
+#: resize/main.c:384
+#, c-format
msgid "Invalid new size: %s\n"
-msgstr "b³êdny rozmiar i-wêz³a - %s"
+msgstr "B³êdny nowy rozmiar: %s\n"
-#: resize/main.c:394
+#: resize/main.c:396
+#, c-format
+msgid "New size smaller than minimum (%u)\n"
+msgstr "Nowy rozmiar jest mniejszy ni¿ minimalny (%u)\n"
+
+#: resize/main.c:402
msgid "Invalid stride length"
msgstr "B³êdna d³ugo¶æ stride"
-#: resize/main.c:418
+#: resize/main.c:426
#, c-format
msgid ""
"The containing partition (or device) is only %u (%dk) blocks.\n"
@@ -4958,7 +4927,7 @@ msgstr ""
"Za¿±dano nowego rozmiaru %u bloków.\n"
"\n"
-#: resize/main.c:425
+#: resize/main.c:433
#, c-format
msgid ""
"The filesystem is already %u blocks long. Nothing to do!\n"
@@ -4967,7 +4936,7 @@ msgstr ""
"System plików ju¿ ma wielko¶æ %u bloków. Nie ma nic do roboty!\n"
"\n"
-#: resize/main.c:436
+#: resize/main.c:444
#, c-format
msgid ""
"Please run 'e2fsck -f %s' first.\n"
@@ -4976,12 +4945,26 @@ msgstr ""
"Proszê uruchomiæ najpierw 'e2fsck -f %s'.\n"
"\n"
-#: resize/main.c:447
+#: resize/main.c:448
+#, c-format
+msgid "Resizing the filesystem on %s to %u (%dk) blocks.\n"
+msgstr "Zmiana rozmiaru systemu plików %s na %u (%dk) bloków.\n"
+
+#: resize/main.c:457
#, c-format
msgid "while trying to resize %s"
msgstr "podczas próby zmiany rozmiaru %s"
-#: resize/main.c:452
+#: resize/main.c:460
+#, c-format
+msgid ""
+"Please run 'e2fsck -fy %s' to fix the filesystem\n"
+"after the aborted resize operation.\n"
+msgstr ""
+"Proszê uruchomiæ 'e2fsck -fy %s', aby naprawiæ system plików\n"
+"po przerwanej operacji zmiany rozmiaru.\n"
+
+#: resize/main.c:466
#, c-format
msgid ""
"The filesystem on %s is now %u blocks long.\n"
@@ -4990,11 +4973,15 @@ msgstr ""
"System plików na %s ma teraz %u bloków.\n"
"\n"
+#: resize/main.c:481
+#, c-format
+msgid "while trying to truncate %s"
+msgstr "podczas próby skrócenia %s"
+
#: resize/online.c:37
#, c-format
msgid "Filesystem at %s is mounted on %s; on-line resizing required\n"
-msgstr ""
-"System plików %s jest zamontowany pod %s; wymagana zmiana rozmiaru w locie\n"
+msgstr "System plików %s jest zamontowany pod %s; wymagana zmiana rozmiaru w locie\n"
#: resize/online.c:41
#, c-format
@@ -5038,37 +5025,23 @@ msgstr "Podczas pr
#: resize/online.c:191
#, c-format
-msgid ""
-"Filesystem at %s is mounted on %s, and on-line resizing is not supported on "
-"this system.\n"
-msgstr ""
-"System plików na %s jest zamontowany pod %s, zmiana rozmiaru w locie nie "
-"jest obs³ugiwana na tym systemie.\n"
+msgid "Filesystem at %s is mounted on %s, and on-line resizing is not supported on this system.\n"
+msgstr "System plików na %s jest zamontowany pod %s, zmiana rozmiaru w locie nie jest obs³ugiwana na tym systemie.\n"
-#: resize/resize2fs.c:322
+#: resize/resize2fs.c:350
#, c-format
msgid "inodes (%llu) must be less than %u"
msgstr "liczba i-wêz³ów (%llu) musi byæ mniejsza ni¿ %u"
-#: resize/resize2fs.c:755
+#: resize/resize2fs.c:582
msgid "reserved blocks"
msgstr "zarezerwowane bloki"
-#: resize/resize2fs.c:765
+#: resize/resize2fs.c:795
msgid "meta-data blocks"
msgstr "bloki metadanych"
-#: resize/resize2fs.c:1703
+#: resize/resize2fs.c:1752
#, c-format
msgid "Should never happen: resize inode corrupt!\n"
msgstr "Nigdy siê nie powinno zdarzyæ: i-wêze³ zmiany rozmiaru uszkodzony!\n"
-
-#~ msgid "@S doesn't have has_ at j flag, but has ext3 @j %s.\n"
-#~ msgstr "@S nie ma flagi has_journal, ale ma kronikê ext3 %s.\n"
-
-#~ msgid "Error while deleting extent: %m\n"
-#~ msgstr "B³±d podczas usuwania fragmentu: %m\n"
-
-#~ msgid "Recreate journal to make the filesystem ext3 again?\n"
-#~ msgstr ""
-#~ "Utworzyæ ponownie kronikê, aby uzyskaæ z powrotem system plików ext3?\n"
diff --git a/po/sv.gmo b/po/sv.gmo
index 53332d1..66a9b76 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index 8eceb64..15d945e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,9 +1,9 @@
# Swedish messages for e2fsprogs.
-# Copyright © 2003, 2005, 2006, 2008 Theodore Tso (msgids)
+# Copyright © 2003, 2005, 2006, 2008, 2009 Theodore Tso (msgids)
# This file is distributed under the same license as the e2fsprogs package.
-# Göran Uddeborg <goeran at uddeborg.se>, 2003, 2005, 2006, 2008.
+# Göran Uddeborg <goeran at uddeborg.se>, 2003, 2005, 2006, 2008, 2009.
#
-# $Revision: 1.48 $
+# $Revision: 1.54 $
#
#. The strings in e2fsck's problem.c can be very hard to translate,
#. since the strings are expanded in two different ways. First of all,
@@ -65,10 +65,10 @@
#.
msgid ""
msgstr ""
-"Project-Id-Version: e2fsprogs 1.41.1\n"
+"Project-Id-Version: e2fsprogs 1.41.8\n"
"Report-Msgid-Bugs-To: tytso at alum.mit.edu\n"
-"POT-Creation-Date: 2009-01-26 20:41-0500\n"
-"PO-Revision-Date: 2008-09-27 11:59+0200\n"
+"POT-Creation-Date: 2009-07-11 17:49-0400\n"
+"PO-Revision-Date: 2009-07-29 22:33+0200\n"
"Last-Translator: Göran Uddeborg <goeran at uddeborg.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
"MIME-Version: 1.0\n"
@@ -90,10 +90,10 @@ msgid "while reading the bad blocks inode"
msgstr "vid läsning av inoden för dåliga block"
#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:1037 e2fsck/unix.c:1120 misc/badblocks.c:1148
-#: misc/badblocks.c:1156 misc/badblocks.c:1170 misc/badblocks.c:1182
-#: misc/dumpe2fs.c:505 misc/e2image.c:576 misc/e2image.c:672
-#: misc/e2image.c:688 misc/mke2fs.c:181 misc/tune2fs.c:1515 resize/main.c:309
+#: e2fsck/unix.c:1057 e2fsck/unix.c:1140 misc/badblocks.c:1155
+#: misc/badblocks.c:1163 misc/badblocks.c:1177 misc/badblocks.c:1189
+#: misc/dumpe2fs.c:510 misc/e2image.c:583 misc/e2image.c:679
+#: misc/e2image.c:695 misc/mke2fs.c:181 misc/tune2fs.c:1532 resize/main.c:310
#, c-format
msgid "while trying to open %s"
msgstr "vid försök att öppna %s"
@@ -187,21 +187,21 @@ msgstr "BLKFLSBUF-ioctl st
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr "Användning: %s [-F] [-I inodbuffertblock] enhet\n"
-#: e2fsck/iscan.c:83 e2fsck/unix.c:818
+#: e2fsck/iscan.c:83 e2fsck/unix.c:817
#, c-format
msgid "while opening %s for flushing"
msgstr "vid öppning av %s för utskrivning"
-#: e2fsck/iscan.c:88 e2fsck/unix.c:824 resize/main.c:285
+#: e2fsck/iscan.c:88 e2fsck/unix.c:823 resize/main.c:286
#, c-format
msgid "while trying to flush %s"
msgstr "vid försök att skriva ut %s"
-#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:482
+#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:489
msgid "while opening inode scan"
msgstr "vid öppning av inodsökning"
-#: e2fsck/iscan.c:129 misc/e2image.c:500
+#: e2fsck/iscan.c:129 misc/e2image.c:507
msgid "while getting next inode"
msgstr "när nästa inod hämtades"
@@ -224,17 +224,17 @@ msgstr "%s: inget giltigt journalsuperblock hittades\n"
msgid "%s: journal too short\n"
msgstr "%s: journalen för kort\n"
-#: e2fsck/journal.c:858
+#: e2fsck/journal.c:860
#, c-format
msgid "%s: recovering journal\n"
msgstr "%s: återhämtar journalen\n"
-#: e2fsck/journal.c:860
+#: e2fsck/journal.c:862
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
msgstr "%s: återhämtar inte journalen i skrivskyddat läge\n"
-#: e2fsck/journal.c:881
+#: e2fsck/journal.c:887
#, c-format
msgid "while trying to re-open %s"
msgstr "vid försök att återöppna %s"
@@ -455,30 +455,30 @@ msgstr "uttag (socket)"
msgid "unknown file type with mode 0%o"
msgstr "okänd filtyp med typ 0%o"
-#: e2fsck/pass1b.c:215
+#: e2fsck/pass1b.c:220
msgid "multiply claimed inode map"
msgstr "karta över flerfaldigt i anspråkstagna inoder"
-#: e2fsck/pass1b.c:567 e2fsck/pass1b.c:700
+#: e2fsck/pass1b.c:581 e2fsck/pass1b.c:714
#, c-format
msgid "internal error: can't find dup_blk for %u\n"
msgstr "internt fel: kan inte hitta dup_blk för %u\n"
-#: e2fsck/pass1b.c:743
+#: e2fsck/pass1b.c:757
msgid "returned from clone_file_block"
msgstr "återvände från clone_file_block"
-#: e2fsck/pass1b.c:762
+#: e2fsck/pass1b.c:776
#, c-format
msgid "internal error: couldn't lookup EA block record for %u"
msgstr "internt fel; det gick inte att slå upp EA-blockpost för %u"
-#: e2fsck/pass1b.c:774
+#: e2fsck/pass1b.c:788
#, c-format
msgid "internal error: couldn't lookup EA inode record for %u"
msgstr "internt fel: det gick inte att slå upp EA-inodpost för %u"
-#: e2fsck/pass1.c:430 e2fsck/pass2.c:780
+#: e2fsck/pass1.c:430 e2fsck/pass2.c:782
msgid "reading directory block"
msgstr "läser katalogblock"
@@ -506,39 +506,39 @@ msgstr "
msgid "getting next inode from scan"
msgstr "hämtar nästa inod från sökning"
-#: e2fsck/pass1.c:1122
+#: e2fsck/pass1.c:1123
msgid "Pass 1"
msgstr "Pass 1"
-#: e2fsck/pass1.c:1181
+#: e2fsck/pass1.c:1180
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr "läser indirektblock för inod %u"
-#: e2fsck/pass1.c:1225
+#: e2fsck/pass1.c:1224
msgid "bad inode map"
msgstr "karta över dåliga inoder"
-#: e2fsck/pass1.c:1247
+#: e2fsck/pass1.c:1246
msgid "inode in bad block map"
msgstr "inod i karta över dåliga block"
-#: e2fsck/pass1.c:1267
+#: e2fsck/pass1.c:1266
msgid "imagic inode map"
msgstr "imagic inodskarta"
-#: e2fsck/pass1.c:1294
+#: e2fsck/pass1.c:1293
msgid "multiply claimed block map"
msgstr "karta över flerfaldigt i anspråkstagna block"
-#: e2fsck/pass1.c:1393
+#: e2fsck/pass1.c:1392
msgid "ext attr block map"
msgstr "karta över block för utökade attribut"
#: e2fsck/pass1.c:2134
-#, fuzzy, c-format
+#, c-format
msgid "%6lu(%c): expecting %6lu got phys %6lu (blkcnt %lld)\n"
-msgstr "%6lu: förväntade %6lu fick fys %6lu (blkant %lld)\n"
+msgstr "%6lu(%c): förväntade %6lu fick fys %6lu (blkant %lld)\n"
#: e2fsck/pass1.c:2449
msgid "block bitmap"
@@ -552,35 +552,35 @@ msgstr "inodbitkarta"
msgid "inode table"
msgstr "inodstabell"
-#: e2fsck/pass2.c:284
+#: e2fsck/pass2.c:283
msgid "Pass 2"
msgstr "Pass 2"
-#: e2fsck/pass2.c:803
+#: e2fsck/pass2.c:805
msgid "Can not continue."
msgstr "Kan inte fortsätta."
-#: e2fsck/pass3.c:79
+#: e2fsck/pass3.c:76
msgid "inode done bitmap"
msgstr "inod klar bitkarta"
-#: e2fsck/pass3.c:90
+#: e2fsck/pass3.c:84
msgid "Peak memory"
msgstr "Max minne"
-#: e2fsck/pass3.c:146
+#: e2fsck/pass3.c:134
msgid "Pass 3"
msgstr "Pass 3"
-#: e2fsck/pass3.c:334
+#: e2fsck/pass3.c:320
msgid "inode loop detection bitmap"
msgstr "bitkarta för upptäckt av inodsslingor"
-#: e2fsck/pass4.c:196
+#: e2fsck/pass4.c:191
msgid "Pass 4"
msgstr "Pass 4"
-#: e2fsck/pass5.c:70
+#: e2fsck/pass5.c:64
msgid "Pass 5"
msgstr "Pass 5"
@@ -873,9 +873,9 @@ msgstr "Hurd st
#. @-expanded: superblock has an invalid journal (inode %i).\n
#: e2fsck/problem.c:187
-#, fuzzy, c-format
+#, c-format
msgid "@S has an @n @j (@i %i).\n"
-msgstr "Superblock har en ogiltig ext3-journal (inod %i).\n"
+msgstr "Superblock har en ogiltig journal (inod %i).\n"
#. @-expanded: External journal has multiple filesystem users (unsupported).\n
#: e2fsck/problem.c:192
@@ -902,112 +902,92 @@ msgstr "Extern journal st
#. @-expanded: format.\n
#. @-expanded: It is also possible the journal superblock is corrupt.\n
#: e2fsck/problem.c:212
-#, fuzzy
msgid ""
"@f @j @S is unknown type %N (unsupported).\n"
-"It is likely that your copy of e2fsck is old and/or doesn't support this @j "
-"format.\n"
+"It is likely that your copy of e2fsck is old and/or doesn't support this @j format.\n"
"It is also possible the @j @S is corrupt.\n"
msgstr ""
-"Ext3-journalsuperblock är av okänd typ %N (ej stött).\n"
+"Filsystemsjournalsuperblock är av okänd typ %N (ej stött).\n"
"Det är troligt att ditt exemplar av e2fsck är gammalt och/eller inte\n"
"stödjer detta journalformat.\n"
"Det är också möjligt att journalsuperblocket är trasigt.\n"
#. @-expanded: journal superblock is corrupt.\n
#: e2fsck/problem.c:220
-#, fuzzy
msgid "@j @S is corrupt.\n"
-msgstr "Ext3-journalsuperblock är trasigt.\n"
+msgstr "Journalsuperblock är trasigt.\n"
#. @-expanded: superblock has_journal flag is clear, but a journal %s is present.\n
#: e2fsck/problem.c:225
-#, fuzzy, c-format
+#, c-format
msgid "@S has_ at j flag is clear, but a @j %s is present.\n"
-msgstr "ext3-rättningsflagga är nollställd, men journal har data.\n"
+msgstr "Superblocksflagga har_journal är nollställd, men en journal %s finns.\n"
#. @-expanded: superblock needs_recovery flag is set, but no journal is present.\n
#: e2fsck/problem.c:230
-#, fuzzy
msgid "@S needs_recovery flag is set, but no @j is present.\n"
-msgstr ""
-"superblock har ext3-behöver-rättas-flagga satt, men har ext3-journal %s.\n"
+msgstr "Superblockflagga behöver_rättas är satt, men ingen journal finns.\n"
#. @-expanded: superblock needs_recovery flag is clear, but journal has data.\n
#: e2fsck/problem.c:235
-#, fuzzy
msgid "@S needs_recovery flag is clear, but @j has data.\n"
-msgstr "ext3-rättningsflagga är nollställd, men journal har data.\n"
+msgstr "Superblocksflagga behöver_rättas är nollställd, men journal har data.\n"
#. @-expanded: Clear journal
#: e2fsck/problem.c:240
msgid "Clear @j"
msgstr "Töm journal"
-#. @-expanded: Run journal anyway
-#: e2fsck/problem.c:245
-msgid "Run @j anyway"
-msgstr "Kör journal ändå"
-
-#. @-expanded: Recovery flag not set in backup superblock, so running journal anyway.\n
-#: e2fsck/problem.c:250
-msgid "Recovery flag not set in backup @S, so running @j anyway.\n"
-msgstr "Rättningsflagga inte satt i reservsuperblock, så kör journal ändå.\n"
+#. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem.
+#: e2fsck/problem.c:245 e2fsck/problem.c:647
+msgid "@f has feature flag(s) set, but is a revision 0 @f. "
+msgstr "filsystemet har funktionsflaggor satta, men är ett revision 0-filsystem. "
#. @-expanded: %s orphaned inode %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n
-#: e2fsck/problem.c:255
+#: e2fsck/problem.c:250
msgid "%s @o @i %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n"
-msgstr ""
-"%s föräldralös inod %i (uid=%Iu, gid=%Ig, rättighet=%Im, storlek=%Is)\n"
+msgstr "%s föräldralös inod %i (uid=%Iu, gid=%Ig, rättighet=%Im, storlek=%Is)\n"
#. @-expanded: illegal block #%B (%b) found in orphaned inode %i.\n
-#: e2fsck/problem.c:260
+#: e2fsck/problem.c:255
msgid "@I @b #%B (%b) found in @o @i %i.\n"
msgstr "Ogiltigt block nummer %B (%b) hittat i föräldralös inod %i.\n"
#. @-expanded: Already cleared block #%B (%b) found in orphaned inode %i.\n
-#: e2fsck/problem.c:265
+#: e2fsck/problem.c:260
msgid "Already cleared @b #%B (%b) found in @o @i %i.\n"
msgstr "Redan tömt block nummer %B (%b) hittat i föräldralös inod %i.\n"
#. @-expanded: illegal orphaned inode %i in superblock.\n
-#: e2fsck/problem.c:270
+#: e2fsck/problem.c:265
#, c-format
msgid "@I @o @i %i in @S.\n"
msgstr "Ogiltig föräldralös inod %i i superblock.\n"
#. @-expanded: illegal inode %i in orphaned inode list.\n
-#: e2fsck/problem.c:275
+#: e2fsck/problem.c:270
#, c-format
msgid "@I @i %i in @o @i list.\n"
msgstr "Ogiltig inod %i i föräldralös inodlista.\n"
-#. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem.
-#: e2fsck/problem.c:280 e2fsck/problem.c:647
-msgid "@f has feature flag(s) set, but is a revision 0 @f. "
-msgstr ""
-"filsystemet har funktionsflaggor satta, men är ett revision 0-filsystem. "
-
#. @-expanded: journal superblock has an unknown read-only feature flag set.\n
-#: e2fsck/problem.c:285
-#, fuzzy
+#: e2fsck/problem.c:275
msgid "@j @S has an unknown read-only feature flag set.\n"
-msgstr "Ext3-journalsuperblock har okänd skrivskyddad funktionsflagga satt.\n"
+msgstr "Journalsuperblock har okänd skrivskyddad funktionsflagga satt.\n"
#. @-expanded: journal superblock has an unknown incompatible feature flag set.\n
-#: e2fsck/problem.c:290
-#, fuzzy
+#: e2fsck/problem.c:280
msgid "@j @S has an unknown incompatible feature flag set.\n"
-msgstr "Ext3-journalsuperblock har okänd inkompatibel funktionsflagga satt.\n"
+msgstr "Journalsuperblock har okänd inkompatibel funktionsflagga satt.\n"
#. @-expanded: journal version not supported by this e2fsck.\n
-#: e2fsck/problem.c:295
+#: e2fsck/problem.c:285
msgid "@j version not supported by this e2fsck.\n"
msgstr "Journalversion stöds inte av denna e2fsck.\n"
#. @-expanded: Moving journal from /%s to hidden inode.\n
#. @-expanded: \n
-#: e2fsck/problem.c:300
+#: e2fsck/problem.c:290
#, c-format
msgid ""
"Moving @j from /%s to hidden @i.\n"
@@ -1018,7 +998,7 @@ msgstr ""
#. @-expanded: Error moving journal: %m\n
#. @-expanded: \n
-#: e2fsck/problem.c:305
+#: e2fsck/problem.c:295
#, c-format
msgid ""
"Error moving @j: %m\n"
@@ -1030,7 +1010,7 @@ msgstr ""
#. @-expanded: Found invalid V2 journal superblock fields (from V1 journal).\n
#. @-expanded: Clearing fields beyond the V1 journal superblock...\n
#. @-expanded: \n
-#: e2fsck/problem.c:310
+#: e2fsck/problem.c:300
msgid ""
"Found @n V2 @j @S fields (from V1 @j).\n"
"Clearing fields beyond the V1 @j @S...\n"
@@ -1040,6 +1020,16 @@ msgstr ""
"Tömmer fält efter V1-journalsuperblock ...\n"
"\n"
+#. @-expanded: Run journal anyway
+#: e2fsck/problem.c:306
+msgid "Run @j anyway"
+msgstr "Kör journal ändå"
+
+#. @-expanded: Recovery flag not set in backup superblock, so running journal anyway.\n
+#: e2fsck/problem.c:311
+msgid "Recovery flag not set in backup @S, so running @j anyway.\n"
+msgstr "Rättningsflagga inte satt i reservsuperblock, så kör journal ändå.\n"
+
#. @-expanded: Backing up journal inode block information.\n
#. @-expanded: \n
#: e2fsck/problem.c:316
@@ -1063,8 +1053,7 @@ msgstr ""
#. @-expanded: Resize_inode not enabled, but the resize inode is non-zero.
#: e2fsck/problem.c:327
msgid "Resize_ at i not enabled, but the resize @i is non-zero. "
-msgstr ""
-"Resize_inode är inte aktiverat, men storleksändringsinoden är inte noll. "
+msgstr "Resize_inode är inte aktiverat, men storleksändringsinoden är inte noll. "
#. @-expanded: Resize inode not valid.
#: e2fsck/problem.c:332
@@ -1107,8 +1096,7 @@ msgstr "kontrollsumma f
#: e2fsck/problem.c:361
#, c-format
msgid "@g descriptor %g marked uninitialized without feature set.\n"
-msgstr ""
-"gruppbeskrivare %g är markerad oinitierad utan att egenskapen är satt.\n"
+msgstr "gruppbeskrivare %g är markerad oinitierad utan att egenskapen är satt.\n"
#. @-expanded: group %g block bitmap uninitialized but inode bitmap in use.\n
#: e2fsck/problem.c:366
@@ -1133,7 +1121,7 @@ msgstr "Journaltransaktion %i var trasig,
#: e2fsck/problem.c:385
msgid "The test_fs flag is set (and ext4 is available). "
-msgstr ""
+msgstr "Flaggan test_fs är satt (och ext4 är tillgänligt). "
#. @-expanded: Pass 1: Checking inodes, blocks, and sizes\n
#: e2fsck/problem.c:392
@@ -1176,20 +1164,17 @@ msgstr "Inod %i
#. @-expanded: group %g's block bitmap at %b conflicts with some other fs block.\n
#: e2fsck/problem.c:426
msgid "@g %g's @b @B at %b @C.\n"
-msgstr ""
-"Grupp %g:s blockbitkarta vid %b står i konflikt med annat filsystemblock.\n"
+msgstr "Grupp %g:s blockbitkarta vid %b står i konflikt med annat filsystemblock.\n"
#. @-expanded: group %g's inode bitmap at %b conflicts with some other fs block.\n
#: e2fsck/problem.c:431
msgid "@g %g's @i @B at %b @C.\n"
-msgstr ""
-"Grupp %g:s inodbitkarta vid %b står i konflikt med annat filsystemblock.\n"
+msgstr "Grupp %g:s inodbitkarta vid %b står i konflikt med annat filsystemblock.\n"
#. @-expanded: group %g's inode table at %b conflicts with some other fs block.\n
#: e2fsck/problem.c:436
msgid "@g %g's @i table at %b @C.\n"
-msgstr ""
-"Grupp %g:s inodtabell vid %b står i konflikt med annat filsystemblock.\n"
+msgstr "Grupp %g:s inodtabell vid %b står i konflikt med annat filsystemblock.\n"
#. @-expanded: group %g's block bitmap (%b) is bad.
#: e2fsck/problem.c:441
@@ -1251,8 +1236,7 @@ msgstr "Duplicerat eller felaktigt block anv
#. @-expanded: Bad block %b used as bad block inode indirect block.
#: e2fsck/problem.c:496
msgid "Bad @b %b used as bad @b @i indirect @b. "
-msgstr ""
-"Felaktigt block %b använt som indirektblock för inod för dåliga block. "
+msgstr "Felaktigt block %b använt som indirektblock för inod för dåliga block. "
#. @-expanded: \n
#. @-expanded: The bad block inode has probably been corrupted. You probably\n
@@ -1301,8 +1285,7 @@ msgstr "Det prim
#. @-expanded: Block %b in the primary group descriptors is on the bad block list\n
#: e2fsck/problem.c:524
msgid "Block %b in the primary @g descriptors is on the bad @b list\n"
-msgstr ""
-"Block %b i de primära gruppbeskrivarna är på listan över dåliga block\n"
+msgstr "Block %b i de primära gruppbeskrivarna är på listan över dåliga block\n"
#. @-expanded: Warning: Group %g's superblock (%b) is bad.\n
#: e2fsck/problem.c:530
@@ -1312,21 +1295,17 @@ msgstr "Varning: Grupp %g:s superblock (%b)
#. @-expanded: Warning: Group %g's copy of the group descriptors has a bad block (%b).\n
#: e2fsck/problem.c:535
msgid "Warning: Group %g's copy of the @g descriptors has a bad @b (%b).\n"
-msgstr ""
-"Varning: Grupp %g:s kopia av gruppbeskrivarna har ett dåligt block (%b).\n"
+msgstr "Varning: Grupp %g:s kopia av gruppbeskrivarna har ett dåligt block (%b).\n"
#. @-expanded: Programming error? block #%b claimed for no reason in process_bad_block.\n
#: e2fsck/problem.c:541
msgid "Programming error? @b #%b claimed for no reason in process_bad_ at b.\n"
-msgstr ""
-"Programmeringsfel? Block nr. %b tas i anspråk utan anledning i "
-"process_bad_block.\n"
+msgstr "Programmeringsfel? Block nr. %b tas i anspråk utan anledning i process_bad_block.\n"
#. @-expanded: error allocating %N contiguous block(s) in block group %g for %s: %m\n
#: e2fsck/problem.c:547
msgid "@A %N contiguous @b(s) in @b @g %g for %s: %m\n"
-msgstr ""
-"Fel vid allokering av %N konsekutiva block i blockgrupp %g för %s: %m\n"
+msgstr "Fel vid allokering av %N konsekutiva block i blockgrupp %g för %s: %m\n"
#. @-expanded: error allocating block buffer for relocating %s\n
#: e2fsck/problem.c:552
@@ -1356,7 +1335,7 @@ msgid "Warning: could not write @b %b for %s: %m\n"
msgstr "Varning: kunde inte skriva block %b av %s: %m\n"
#. @-expanded: error allocating inode bitmap (%N): %m\n
-#: e2fsck/problem.c:577 e2fsck/problem.c:1378
+#: e2fsck/problem.c:577 e2fsck/problem.c:1383
msgid "@A @i @B (%N): %m\n"
msgstr "Fel vid allokering av inodbitkarta (%N): %m\n"
@@ -1397,9 +1376,7 @@ msgstr "Fel vid lagring av inodsr
#. @-expanded: Error storing directory block information (inode=%i, block=%b, num=%N): %m\n
#: e2fsck/problem.c:612
msgid "Error storing @d @b information (@i=%i, @b=%b, num=%N): %m\n"
-msgstr ""
-"Fel vid lagring av katalogblocksinformation (inod=%i, block=%b, antal=%N): %"
-"m\n"
+msgstr "Fel vid lagring av katalogblocksinformation (inod=%i, block=%b, antal=%N): %m\n"
#. @-expanded: Error reading inode %i: %m\n
#: e2fsck/problem.c:618
@@ -1428,8 +1405,7 @@ msgstr ""
#: e2fsck/problem.c:637
#, c-format
msgid "@i %i has @cion flag set on @f without @cion support. "
-msgstr ""
-"Inod %i har kompressionsflagga satt på filsystem utan kompressionsstöd. "
+msgstr "Inod %i har kompressionsflagga satt på filsystem utan kompressionsstöd. "
#. @-expanded: Special (device/socket/fifo) inode %i has non-zero size.
#: e2fsck/problem.c:642
@@ -1594,22 +1570,20 @@ msgstr "Inod %i har en extra storlek (%IS) som
msgid "@a in @i %i has a namelen (%N) which is @n\n"
msgstr "Utökat attribut i inod %i har ett namelen (%N) som är ogiltig\n"
-#. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n
-#: e2fsck/problem.c:798
-msgid "@a in @i %i has a value size (%N) which is @n\n"
-msgstr "Utökat attribut i inod %i har ett värdestorlek (%N) som är ogiltig\n"
-
#. @-expanded: extended attribute in inode %i has a value offset (%N) which is invalid\n
-#: e2fsck/problem.c:803
+#: e2fsck/problem.c:798
msgid "@a in @i %i has a value offset (%N) which is @n\n"
msgstr "Utökat attribut i inod %i har en värdeposition (%N) som är ogiltig\n"
#. @-expanded: extended attribute in inode %i has a value block (%N) which is invalid (must be 0)\n
-#: e2fsck/problem.c:808
+#: e2fsck/problem.c:803
msgid "@a in @i %i has a value @b (%N) which is @n (must be 0)\n"
-msgstr ""
-"Utökat attribut i inod %i har ett värdeblock (%N) som är ogiltigt (måste "
-"vara 0)\n"
+msgstr "Utökat attribut i inod %i har ett värdeblock (%N) som är ogiltigt (måste vara 0)\n"
+
+#. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n
+#: e2fsck/problem.c:808
+msgid "@a in @i %i has a value size (%N) which is @n\n"
+msgstr "Utökat attribut i inod %i har ett värdestorlek (%N) som är ogiltig\n"
#. @-expanded: extended attribute in inode %i has a hash (%N) which is invalid\n
#: e2fsck/problem.c:813
@@ -1634,6 +1608,8 @@ msgid ""
"Failed to iterate extents in @i %i\n"
"\t(op %s, blk %b, lblk %c): %m\n"
msgstr ""
+"Misslyckades att iterera över utsträckningar i inod %i\n"
+"\t(op %s, blk %b, lblk %c): %m\n"
#. @-expanded: inode %i has an invalid extent\n
#. @-expanded: \t(logical block %c, invalid physical block %b, len %N)\n
@@ -1659,17 +1635,13 @@ msgstr ""
#: e2fsck/problem.c:844
#, c-format
msgid "@i %i has EXTENTS_FL flag set on @f without extents support.\n"
-msgstr ""
-"Inod %i har flaggan EXTENTS_FL satt på filsystemet utan stöd för "
-"utsträckningar.\n"
+msgstr "Inod %i har flaggan EXTENTS_FL satt på filsystemet utan stöd för utsträckningar.\n"
#. @-expanded: inode %i is in extent format, but superblock is missing EXTENTS feature\n
#: e2fsck/problem.c:849
#, c-format
msgid "@i %i is in extent format, but @S is missing EXTENTS feature\n"
-msgstr ""
-"inod %i är i utsträckningsformat, men superblocket saknar egenskapen "
-"EXTENTS\n"
+msgstr "inod %i är i utsträckningsformat, men superblocket saknar egenskapen EXTENTS\n"
#. @-expanded: inode %i missing EXTENT_FL, but is in extents format\n
#: e2fsck/problem.c:854
@@ -1695,7 +1667,7 @@ msgstr ""
#. @-expanded: inode %i has an invalid extent node (blk %b, lblk %c)\n
#: e2fsck/problem.c:868
msgid "@i %i has an invalid extent node (blk %b, lblk %c)\n"
-msgstr ""
+msgstr "inod %i har en ogiltig utsträckningsnod (blk %b, lblk %c)\n"
#. @-expanded: \n
#. @-expanded: Running additional passes to resolve blocks claimed by more than one inode...\n
@@ -1707,8 +1679,7 @@ msgid ""
"Pass 1B: Rescanning for @m @bs\n"
msgstr ""
"\n"
-"Kör ytterliggare pass för att lösa upp block som används av mer än en "
-"inod ...\n"
+"Kör ytterliggare pass för att lösa upp block som används av mer än en inod ...\n"
"Pass 1B: Söker igen efter block som används flera gånger\n"
#. @-expanded: multiply-claimed block(s) in inode %i:
@@ -1737,15 +1708,12 @@ msgstr "Fel vid iterering
#. @-expanded: Error adjusting refcount for extended attribute block %b (inode %i): %m\n
#: e2fsck/problem.c:911 e2fsck/problem.c:1227
msgid "Error adjusting refcount for @a @b %b (@i %i): %m\n"
-msgstr ""
-"Fel vid justering av referensräknare för externa attribut-block %b (inod %"
-"i): %m\n"
+msgstr "Fel vid justering av referensräknare för externa attribut-block %b (inod %i): %m\n"
#. @-expanded: Pass 1C: Scanning directories for inodes with multiply-claimed blocks\n
#: e2fsck/problem.c:917
msgid "Pass 1C: Scanning directories for @is with @m @bs\n"
-msgstr ""
-"Pass 1C: Söker kataloger efter inoder med flerfaldigt ianspråkstagna block\n"
+msgstr "Pass 1C: Söker kataloger efter inoder med flerfaldigt ianspråkstagna block\n"
#. @-expanded: Pass 1D: Reconciling multiply-claimed blocks\n
#: e2fsck/problem.c:923
@@ -1826,8 +1794,7 @@ msgstr "Post \"%Dn\" i %p (%i)
#. @-expanded: entry '%Dn' in %p (%i) points to inode (%Di) located in a bad block.\n
#: e2fsck/problem.c:993
msgid "@E points to @i (%Di) located in a bad @b.\n"
-msgstr ""
-"Post \"%Dn\" i %p (%i) pekar på inod (%Di) som finns i ett trasigt block.\n"
+msgstr "Post \"%Dn\" i %p (%i) pekar på inod (%Di) som finns i ett trasigt block.\n"
#. @-expanded: entry '%Dn' in %p (%i) is a link to directory %P (%Di).\n
#: e2fsck/problem.c:998
@@ -1859,8 +1826,7 @@ msgstr "\"..\" saknas i kataloginod %i.\n"
#. @-expanded: First entry '%Dn' (inode=%Di) in directory inode %i (%p) should be '.'\n
#: e2fsck/problem.c:1023
msgid "First @e '%Dn' (@i=%Di) in @d @i %i (%p) @s '.'\n"
-msgstr ""
-"Första post \"%Dn\" (inod=%Di) i kataloginod %i (%p) skulle varit \".\"\n"
+msgstr "Första post \"%Dn\" (inod=%Di) i kataloginod %i (%p) skulle varit \".\"\n"
#. @-expanded: Second entry '%Dn' (inode=%Di) in directory inode %i should be '..'\n
#: e2fsck/problem.c:1028
@@ -1944,7 +1910,7 @@ msgstr "Post \"%Dn\" i %p (%i)
msgid "@E is duplicate '..' @e.\n"
msgstr "Post \"%Dn\" i %p (%i) är duplicerad \"..\"-post.\n"
-#: e2fsck/problem.c:1108 e2fsck/problem.c:1403
+#: e2fsck/problem.c:1108 e2fsck/problem.c:1408
#, c-format
msgid "Internal error: couldn't find dir_info for %i.\n"
msgstr "Internt fel: kunde inte hitta dir_info för %i.\n"
@@ -2014,8 +1980,7 @@ msgstr "S
#. @-expanded: entry '%Dn' in %p (%i) has an incorrect filetype (was %Dt, should be %N).\n
#: e2fsck/problem.c:1168
msgid "@E has an incorrect filetype (was %Dt, @s %N).\n"
-msgstr ""
-"Post \"%Dn\" i %p (%i) har felaktig filtyp (var %Dt, skulle varit %N).\n"
+msgstr "Post \"%Dn\" i %p (%i) har felaktig filtyp (var %Dt, skulle varit %N).\n"
#. @-expanded: entry '%Dn' in %p (%i) has filetype set.\n
#: e2fsck/problem.c:1173
@@ -2040,9 +2005,7 @@ msgstr "Ut
#. @-expanded: filesystem contains large files, but lacks LARGE_FILE flag in superblock.\n
#: e2fsck/problem.c:1193
msgid "@f contains large files, but lacks LARGE_FILE flag in @S.\n"
-msgstr ""
-"Filsystem innehåller stora filer, men saknar flaggan LARGE_FILE i "
-"superblock.\n"
+msgstr "Filsystem innehåller stora filer, men saknar flaggan LARGE_FILE i superblock.\n"
#. @-expanded: problem in HTREE directory inode %d: node (%B) not referenced\n
#: e2fsck/problem.c:1198
@@ -2095,8 +2058,7 @@ msgstr ""
#. @-expanded: problem in HTREE directory inode %d: node (%B) has an unordered hash table\n
#: e2fsck/problem.c:1247
msgid "@p @h %d: node (%B) has an unordered hash table\n"
-msgstr ""
-"Problem i HTREE-katalognod %d (%q): not (%B) har en oordnat hash-tabell\n"
+msgstr "Problem i HTREE-katalognod %d (%q): not (%B) har en oordnat hash-tabell\n"
#. @-expanded: problem in HTREE directory inode %d: node (%B) has invalid depth (%N)\n
#: e2fsck/problem.c:1252
@@ -2144,103 +2106,105 @@ msgstr "Ov
#. @-expanded: entry '%Dn' in %p (%i) references inode %Di in group %g where _INODE_UNINIT is set.\n
#: e2fsck/problem.c:1281
-#, fuzzy
msgid "@E references @i %Di in @g %g where _INODE_UNINIT is set.\n"
-msgstr "inod %i funnen i grupp %g där _INODE_UNINIT är satt. "
+msgstr "Post \"%Dn\" i %p (%i) refererar inod %Di i grupp %g där _INODE_UNINIT är satt.\n"
#. @-expanded: entry '%Dn' in %p (%i) references inode %Di found in group %g's unused inodes area.\n
#: e2fsck/problem.c:1286
-#, fuzzy
msgid "@E references @i %Di found in @g %g's unused inodes area.\n"
-msgstr "inod %i funnen i oanvänt inodsområde i grupp %g. "
+msgstr "Post \"%Dn\" i %p (%i) refererar inod %Di funnen i oanvänt inodsområde i grupp %g.\n"
+
+#. @-expanded: i_file_acl_hi for inode %i (%Q) is %N, should be zero.\n
+#: e2fsck/problem.c:1291
+msgid "i_file_acl_hi @F %N, @s zero.\n"
+msgstr "i_file_acl_hi för inod %i (%Q) är %N, skulle varit noll.\n"
#. @-expanded: Pass 3: Checking directory connectivity\n
-#: e2fsck/problem.c:1293
+#: e2fsck/problem.c:1298
msgid "Pass 3: Checking @d connectivity\n"
msgstr "Pass 3: Kontrollerar katalogförbindelser\n"
#. @-expanded: root inode not allocated.
-#: e2fsck/problem.c:1298
+#: e2fsck/problem.c:1303
msgid "@r not allocated. "
msgstr "Rotinod inte allokerad. "
#. @-expanded: No room in lost+found directory.
-#: e2fsck/problem.c:1303
+#: e2fsck/problem.c:1308
msgid "No room in @l @d. "
msgstr "Ingen plats i lost+found-katalog. "
#. @-expanded: Unconnected directory inode %i (%p)\n
-#: e2fsck/problem.c:1308
+#: e2fsck/problem.c:1313
#, c-format
msgid "Unconnected @d @i %i (%p)\n"
msgstr "Oförbunden kataloginod %i (%p)\n"
#. @-expanded: /lost+found not found.
-#: e2fsck/problem.c:1313
+#: e2fsck/problem.c:1318
msgid "/@l not found. "
msgstr "/lost+found inte funnen. "
#. @-expanded: '..' in %Q (%i) is %P (%j), should be %q (%d).\n
-#: e2fsck/problem.c:1318
+#: e2fsck/problem.c:1323
msgid "'..' in %Q (%i) is %P (%j), @s %q (%d).\n"
msgstr "\"..\" i %Q (%i) är %P (%j), skulle varit %q (%d).\n"
#. @-expanded: Bad or non-existent /lost+found. Cannot reconnect.\n
-#: e2fsck/problem.c:1323
+#: e2fsck/problem.c:1328
msgid "Bad or non-existent /@l. Cannot reconnect.\n"
-msgstr "Felaktig eller ej existerande /lost+found. Kan inte återföbinda.\n"
+msgstr "Felaktig eller ej existerande /lost+found. Kan inte återansluta.\n"
#. @-expanded: Could not expand /lost+found: %m\n
-#: e2fsck/problem.c:1328
+#: e2fsck/problem.c:1333
#, c-format
msgid "Could not expand /@l: %m\n"
msgstr "Kunde inte expandera /lost+found: %m\n"
-#: e2fsck/problem.c:1333
+#: e2fsck/problem.c:1338
#, c-format
msgid "Could not reconnect %i: %m\n"
msgstr "Kunde inte återförbinda %i: %m\n"
#. @-expanded: Error while trying to find /lost+found: %m\n
-#: e2fsck/problem.c:1338
+#: e2fsck/problem.c:1343
#, c-format
msgid "Error while trying to find /@l: %m\n"
msgstr "Fel vid försök att hitta /lost+found: %m\n"
#. @-expanded: ext2fs_new_block: %m while trying to create /lost+found directory\n
-#: e2fsck/problem.c:1343
+#: e2fsck/problem.c:1348
#, c-format
msgid "ext2fs_new_ at b: %m while trying to create /@l @d\n"
msgstr "ext2fs_new_block: %m ved försök att skapa /lost+found-katalog\n"
#. @-expanded: ext2fs_new_inode: %m while trying to create /lost+found directory\n
-#: e2fsck/problem.c:1348
+#: e2fsck/problem.c:1353
#, c-format
msgid "ext2fs_new_ at i: %m while trying to create /@l @d\n"
msgstr "ext2fs_new_inode: %m vid försök att skapa /lost+found-katalog\n"
#. @-expanded: ext2fs_new_dir_block: %m while creating new directory block\n
-#: e2fsck/problem.c:1353
+#: e2fsck/problem.c:1358
#, c-format
msgid "ext2fs_new_dir_ at b: %m while creating new @d @b\n"
msgstr "ext2fs_new_dir_block: %m när nytt katalogblock skapades\n"
#. @-expanded: ext2fs_write_dir_block: %m while writing the directory block for /lost+found\n
-#: e2fsck/problem.c:1358
+#: e2fsck/problem.c:1363
#, c-format
msgid "ext2fs_write_dir_ at b: %m while writing the @d @b for /@l\n"
-msgstr ""
-"ext2fs_write_dir_block: %m vid skrivning av katalogblocket för /lost+found\n"
+msgstr "ext2fs_write_dir_block: %m vid skrivning av katalogblocket för /lost+found\n"
#. @-expanded: Error while adjusting inode count on inode %i\n
-#: e2fsck/problem.c:1363
+#: e2fsck/problem.c:1368
#, c-format
msgid "Error while adjusting @i count on @i %i\n"
msgstr "Fel vid justering av inodräknare på inod %i\n"
#. @-expanded: Couldn't fix parent of inode %i: %m\n
#. @-expanded: \n
-#: e2fsck/problem.c:1368
+#: e2fsck/problem.c:1373
#, c-format
msgid ""
"Couldn't fix parent of @i %i: %m\n"
@@ -2251,179 +2215,168 @@ msgstr ""
#. @-expanded: Couldn't fix parent of inode %i: Couldn't find parent directory entry\n
#. @-expanded: \n
-#: e2fsck/problem.c:1373
+#: e2fsck/problem.c:1378
#, c-format
msgid ""
"Couldn't fix parent of @i %i: Couldn't find parent @d @e\n"
"\n"
msgstr ""
-"Kunde inte rätta förälder till inod %i: Kunde inte hitta "
-"förälderkatalogpost\n"
+"Kunde inte rätta förälder till inod %i: Kunde inte hitta förälderkatalogpost\n"
"\n"
#. @-expanded: Error creating root directory (%s): %m\n
-#: e2fsck/problem.c:1383
+#: e2fsck/problem.c:1388
#, c-format
msgid "Error creating root @d (%s): %m\n"
msgstr "Fel vid skapande av rotkatalog (%s): %m\n"
#. @-expanded: Error creating /lost+found directory (%s): %m\n
-#: e2fsck/problem.c:1388
+#: e2fsck/problem.c:1393
#, c-format
msgid "Error creating /@l @d (%s): %m\n"
msgstr "Fel vid skapande av /lost+found-katalog (%s): %m\n"
#. @-expanded: root inode is not a directory; aborting.\n
-#: e2fsck/problem.c:1393
+#: e2fsck/problem.c:1398
msgid "@r is not a @d; aborting.\n"
msgstr "Rotinod är inte en katalog; avbryter.\n"
#. @-expanded: Cannot proceed without a root inode.\n
-#: e2fsck/problem.c:1398
+#: e2fsck/problem.c:1403
msgid "Cannot proceed without a @r.\n"
msgstr "Kan inte fortsätta utan en rotinod.\n"
#. @-expanded: /lost+found is not a directory (ino=%i)\n
-#: e2fsck/problem.c:1408
+#: e2fsck/problem.c:1413
#, c-format
msgid "/@l is not a @d (ino=%i)\n"
msgstr "/lost+found är inte en katalog (ino=%i)\n"
-#: e2fsck/problem.c:1415
+#: e2fsck/problem.c:1420
msgid "Pass 3A: Optimizing directories\n"
msgstr "Pass 3A: Optimerar kataloger\n"
-#: e2fsck/problem.c:1420
-#, fuzzy, c-format
+#: e2fsck/problem.c:1425
+#, c-format
msgid "Failed to create dirs_to_hash iterator: %m\n"
-msgstr "Misslyckades att skapa dirs_to_hash-iterator: %m"
+msgstr "Misslyckades att skapa dirs_to_hash-iterator: %m\n"
-#: e2fsck/problem.c:1425
-#, fuzzy
+#: e2fsck/problem.c:1430
msgid "Failed to optimize directory %q (%d): %m\n"
-msgstr "Misslyckades att optimera katalog %q (%d): %m"
+msgstr "Misslyckades att optimera katalog %q (%d): %m\n"
-#: e2fsck/problem.c:1430
+#: e2fsck/problem.c:1435
msgid "Optimizing directories: "
msgstr "Optimerar kataloger: "
-#: e2fsck/problem.c:1447
+#: e2fsck/problem.c:1452
msgid "Pass 4: Checking reference counts\n"
msgstr "Pass 4: Kontrollerar referensräknare\n"
#. @-expanded: unattached zero-length inode %i.
-#: e2fsck/problem.c:1452
+#: e2fsck/problem.c:1457
#, c-format
msgid "@u @z @i %i. "
msgstr "Lös nollängdsinod %i. "
#. @-expanded: unattached inode %i\n
-#: e2fsck/problem.c:1457
+#: e2fsck/problem.c:1462
#, c-format
msgid "@u @i %i\n"
msgstr "lös inod %i\n"
#. @-expanded: inode %i ref count is %Il, should be %N.
-#: e2fsck/problem.c:1462
+#: e2fsck/problem.c:1467
msgid "@i %i ref count is %Il, @s %N. "
msgstr "Inod %i referensräknare är %Il, skulle varit %N. "
#. @-expanded: WARNING: PROGRAMMING BUG IN E2FSCK!\n
#. @-expanded: \tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n
#. @-expanded: inode_link_info[%i] is %N, inode.i_links_count is %Il. They should be the same!\n
-#: e2fsck/problem.c:1466
+#: e2fsck/problem.c:1471
msgid ""
"WARNING: PROGRAMMING BUG IN E2FSCK!\n"
"\tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n"
"@i_link_info[%i] is %N, @i.i_links_count is %Il. They @s the same!\n"
msgstr ""
"VARNING: PROGRAMMERINGSFEL I E2FSCK!\n"
-" ELLER NÅGON KLANTSKALLE (DU) KONTROLLERAR ETT MONTERAT (AKTIVT) "
-"FILSYSTEM.\n"
+" ELLER NÅGON KLANTSKALLE (DU) KONTROLLERAR ETT MONTERAT (AKTIVT) FILSYSTEM.\n"
"inod_link_info[%i] är %N, inod.i_links_count är %Il. De skulle vara samma!\n"
#. @-expanded: Pass 5: Checking group summary information\n
-#: e2fsck/problem.c:1476
+#: e2fsck/problem.c:1481
msgid "Pass 5: Checking @g summary information\n"
msgstr "Pass 5: Kontrollerar gruppsammanfattningsinformation\n"
#. @-expanded: Padding at end of inode bitmap is not set.
-#: e2fsck/problem.c:1481
+#: e2fsck/problem.c:1486
msgid "Padding at end of @i @B is not set. "
msgstr "Utfyllnad vid slutet av inodsbitkarta är inte satt. "
#. @-expanded: Padding at end of block bitmap is not set.
-#: e2fsck/problem.c:1486
+#: e2fsck/problem.c:1491
msgid "Padding at end of @b @B is not set. "
msgstr "Utfyllnad vid slutet av blockbitkarta är inte satt. "
#. @-expanded: block bitmap differences:
-#: e2fsck/problem.c:1491
+#: e2fsck/problem.c:1496
msgid "@b @B differences: "
msgstr "Blockbitkarteskillnader: "
#. @-expanded: inode bitmap differences:
-#: e2fsck/problem.c:1511
+#: e2fsck/problem.c:1516
msgid "@i @B differences: "
msgstr "Inodsbitkarteskillnader: "
#. @-expanded: Free inodes count wrong for group #%g (%i, counted=%j).\n
-#: e2fsck/problem.c:1531
+#: e2fsck/problem.c:1536
msgid "Free @is count wrong for @g #%g (%i, counted=%j).\n"
msgstr "Antal fria inoder är fel för grupp nr. %g (%i, räknade=%j).\n"
#. @-expanded: Directories count wrong for group #%g (%i, counted=%j).\n
-#: e2fsck/problem.c:1536
+#: e2fsck/problem.c:1541
msgid "Directories count wrong for @g #%g (%i, counted=%j).\n"
msgstr "Katalogantal fel för grupp nr. %g (%i, räknade=%j).\n"
#. @-expanded: Free inodes count wrong (%i, counted=%j).\n
-#: e2fsck/problem.c:1541
+#: e2fsck/problem.c:1546
msgid "Free @is count wrong (%i, counted=%j).\n"
msgstr "Antal fria inoder är fel (%i, räknade=%j).\n"
#. @-expanded: Free blocks count wrong for group #%g (%b, counted=%c).\n
-#: e2fsck/problem.c:1546
+#: e2fsck/problem.c:1551
msgid "Free @bs count wrong for @g #%g (%b, counted=%c).\n"
msgstr "Antal fria block är fel för grupp nr. %g (%b, räknade=%c).\n"
#. @-expanded: Free blocks count wrong (%b, counted=%c).\n
-#: e2fsck/problem.c:1551
+#: e2fsck/problem.c:1556
msgid "Free @bs count wrong (%b, counted=%c).\n"
msgstr "Antal fria block är fel (%b, räknade=%c).\n"
#. @-expanded: PROGRAMMING ERROR: filesystem (#%N) bitmap endpoints (%b, %c) don't match calculated bitmap
#. @-expanded: endpoints (%i, %j)\n
-#: e2fsck/problem.c:1556
-msgid ""
-"PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B "
-"endpoints (%i, %j)\n"
+#: e2fsck/problem.c:1561
+msgid "PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B endpoints (%i, %j)\n"
msgstr ""
"PROGRAMMERINGSFEL: filsystem (nr. %N) bitkartas ändpunkter (%b, %c) stämmer\n"
"inte med beräknade bitkarteändpunkter (%i, %j)\n"
-#: e2fsck/problem.c:1562
+#: e2fsck/problem.c:1567
msgid "Internal error: fudging end of bitmap (%N)\n"
msgstr "Internt fel: fuskar till slut på bitkarta (%N)\n"
#. @-expanded: Error copying in replacement inode bitmap: %m\n
-#: e2fsck/problem.c:1567
+#: e2fsck/problem.c:1572
#, c-format
msgid "Error copying in replacement @i @B: %m\n"
msgstr "Fel vid kopiering av ersättningsinodskarta: %m\n"
#. @-expanded: Error copying in replacement block bitmap: %m\n
-#: e2fsck/problem.c:1572
+#: e2fsck/problem.c:1577
#, c-format
msgid "Error copying in replacement @b @B: %m\n"
msgstr "Fel vid inkopiering av ersättningsbitkarta: %m\n"
-#. @-expanded: Recreate journal
-#: e2fsck/problem.c:1597
-#, fuzzy
-msgid "Recreate @j"
-msgstr "Återskapa"
-
#. @-expanded: group %g block(s) in use but group is marked BLOCK_UNINIT\n
#: e2fsck/problem.c:1602
#, c-format
@@ -2436,12 +2389,17 @@ msgstr "block i grupp %g anv
msgid "@g %g @i(s) in use but @g is marked INODE_UNINIT\n"
msgstr "inoder i grupp %g används men gruppen är markerad INODE_UNINIT\n"
-#: e2fsck/problem.c:1725
+#. @-expanded: Recreate journal
+#: e2fsck/problem.c:1614
+msgid "Recreate @j"
+msgstr "Återskapa journal"
+
+#: e2fsck/problem.c:1732
#, c-format
msgid "Unhandled error code (0x%x)!\n"
msgstr "Ej hanterad felkod (0x%x)!\n"
-#: e2fsck/problem.c:1820
+#: e2fsck/problem.c:1827
msgid "IGNORED"
msgstr "IGNORERAT"
@@ -2502,8 +2460,7 @@ msgid ""
" -p Automatic repair (no questions)\n"
" -n Make no changes to the filesystem\n"
" -y Assume \"yes\" to all questions\n"
-" -c Check for bad blocks and add them to the badblock "
-"list\n"
+" -c Check for bad blocks and add them to the badblock list\n"
" -f Force checking even if filesystem is marked clean\n"
msgstr ""
"\n"
@@ -2512,8 +2469,7 @@ msgstr ""
" -n Gör inga förändringar av filsystemet\n"
" -y Anta \"ja\" som svar på alla frågor\n"
" -c Leta efter dåliga block och lägg till dem i listan\n"
-" -f Framtvinga kontroll även om filsystemet är markerat "
-"rent\n"
+" -f Framtvinga kontroll även om filsystemet är markerat rent\n"
#: e2fsck/unix.c:88
#, c-format
@@ -2547,8 +2503,8 @@ msgstr " antal inoder med ind/dind/tind-block: %u/%u/%u\n"
msgid " Extent depth histogram: "
msgstr " Histogram över utsträckningars djup: "
-#: e2fsck/unix.c:207 misc/badblocks.c:916 misc/tune2fs.c:1567 misc/util.c:151
-#: resize/main.c:248
+#: e2fsck/unix.c:207 misc/badblocks.c:928 misc/tune2fs.c:1584 misc/util.c:151
+#: resize/main.c:249
#, c-format
msgid "while determining whether %s is mounted."
msgstr "när det avgjordes om %s är monterat."
@@ -2685,17 +2641,17 @@ msgstr "Endast en av flaggorna -p/-a, -n eller -y kan anges."
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr "Flaggan -t stödjs inte i denna version av e2fsck.\n"
-#: e2fsck/unix.c:801 misc/tune2fs.c:549 misc/tune2fs.c:833 misc/tune2fs.c:850
+#: e2fsck/unix.c:801 misc/tune2fs.c:550 misc/tune2fs.c:835 misc/tune2fs.c:853
#, c-format
msgid "Unable to resolve '%s'"
msgstr "Kan inte hitta \"%s\""
-#: e2fsck/unix.c:831
+#: e2fsck/unix.c:830
#, c-format
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
msgstr "Flaggorna -c och -l/-L kan inte båda användas på samma gång.\n"
-#: e2fsck/unix.c:879
+#: e2fsck/unix.c:878
#, c-format
msgid ""
"E2FSCK_JBD_DEBUG \"%s\" not an integer\n"
@@ -2704,7 +2660,7 @@ msgstr ""
"E2FSCK_JBD_DEBUG \"%s\" är inte ett heltal\n"
"\n"
-#: e2fsck/unix.c:888
+#: e2fsck/unix.c:887
#, c-format
msgid ""
"\n"
@@ -2715,38 +2671,43 @@ msgstr ""
"Ogiltigt ickenumerikst argument till -%c (\"%s\")\n"
"\n"
-#: e2fsck/unix.c:929
+#: e2fsck/unix.c:961
#, c-format
msgid "Error: ext2fs library version out of date!\n"
msgstr "Fel: ext2fs-bibliotekversion inaktuell!\n"
-#: e2fsck/unix.c:937
+#: e2fsck/unix.c:969
msgid "while trying to initialize program"
msgstr "vid försök att initiera program"
-#: e2fsck/unix.c:951
+#: e2fsck/unix.c:980
#, c-format
msgid "\tUsing %s, %s\n"
msgstr "\tAnvänder %s, %s\n"
-#: e2fsck/unix.c:963
+#: e2fsck/unix.c:992
msgid "need terminal for interactive repairs"
msgstr "behöver terminal för interaktiva reparationer"
-#: e2fsck/unix.c:1010
+#: e2fsck/unix.c:1021
#, c-format
msgid "%s: %s trying backup blocks...\n"
msgstr "%s: %s försöker med reservblock ...\n"
-#: e2fsck/unix.c:1012
+#: e2fsck/unix.c:1023
msgid "Superblock invalid,"
msgstr "Superblocket är ogiltigt,"
-#: e2fsck/unix.c:1013
+#: e2fsck/unix.c:1024
msgid "Group descriptors look bad..."
msgstr "Gruppbeskrivarna ser trasiga ut ..."
-#: e2fsck/unix.c:1040
+#: e2fsck/unix.c:1034
+#, c-format
+msgid "%s: going back to original superblock\n"
+msgstr "%s: går tillbaka till orginalsuperblock\n"
+
+#: e2fsck/unix.c:1060
#, c-format
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
@@ -2757,27 +2718,27 @@ msgstr ""
"(Eller så är filsystemets superblock trasigt)\n"
"\n"
-#: e2fsck/unix.c:1046
+#: e2fsck/unix.c:1066
#, c-format
msgid "Could this be a zero-length partition?\n"
msgstr "Kan detta vara en nollängdspartition?\n"
-#: e2fsck/unix.c:1048
+#: e2fsck/unix.c:1068
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr "Du måste ha %s-åtkomst till filsystemet eller vara root\n"
-#: e2fsck/unix.c:1053
+#: e2fsck/unix.c:1073
#, c-format
msgid "Possibly non-existent or swap device?\n"
msgstr "Kanske inte existerar eller växlingsenhet?\n"
-#: e2fsck/unix.c:1055
+#: e2fsck/unix.c:1075
#, c-format
msgid "Filesystem mounted or opened exclusively by another program?\n"
msgstr "Filsystemet monterat eller öppnat exklusivt av ett annat program?\n"
-#: e2fsck/unix.c:1059
+#: e2fsck/unix.c:1079
#, c-format
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
@@ -2786,44 +2747,40 @@ msgstr ""
"Skrivskyddad disk; använd flaggan -n för att göra en läsningskontroll\n"
"av enheten.\n"
-#: e2fsck/unix.c:1123
+#: e2fsck/unix.c:1143
msgid "Get a newer version of e2fsck!"
msgstr "Hämta en nyare version av e2fsck!"
-#: e2fsck/unix.c:1147
+#: e2fsck/unix.c:1173
#, c-format
msgid "while checking ext3 journal for %s"
msgstr "vid kontroll av ext3-journal för %s"
-#: e2fsck/unix.c:1158
+#: e2fsck/unix.c:1184
#, c-format
-msgid ""
-"Warning: skipping journal recovery because doing a read-only filesystem "
-"check.\n"
-msgstr ""
-"Varning: hoppar över journalåterhämtning eftersom en läsningskontroll av "
-"filsystem görs.\n"
+msgid "Warning: skipping journal recovery because doing a read-only filesystem check.\n"
+msgstr "Varning: hoppar över journalåterhämtning eftersom en läsningskontroll av filsystem görs.\n"
-#: e2fsck/unix.c:1171
+#: e2fsck/unix.c:1197
#, c-format
msgid "unable to set superblock flags on %s\n"
msgstr "kan inte sätta superblocksflaggor på %s\n"
-#: e2fsck/unix.c:1177
+#: e2fsck/unix.c:1203
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr "vid återhämtning av ext3-journal för %s"
-#: e2fsck/unix.c:1201
+#: e2fsck/unix.c:1228
#, c-format
msgid "%s has unsupported feature(s):"
msgstr "%s har funktioner som inte stöds:"
-#: e2fsck/unix.c:1217
+#: e2fsck/unix.c:1244
msgid "Warning: compression support is experimental.\n"
msgstr "Varning: komprimeringsstöd är experimentellt.\n"
-#: e2fsck/unix.c:1222
+#: e2fsck/unix.c:1249
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
@@ -2832,25 +2789,25 @@ msgstr ""
"E2fsck är inte kompilerat med HTREE-stöd,\n"
"\tmen filsystem %s har HTREE-kataloger.\n"
-#: e2fsck/unix.c:1276
+#: e2fsck/unix.c:1302
msgid "while reading bad blocks inode"
msgstr "vid läsning av inod för dåliga block"
-#: e2fsck/unix.c:1278
+#: e2fsck/unix.c:1304
#, c-format
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr "Detta bådar inte gott, men vi skall försöka att fortsätta ...\n"
-#: e2fsck/unix.c:1304
+#: e2fsck/unix.c:1330
msgid "Couldn't determine journal size"
msgstr "Det gick inte att avgöra journalstorlek"
-#: e2fsck/unix.c:1307
+#: e2fsck/unix.c:1333
#, c-format
msgid "Creating journal (%d blocks): "
msgstr "Skapar journal (%d block): "
-#: e2fsck/unix.c:1314 misc/mke2fs.c:2091
+#: e2fsck/unix.c:1340 misc/mke2fs.c:2113
msgid ""
"\n"
"\twhile trying to create journal"
@@ -2858,12 +2815,12 @@ msgstr ""
"\n"
"\tvid försök att skapa journal"
-#: e2fsck/unix.c:1317
+#: e2fsck/unix.c:1343
#, c-format
msgid " Done.\n"
msgstr " Klar.\n"
-#: e2fsck/unix.c:1318
+#: e2fsck/unix.c:1344
#, c-format
msgid ""
"\n"
@@ -2872,25 +2829,25 @@ msgstr ""
"\n"
"*** journalen har återskapats - filsystemet är nu ext3 igen ***\n"
-#: e2fsck/unix.c:1325
+#: e2fsck/unix.c:1351
#, c-format
msgid "Restarting e2fsck from the beginning...\n"
msgstr "Startar om e2fsck från början ...\n"
-#: e2fsck/unix.c:1329
+#: e2fsck/unix.c:1355
msgid "while resetting context"
msgstr "vid återställning av omgivning"
-#: e2fsck/unix.c:1336
+#: e2fsck/unix.c:1362
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr "%s: e2fsck inställd.\n"
-#: e2fsck/unix.c:1341
+#: e2fsck/unix.c:1367
msgid "aborted"
msgstr "avbruten"
-#: e2fsck/unix.c:1353
+#: e2fsck/unix.c:1379
#, c-format
msgid ""
"\n"
@@ -2899,12 +2856,12 @@ msgstr ""
"\n"
"%s: ***** FILSYSTEMET MODIFIERADES *****\n"
-#: e2fsck/unix.c:1356
+#: e2fsck/unix.c:1382
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr "%s: ***** STARTA OM LINUX *****\n"
-#: e2fsck/unix.c:1364
+#: e2fsck/unix.c:1390
#, c-format
msgid ""
"\n"
@@ -2915,7 +2872,7 @@ msgstr ""
"%s: ********** VARNING: Filsystemet har fortfarande fel **********\n"
"\n"
-#: e2fsck/unix.c:1400
+#: e2fsck/unix.c:1426
msgid "while setting block group checksum info"
msgstr "när kontrollsummeinformation för blockgrupp sattes"
@@ -3013,37 +2970,37 @@ msgstr ""
"%s: OVÄNTAD INKONSEKVENS; KÖR fsck MANUELLT.\n"
"\t(d.v.s., utan flaggorna -a eller -p)\n"
-#: e2fsck/util.c:336
+#: e2fsck/util.c:341
#, c-format
-msgid "Memory used: %dk/%dk (%dk/%dk), "
-msgstr "Använt minne: %d k/%d k (%d k/%d k), "
+msgid "Memory used: %luk/%luk (%luk/%luk), "
+msgstr "Använt minne: %lu k/%lu k (%lu k/%lu k), "
-#: e2fsck/util.c:340
+#: e2fsck/util.c:345
#, c-format
-msgid "Memory used: %d, "
-msgstr "Använt minne: %d, "
+msgid "Memory used: %lu, "
+msgstr "Använt minne: %lu, "
-#: e2fsck/util.c:346
+#: e2fsck/util.c:352
#, c-format
msgid "time: %5.2f/%5.2f/%5.2f\n"
msgstr "tid: %5.2f/%5.2f/%5.2f\n"
-#: e2fsck/util.c:351
+#: e2fsck/util.c:357
#, c-format
msgid "elapsed time: %6.3f\n"
msgstr "förfluten tid: %6.3f\n"
-#: e2fsck/util.c:385 e2fsck/util.c:399
+#: e2fsck/util.c:391 e2fsck/util.c:405
#, c-format
-msgid "while reading inode %ld in %s"
-msgstr "vid läsning av inod %ld i %s"
+msgid "while reading inode %lu in %s"
+msgstr "när inod %lu i %s lästes"
-#: e2fsck/util.c:413 e2fsck/util.c:426
+#: e2fsck/util.c:419 e2fsck/util.c:432
#, c-format
-msgid "while writing inode %ld in %s"
-msgstr "vid skrivning av inod %ld i %s"
+msgid "while writing inode %lu in %s"
+msgstr "när inod %lu i %s skrevs"
-#: e2fsck/util.c:575
+#: e2fsck/util.c:581
msgid "while allocating zeroizing buffer"
msgstr "vid allokering av nollställningsbuffert"
@@ -3055,8 +3012,7 @@ msgstr "klar \n"
#, c-format
msgid ""
"Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnf]\n"
-" [-c blocks_at_once] [-d delay_factor_between_reads] [-e "
-"max_bad_blocks]\n"
+" [-c blocks_at_once] [-d delay_factor_between_reads] [-e max_bad_blocks]\n"
" [-p num_passes] [-t test_pattern [-t test_pattern [...]]]\n"
" device [last_block [first_block]]\n"
msgstr ""
@@ -3078,77 +3034,77 @@ msgstr ""
#: misc/badblocks.c:202
#, c-format
msgid "%6.2f%% done, %s elapsed"
-msgstr ""
+msgstr "%6.2f %% klar, %s har gått"
-#: misc/badblocks.c:289
+#: misc/badblocks.c:293
msgid "Testing with random pattern: "
msgstr "Testar med slumpmönster: "
-#: misc/badblocks.c:307
+#: misc/badblocks.c:311
msgid "Testing with pattern 0x"
msgstr "Testar med mönster 0x"
-#: misc/badblocks.c:335 misc/badblocks.c:404
+#: misc/badblocks.c:339 misc/badblocks.c:408
msgid "during seek"
msgstr "vid sökning"
-#: misc/badblocks.c:346
+#: misc/badblocks.c:350
#, c-format
msgid "Weird value (%ld) in do_read\n"
msgstr "Underligt värde (%ld) i do_read\n"
-#: misc/badblocks.c:424
+#: misc/badblocks.c:428
msgid "during ext2fs_sync_device"
msgstr "vid ext2fs_sync_device"
-#: misc/badblocks.c:440 misc/badblocks.c:699
+#: misc/badblocks.c:447 misc/badblocks.c:711
msgid "while beginning bad block list iteration"
msgstr "vid början av iteration över lista av dåliga block"
-#: misc/badblocks.c:454 misc/badblocks.c:551 misc/badblocks.c:709
+#: misc/badblocks.c:461 misc/badblocks.c:563 misc/badblocks.c:721
msgid "while allocating buffers"
msgstr "vid allokering av buffertar"
-#: misc/badblocks.c:458
+#: misc/badblocks.c:465
#, c-format
msgid "Checking blocks %lu to %lu\n"
msgstr "Kontrollerar block %lu till %lu\n"
-#: misc/badblocks.c:463
+#: misc/badblocks.c:470
msgid "Checking for bad blocks in read-only mode\n"
msgstr "Letar efter dåliga block i skrivskyddat läge\n"
-#: misc/badblocks.c:472
+#: misc/badblocks.c:479
msgid "Checking for bad blocks (read-only test): "
msgstr "Letar efter dåliga block (skrivskyddad test): "
-#: misc/badblocks.c:480 misc/badblocks.c:583 misc/badblocks.c:628
-#: misc/badblocks.c:772
+#: misc/badblocks.c:487 misc/badblocks.c:595 misc/badblocks.c:640
+#: misc/badblocks.c:784
msgid "Too many bad blocks, aborting test\n"
msgstr "För många dåliga block, avbryter testet\n"
-#: misc/badblocks.c:558
+#: misc/badblocks.c:570
msgid "Checking for bad blocks in read-write mode\n"
msgstr "Letar efter dåliga block i läs-skriv-läge\n"
-#: misc/badblocks.c:560 misc/badblocks.c:722
+#: misc/badblocks.c:572 misc/badblocks.c:734
#, c-format
msgid "From block %lu to %lu\n"
msgstr "Från block %lu till %lu\n"
-#: misc/badblocks.c:618
+#: misc/badblocks.c:630
msgid "Reading and comparing: "
msgstr "Läser och jämför: "
-#: misc/badblocks.c:721
+#: misc/badblocks.c:733
msgid "Checking for bad blocks in non-destructive read-write mode\n"
msgstr "Letar efter dåliga block i ickeförstörande läs-skriv-läge\n"
-#: misc/badblocks.c:727
+#: misc/badblocks.c:739
msgid "Checking for bad blocks (non-destructive read-write test)\n"
msgstr "Letar efter dåliga block (ickeförstörande läs-skriv-test)\n"
-#: misc/badblocks.c:734
+#: misc/badblocks.c:746
msgid ""
"\n"
"Interrupt caught, cleaning up\n"
@@ -3156,57 +3112,52 @@ msgstr ""
"\n"
"Avbrott fångat, rensar upp\n"
-#: misc/badblocks.c:810
+#: misc/badblocks.c:822
#, c-format
msgid "during test data write, block %lu"
msgstr "vid testdataskrivning, block %lu"
-#: misc/badblocks.c:921 misc/util.c:156
+#: misc/badblocks.c:933 misc/util.c:156
#, c-format
msgid "%s is mounted; "
msgstr "%s är monterat, "
-#: misc/badblocks.c:923
+#: misc/badblocks.c:935
msgid "badblocks forced anyway. Hope /etc/mtab is incorrect.\n"
msgstr "badblocks framtvingat ändå. Hoppas /etc/mtab är felaktig.\n"
-#: misc/badblocks.c:928
+#: misc/badblocks.c:940
msgid "it's not safe to run badblocks!\n"
msgstr "det är inte säkert att köra badblocks!\n"
-#: misc/badblocks.c:933 misc/util.c:167
+#: misc/badblocks.c:945 misc/util.c:167
#, c-format
msgid "%s is apparently in use by the system; "
msgstr "%s används uppenbarligen av systemet; "
-#: misc/badblocks.c:936
+#: misc/badblocks.c:948
msgid "badblocks forced anyway.\n"
msgstr "badblocks framtvingat ändå.\n"
-#: misc/badblocks.c:956
+#: misc/badblocks.c:968
#, c-format
msgid "invalid %s - %s"
msgstr "ogiltig %s - %s"
-#: misc/badblocks.c:1015
-#, c-format
-msgid "bad block size - %s"
-msgstr "felaktig blockstorlek - %s"
-
-#: misc/badblocks.c:1070
+#: misc/badblocks.c:1077
#, c-format
msgid "can't allocate memory for test_pattern - %s"
msgstr "kunde inte allokera minne för testmönster - %s"
-#: misc/badblocks.c:1097
+#: misc/badblocks.c:1104
msgid "Maximum of one test_pattern may be specified in read-only mode"
msgstr "Högst ett testmönster får anges i skrivskyddat läge"
-#: misc/badblocks.c:1103
+#: misc/badblocks.c:1110
msgid "Random test_pattern is not allowed in read-only mode"
msgstr "Slumpvis testmönster är inte tillåtet i skrivskyddat läge"
-#: misc/badblocks.c:1117
+#: misc/badblocks.c:1124
msgid ""
"Couldn't determine device size; you must specify\n"
"the size manually\n"
@@ -3214,86 +3165,91 @@ msgstr ""
"Kunde inte avgöra enhetsstorlek; du måste ange\n"
"storleken manuellt\n"
-#: misc/badblocks.c:1123
+#: misc/badblocks.c:1130
msgid "while trying to determine device size"
msgstr "vid försök att avgöra enhetsstorlek"
-#: misc/badblocks.c:1128
+#: misc/badblocks.c:1135
msgid "last block"
msgstr "sista block"
-#: misc/badblocks.c:1134
+#: misc/badblocks.c:1141
msgid "first block"
msgstr "första block"
-#: misc/badblocks.c:1137
+#: misc/badblocks.c:1144
#, c-format
msgid "invalid starting block (%lu): must be less than %lu"
msgstr "felaktigt startblock (%lu): måste vara mindre än %lu"
-#: misc/badblocks.c:1193
+#: misc/badblocks.c:1200
msgid "while creating in-memory bad blocks list"
msgstr "när lista över dåliga block i minnet skapades"
-#: misc/badblocks.c:1208
+#: misc/badblocks.c:1215
msgid "while adding to in-memory bad block list"
msgstr "när tillägg gjordes till lista i minnet över dåliga block gjordes"
-#: misc/badblocks.c:1232
+#: misc/badblocks.c:1239
#, c-format
msgid "Pass completed, %u bad blocks found.\n"
msgstr "Pass avslutat, %u dåliga block hittade.\n"
#: misc/chattr.c:85
#, c-format
-msgid "Usage: %s [-RVf] [-+=AacDdijsSu] [-v version] files...\n"
-msgstr "Användning: %s [-RVf] [-+=AacDdijsSu] [-v version] filer...\n"
+msgid "Usage: %s [-RVf] [-+=AacDdeijsSu] [-v version] files...\n"
+msgstr "Användning: %s [-RVf] [-+=AacDdeijsSu] [-v version] filer...\n"
-#: misc/chattr.c:152
+#: misc/chattr.c:153
#, c-format
msgid "bad version - %s\n"
msgstr "felaktig version - %s\n"
-#: misc/chattr.c:198 misc/lsattr.c:113
+#: misc/chattr.c:200 misc/lsattr.c:115
#, c-format
msgid "while trying to stat %s"
msgstr "vid försök att ta status på %s"
-#: misc/chattr.c:204 misc/chattr.c:222
-#, c-format
-msgid "Flags of %s set as "
-msgstr "Flaggor på %s satta som "
-
-#: misc/chattr.c:214
+#: misc/chattr.c:207
#, c-format
msgid "while reading flags on %s"
msgstr "vid läsning av flaggor på %s"
-#: misc/chattr.c:231
+#: misc/chattr.c:216 misc/chattr.c:235
+#, c-format
+msgid "Clearing extent flag not supported on %s"
+msgstr "Att nollställa utsträckningsflaggan stöds inte på %s"
+
+#: misc/chattr.c:221 misc/chattr.c:240
+#, c-format
+msgid "Flags of %s set as "
+msgstr "Flaggor på %s satta som "
+
+#: misc/chattr.c:249
#, c-format
msgid "while setting flags on %s"
msgstr "vid sättning av flaggor på %s"
-#: misc/chattr.c:239
+#: misc/chattr.c:257
#, c-format
msgid "Version of %s set as %lu\n"
msgstr "Version av %s satt som %lu\n"
-#: misc/chattr.c:243
+#: misc/chattr.c:261
#, c-format
msgid "while setting version on %s"
msgstr "vid sättning av version på %s"
-#: misc/chattr.c:263
+#: misc/chattr.c:281
#, c-format
msgid "Couldn't allocate path variable in chattr_dir_proc"
msgstr "Kunde inte allokera sökvägsvariabel i chattr_dir_proc"
-#: misc/chattr.c:302
+#: misc/chattr.c:320
msgid "= is incompatible with - and +\n"
msgstr "= är inkompatibelt med - och +\n"
-#: misc/chattr.c:310
+#: misc/chattr.c:328
msgid "Must use '-v', =, - or +\n"
msgstr "Måste använda \"-v\", =, - eller +\n"
@@ -3382,32 +3338,32 @@ msgstr " Fria block: "
msgid " Free inodes: "
msgstr " Fria inoder: "
-#: misc/dumpe2fs.c:264
+#: misc/dumpe2fs.c:268
msgid "while printing bad block list"
msgstr "vid utskrift av lista över dåliga block"
-#: misc/dumpe2fs.c:270
+#: misc/dumpe2fs.c:274
#, c-format
msgid "Bad blocks: %u"
msgstr "Dåliga block: %u"
-#: misc/dumpe2fs.c:292 misc/tune2fs.c:279
+#: misc/dumpe2fs.c:297 misc/tune2fs.c:281
msgid "while reading journal inode"
msgstr "vid läsning av journalinod"
-#: misc/dumpe2fs.c:295
+#: misc/dumpe2fs.c:300
msgid "Journal size: "
msgstr "Journalstorlek: "
-#: misc/dumpe2fs.c:319 misc/tune2fs.c:200
+#: misc/dumpe2fs.c:324 misc/tune2fs.c:202
msgid "while reading journal superblock"
msgstr "vid läsning av journalsuperblock"
-#: misc/dumpe2fs.c:327
+#: misc/dumpe2fs.c:332
msgid "Couldn't find journal superblock magic numbers"
msgstr "Kunde inte hitta journalsuperblockets magiska tal"
-#: misc/dumpe2fs.c:331
+#: misc/dumpe2fs.c:336
#, c-format
msgid ""
"\n"
@@ -3426,27 +3382,27 @@ msgstr ""
"Journalstart: %u\n"
"Journalens användarantal: %u\n"
-#: misc/dumpe2fs.c:344
+#: misc/dumpe2fs.c:349
#, c-format
msgid "Journal users: %s\n"
msgstr "Journalanvändare: %s\n"
-#: misc/dumpe2fs.c:360 misc/mke2fs.c:693 misc/tune2fs.c:868
+#: misc/dumpe2fs.c:365 misc/mke2fs.c:693 misc/tune2fs.c:872
#, c-format
msgid "Couldn't allocate memory to parse options!\n"
msgstr "Kunde inte allokera minne för att tolka flaggor!\n"
-#: misc/dumpe2fs.c:386
+#: misc/dumpe2fs.c:391
#, c-format
msgid "Invalid superblock parameter: %s\n"
msgstr "Ogiltig superblockparameter: %s\n"
-#: misc/dumpe2fs.c:401
+#: misc/dumpe2fs.c:406
#, c-format
msgid "Invalid blocksize parameter: %s\n"
msgstr "Ogiltig blockstorleksparameter: %s\n"
-#: misc/dumpe2fs.c:412
+#: misc/dumpe2fs.c:417
#, c-format
msgid ""
"\n"
@@ -3462,26 +3418,25 @@ msgstr ""
"\n"
"Felaktiga utökade flaggor angivna: %s\n"
"\n"
-"Utökade flaggor separeras med komman, och kan ta ett argument som avdelas "
-"med\n"
+"Utökade flaggor separeras med komman, och kan ta ett argument som avdelas med\n"
"\tett likhetstecken (\"=\").\n"
"\n"
"Giltiga utökade flaggor är:\n"
"\tsuperblock=<superblocknummer>\n"
"\tblocksize=<blockstorlek>\n"
-#: misc/dumpe2fs.c:471 misc/mke2fs.c:1355
+#: misc/dumpe2fs.c:476 misc/mke2fs.c:1355
#, c-format
msgid "\tUsing %s\n"
msgstr "\tAnvänder %s\n"
-#: misc/dumpe2fs.c:507 misc/e2image.c:674 misc/tune2fs.c:1518
-#: resize/main.c:311
+#: misc/dumpe2fs.c:512 misc/e2image.c:681 misc/tune2fs.c:1535
+#: resize/main.c:312
#, c-format
msgid "Couldn't find valid filesystem superblock.\n"
msgstr "Kunde inte hitta giltigt filsystemssuperblock.\n"
-#: misc/dumpe2fs.c:532
+#: misc/dumpe2fs.c:537
#, c-format
msgid ""
"\n"
@@ -3540,7 +3495,7 @@ msgstr "e2label: fel vid l
msgid "e2label: not an ext2 filesystem\n"
msgstr "e2label: inte ett ext2-filsystem\n"
-#: misc/e2label.c:96 misc/tune2fs.c:1653
+#: misc/e2label.c:96 misc/tune2fs.c:1670
#, c-format
msgid "Warning: label too long, truncating.\n"
msgstr "Varning: etikett för lång, avkortar.\n"
@@ -3555,7 +3510,7 @@ msgstr "e2label: kan inte s
msgid "e2label: error writing superblock\n"
msgstr "e2label: fel vid skrivning av superblock\n"
-#: misc/e2label.c:116 misc/tune2fs.c:541
+#: misc/e2label.c:116 misc/tune2fs.c:542
#, c-format
msgid "Usage: e2label device [newlabel]\n"
msgstr "Användning: e2label enhet [ny-etikett]\n"
@@ -3612,17 +3567,17 @@ msgstr "
msgid "Failed write %s\n"
msgstr "Misslyckades skriva %s\n"
-#: misc/fsck.c:347
+#: misc/fsck.c:343
#, c-format
msgid "WARNING: couldn't open %s: %s\n"
msgstr "VARNING: kunde inte öppna %s: %s\n"
-#: misc/fsck.c:357
+#: misc/fsck.c:353
#, c-format
msgid "WARNING: bad format on line %d of %s\n"
msgstr "VARNING: fel format på rad %d av %s\n"
-#: misc/fsck.c:372
+#: misc/fsck.c:368
msgid ""
"\a\a\aWARNING: Your /etc/fstab does not contain the fsck passno\n"
"\tfield. I will kludge around things for you, but you\n"
@@ -3634,37 +3589,37 @@ msgstr ""
"\tbör rätta din /etc/fstab-fil så snart du kan.\n"
"\n"
-#: misc/fsck.c:481
+#: misc/fsck.c:477
#, c-format
msgid "fsck: %s: not found\n"
msgstr "fsck: %s: inte funnen\n"
-#: misc/fsck.c:597
+#: misc/fsck.c:593
#, c-format
msgid "%s: wait: No more child process?!?\n"
msgstr "%s: wait: Inga fler barnprocesser?!?\n"
-#: misc/fsck.c:619
+#: misc/fsck.c:615
#, c-format
msgid "Warning... %s for device %s exited with signal %d.\n"
msgstr "Varning... %s för enhet %s avslutade med signal %d.\n"
-#: misc/fsck.c:625
+#: misc/fsck.c:621
#, c-format
msgid "%s %s: status is %x, should never happen.\n"
msgstr "%s %s: status är %x, skulle aldrig inträffa.\n"
-#: misc/fsck.c:664
+#: misc/fsck.c:660
#, c-format
msgid "Finished with %s (exit status %d)\n"
msgstr "Avslutade med %s (slutstatus %d)\n"
-#: misc/fsck.c:724
+#: misc/fsck.c:720
#, c-format
msgid "%s: Error %d while executing fsck.%s for %s\n"
msgstr "%s: Fel %d när fsck.%s kördes för %s\n"
-#: misc/fsck.c:745
+#: misc/fsck.c:741
msgid ""
"Either all or none of the filesystem types passed to -t must be prefixed\n"
"with 'no' or '!'.\n"
@@ -3672,46 +3627,39 @@ msgstr ""
"Antingen alla eller inga av filsystemstyperna som ges till -t måste ha\n"
"prefix \"no\" eller \"!\".\n"
-#: misc/fsck.c:764
+#: misc/fsck.c:760
msgid "Couldn't allocate memory for filesystem types\n"
msgstr "Kunde inte allokera minne för filsystemtyper\n"
-#: misc/fsck.c:887
+#: misc/fsck.c:883
#, c-format
-msgid ""
-"%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
-"number\n"
-msgstr ""
-"%s: hoppar över felaktig rad i /etc/fstab: bind-montering med fsck-"
-"passnummer som inte är noll\n"
+msgid "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number\n"
+msgstr "%s: hoppar över felaktig rad i /etc/fstab: bind-montering med fsck-passnummer som inte är noll\n"
-#: misc/fsck.c:914
+#: misc/fsck.c:910
#, c-format
msgid "fsck: cannot check %s: fsck.%s not found\n"
msgstr "fsck: kan inte kontrollera %s: fsck.%s finns inte\n"
-#: misc/fsck.c:970
+#: misc/fsck.c:966
msgid "Checking all file systems.\n"
msgstr "Kontrollerar alla filsystem.\n"
-#: misc/fsck.c:1061
+#: misc/fsck.c:1057
#, c-format
msgid "--waiting-- (pass %d)\n"
msgstr "--väntar-- (pass %d)\n"
-#: misc/fsck.c:1081
-msgid ""
-"Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
-msgstr ""
-"Användning: fsck [-AMNPRTV] [ -C [ fh ] ] [-t fstyp] [fs-flaggor] "
-"[filsys ...]\n"
+#: misc/fsck.c:1077
+msgid "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
+msgstr "Användning: fsck [-AMNPRTV] [ -C [ fh ] ] [-t fstyp] [fs-flaggor] [filsys ...]\n"
-#: misc/fsck.c:1123
+#: misc/fsck.c:1119
#, c-format
msgid "%s: too many devices\n"
msgstr "%s: för många enheter\n"
-#: misc/fsck.c:1156 misc/fsck.c:1242
+#: misc/fsck.c:1152 misc/fsck.c:1238
#, c-format
msgid "%s: too many arguments\n"
msgstr "%s: för många argument\n"
@@ -3732,7 +3680,7 @@ msgid "While reading version on %s"
msgstr "Vid läsning av version på %s"
#: misc/mke2fs.c:104
-#, fuzzy, c-format
+#, c-format
msgid ""
"Usage: %s [-c|-l filename] [-b block-size] [-f fragment-size]\n"
"\t[-i bytes-per-inode] [-I inode-size] [-J journal-options]\n"
@@ -3748,7 +3696,7 @@ msgstr ""
"\t[-m reservade-block-procent] [-o skapar-os]\n"
"\t[-g block-per-grupp] [-L volymetikett] [-M senast-monterad-katalog]\n"
"\t[-O funktion[,...]] [-r fs-revision] [-E utökad-flagga[,...]]\n"
-"\t[-T fs-typ] [-jnqvFSV] enhet [blockantal]\n"
+"\t[-T fs-typ] [-U UUID] [-jnqvFSV] enhet [blockantal]\n"
#: misc/mke2fs.c:206
#, c-format
@@ -3961,8 +3909,7 @@ msgstr "Ogiltig storleks
#: misc/mke2fs.c:762
#, c-format
msgid "The resize maximum must be greater than the filesystem size.\n"
-msgstr ""
-"Storleksändringens maximum måste vara större än filsystemets storlek.\n"
+msgstr "Storleksändringens maximum måste vara större än filsystemets storlek.\n"
#: misc/mke2fs.c:786
#, c-format
@@ -3989,8 +3936,7 @@ msgstr ""
"\n"
"Felaktiga flaggor angivna: %s\n"
"\n"
-"Utökade flaggor separeras med komman, och kan ta ett argument som avdelas "
-"med\n"
+"Utökade flaggor separeras med komman, och kan ta ett argument som avdelas med\n"
"\tett likhetstecken (\"=\").\n"
"\n"
"Giltiga utökade flaggor är:\n"
@@ -4021,7 +3967,7 @@ msgstr ""
"Syntaxfel i mke2fs konfigurationsfil (%s, rad nr %d)\n"
"\t%s\n"
-#: misc/mke2fs.c:869 misc/tune2fs.c:353
+#: misc/mke2fs.c:869 misc/tune2fs.c:355
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr "Ogiltig filsystemsflagga satt: %s\n"
@@ -4044,48 +3990,48 @@ msgstr ""
"Du behöver förmodligen installera en uppdaterad mke2fs.conf-fil.\n"
"\n"
-#: misc/mke2fs.c:1177
+#: misc/mke2fs.c:1176
#, c-format
msgid "invalid block size - %s"
msgstr "felaktig blockstorlek - %s"
-#: misc/mke2fs.c:1181
+#: misc/mke2fs.c:1180
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr "Varning: blockstorlek %d är inte användbar på de flesta system.\n"
-#: misc/mke2fs.c:1197
+#: misc/mke2fs.c:1196
#, c-format
msgid "invalid fragment size - %s"
msgstr "ogiltig fragmentstorlek - %s"
-#: misc/mke2fs.c:1203
+#: misc/mke2fs.c:1202
#, c-format
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr "Varning: fragment stöds inte. Ignorerar -f-flagga\n"
-#: misc/mke2fs.c:1210
+#: misc/mke2fs.c:1209
msgid "Illegal number for blocks per group"
msgstr "Ogiltigt antal för block per grupp"
-#: misc/mke2fs.c:1215
+#: misc/mke2fs.c:1214
msgid "blocks per group must be multiple of 8"
msgstr "block per grupp måste vara en multipel av 8"
-#: misc/mke2fs.c:1223
+#: misc/mke2fs.c:1222
msgid "Illegal number for flex_bg size"
msgstr "Felaktigt tal för flex_bg-storlek"
-#: misc/mke2fs.c:1229
+#: misc/mke2fs.c:1228
msgid "flex_bg size must be a power of 2"
msgstr "storlek på flex_bg måste vara en multipel av 2"
-#: misc/mke2fs.c:1239
+#: misc/mke2fs.c:1238
#, c-format
msgid "invalid inode ratio %s (min %d/max %d)"
msgstr "ogiltig inodsförhållande %s (min %d/max %d)"
-#: misc/mke2fs.c:1256
+#: misc/mke2fs.c:1255
msgid "in malloc for bad_blocks_filename"
msgstr "i malloc för bad_blocks_filename"
@@ -4109,7 +4055,7 @@ msgstr "ogiltig inodsstorlek - %s"
msgid "bad num inodes - %s"
msgstr "felaktigt antal inoder - %s"
-#: misc/mke2fs.c:1380 misc/mke2fs.c:2052
+#: misc/mke2fs.c:1380 misc/mke2fs.c:2068
#, c-format
msgid "while trying to open journal device %s\n"
msgstr "vid försök att öppna journalenhet %s\n"
@@ -4131,10 +4077,8 @@ msgstr "%d-byteblock f
#: misc/mke2fs.c:1405
#, c-format
-msgid ""
-"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
-msgstr ""
-"Varning: %d-byteblock för stort för systemet (max %d), tvingas fortsätta\n"
+msgid "Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
+msgstr "Varning: %d-byteblock för stort för systemet (max %d), tvingas fortsätta\n"
#: misc/mke2fs.c:1413
#, c-format
@@ -4156,7 +4100,7 @@ msgstr ""
"%s: Storlek på enhet %s är för stor för att uttryckas med 32 bitar\n"
"\tanvänder en blockstorlek på %d.\n"
-#: misc/mke2fs.c:1468 resize/main.c:371
+#: misc/mke2fs.c:1468 resize/main.c:374
msgid "while trying to determine filesystem size"
msgstr "vid försök att avgöra filsystemstorlek"
@@ -4189,26 +4133,26 @@ msgstr "Filsystem st
msgid "Failed to parse fs types list\n"
msgstr "Misslyckades tolka fs-typlista\n"
-#: misc/mke2fs.c:1542
+#: misc/mke2fs.c:1540
msgid "fs_types for mke2fs.conf resolution: "
msgstr "upplösning av fs_types för mke2fs.conf: "
-#: misc/mke2fs.c:1549
+#: misc/mke2fs.c:1547
#, c-format
msgid "Filesystem features not supported with revision 0 filesystems\n"
msgstr "Filsystemsfunktioner som inte stöds med revision 0-filsystem\n"
-#: misc/mke2fs.c:1556
+#: misc/mke2fs.c:1554
#, c-format
msgid "Sparse superblocks not supported with revision 0 filesystems\n"
msgstr "Glesa superblock stöds inte med revision 0-filsystem\n"
-#: misc/mke2fs.c:1568
+#: misc/mke2fs.c:1566
#, c-format
msgid "Journals not supported with revision 0 filesystems\n"
msgstr "Journaler stöds inte med revision 0-filsystem\n"
-#: misc/mke2fs.c:1586
+#: misc/mke2fs.c:1584
#, c-format
msgid ""
"The resize_inode and meta_bg features are not compatible.\n"
@@ -4217,41 +4161,38 @@ msgstr ""
"Egenskaperna resize_inode och meta_bg är inte kompatibla\n"
"De kan inte båda aktiveras samtidigt.\n"
-#: misc/mke2fs.c:1603
+#: misc/mke2fs.c:1601
msgid "while trying to determine hardware sector size"
msgstr "vid försök att avgöra hårdvarusektorstorlek"
-#: misc/mke2fs.c:1661
+#: misc/mke2fs.c:1658
msgid "reserved online resize blocks not supported on non-sparse filesystem"
-msgstr ""
-"reserverade block för storleksändring under drift stöds inte på icke-glesa "
-"filsystem"
+msgstr "reserverade block för storleksändring under drift stöds inte på icke-glesa filsystem"
-#: misc/mke2fs.c:1670
+#: misc/mke2fs.c:1667
msgid "blocks per group count out of range"
msgstr "antal block per grupp utanför giltigt intervall"
-#: misc/mke2fs.c:1685
+#: misc/mke2fs.c:1682
msgid "Flex_bg feature not enabled, so flex_bg size may not be specified"
-msgstr ""
-"Funktionen flex_gb är inte aktiverad, så fleg_bg-storleg kan inte anges"
+msgstr "Funktionen flex_gb är inte aktiverad, så fleg_bg-storleg kan inte anges"
-#: misc/mke2fs.c:1697
+#: misc/mke2fs.c:1694
#, c-format
msgid "invalid inode size %d (min %d/max %d)"
msgstr "ogiltig inodstorlek %d (min %d/max %d)"
-#: misc/mke2fs.c:1711
+#: misc/mke2fs.c:1708
#, c-format
msgid "too many inodes (%llu), raise inode ratio?"
msgstr "för många inoder (%llu), öka inodsförhållandet?"
-#: misc/mke2fs.c:1716
+#: misc/mke2fs.c:1713
#, c-format
msgid "too many inodes (%llu), specify < 2^32 inodes"
msgstr "för många inoder (%llu), ange < 2^32 inoder"
-#: misc/mke2fs.c:1731
+#: misc/mke2fs.c:1728
#, c-format
msgid ""
"inode_size (%u) * inodes_count (%u) too big for a\n"
@@ -4262,12 +4203,16 @@ msgstr ""
"\tfilsystem med %lu block, ange högre inodsförhållande (-i)\n"
"\teller lägre inodantal (-N).\n"
-#: misc/mke2fs.c:1828 misc/tune2fs.c:1462
+#: misc/mke2fs.c:1821 misc/tune2fs.c:1453
+msgid "Couldn't allocate memory for tdb filename\n"
+msgstr "Kunde inte allokera minne för tdb-filnamn\n"
+
+#: misc/mke2fs.c:1834 misc/tune2fs.c:1475
#, c-format
msgid "while trying to delete %s"
msgstr "vid försök att ta bort %s"
-#: misc/mke2fs.c:1837
+#: misc/mke2fs.c:1844
#, c-format
msgid ""
"Overwriting existing filesystem; this can be undone using the command:\n"
@@ -4278,40 +4223,40 @@ msgstr ""
" e2undo %s %s\n"
"\n"
-#: misc/mke2fs.c:1885
+#: misc/mke2fs.c:1893
msgid "while setting up superblock"
msgstr "vid uppsättning av superblock"
-#: misc/mke2fs.c:1936
+#: misc/mke2fs.c:1952
#, c-format
msgid "unknown os - %s"
msgstr "okänt os - %s"
-#: misc/mke2fs.c:1990
+#: misc/mke2fs.c:2006
msgid "while trying to allocate filesystem tables"
msgstr "vid försök att allokera filsystemstabeller"
-#: misc/mke2fs.c:2021
+#: misc/mke2fs.c:2037
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr "vid nollställning av block %u vid slutet av filsystem"
-#: misc/mke2fs.c:2034
+#: misc/mke2fs.c:2050
msgid "while reserving blocks for online resize"
msgstr "vid reservation av block för storleksändring under drift"
# "En" för att detta sätts in i annan sträng där det föregås av "a".
# Även "filsystem" kan sättas in på samma plats. Felrapporterat.
-#: misc/mke2fs.c:2045 misc/tune2fs.c:477
+#: misc/mke2fs.c:2061 misc/tune2fs.c:479
msgid "journal"
msgstr "en journal"
-#: misc/mke2fs.c:2057
+#: misc/mke2fs.c:2073
#, c-format
msgid "Adding journal to device %s: "
msgstr "Lägger till journal till enhet %s: "
-#: misc/mke2fs.c:2064
+#: misc/mke2fs.c:2080
#, c-format
msgid ""
"\n"
@@ -4320,22 +4265,27 @@ msgstr ""
"\n"
"\tvid försök att lägga till journal till enhet %s"
-#: misc/mke2fs.c:2069 misc/mke2fs.c:2095 misc/tune2fs.c:506 misc/tune2fs.c:520
+#: misc/mke2fs.c:2085 misc/mke2fs.c:2117 misc/tune2fs.c:508 misc/tune2fs.c:522
#, c-format
msgid "done\n"
msgstr "klar\n"
-#: misc/mke2fs.c:2083
+#: misc/mke2fs.c:2094
+#, c-format
+msgid "Skipping journal creation in super-only mode\n"
+msgstr "Hoppar över att skapa jornal i läget endast super\n"
+
+#: misc/mke2fs.c:2105
#, c-format
msgid "Creating journal (%u blocks): "
msgstr "Skapar journal (%u block): "
-#: misc/mke2fs.c:2100
+#: misc/mke2fs.c:2122
#, c-format
msgid "Writing superblocks and filesystem accounting information: "
msgstr "Skriver superblock och filsystemsbokföringsinformation: "
-#: misc/mke2fs.c:2105
+#: misc/mke2fs.c:2127
#, c-format
msgid ""
"\n"
@@ -4344,7 +4294,7 @@ msgstr ""
"\n"
"Varning, hade problem att skriva ut superblock."
-#: misc/mke2fs.c:2108
+#: misc/mke2fs.c:2130
#, c-format
msgid ""
"done\n"
@@ -4397,7 +4347,7 @@ msgstr "%s: h=%3d s=%3d c=%4d start=%8d storlek=%8lu slut=%8d\n"
msgid "Please run e2fsck on the filesystem.\n"
msgstr "Kör e2fsck på filsystemet.\n"
-#: misc/tune2fs.c:103
+#: misc/tune2fs.c:105
#, c-format
msgid ""
"Usage: %s [-c max_mounts_count] [-e errors_behavior] [-g group]\n"
@@ -4416,59 +4366,59 @@ msgstr ""
"\t[-E utökad-flagga[,...]] [-T senaste_kontrolltid] [-U UUID]\n"
"\t[ -I ny_inodstorlek ] enhet\n"
-#: misc/tune2fs.c:188
+#: misc/tune2fs.c:190
msgid "while trying to open external journal"
msgstr "vid försök att öppna extern journal"
-#: misc/tune2fs.c:192
+#: misc/tune2fs.c:194
#, c-format
msgid "%s is not a journal device.\n"
msgstr "%s är inte en journalenhet.\n"
-#: misc/tune2fs.c:207
+#: misc/tune2fs.c:209
msgid "Journal superblock not found!\n"
msgstr "Journalsuperblock inte funnet!\n"
-#: misc/tune2fs.c:219
+#: misc/tune2fs.c:221
msgid "Filesystem's UUID not found on journal device.\n"
msgstr "Filsystems UUID inte funnet på journalenhet.\n"
-#: misc/tune2fs.c:240
+#: misc/tune2fs.c:242
msgid "Journal NOT removed\n"
msgstr "Journal INTE borttagen\n"
-#: misc/tune2fs.c:246
+#: misc/tune2fs.c:248
msgid "Journal removed\n"
msgstr "Journal borttagen\n"
-#: misc/tune2fs.c:286
+#: misc/tune2fs.c:288
msgid "while reading bitmaps"
msgstr "vid läsning av bitkartor"
-#: misc/tune2fs.c:294
+#: misc/tune2fs.c:296
msgid "while clearing journal inode"
msgstr "vid nollställning av journalinod"
-#: misc/tune2fs.c:305
+#: misc/tune2fs.c:307
msgid "while writing journal inode"
msgstr "vid skrivning av journalinod"
-#: misc/tune2fs.c:320
+#: misc/tune2fs.c:322
#, c-format
msgid "Invalid mount option set: %s\n"
msgstr "Ogiltig monteringsflagga satt: %s\n"
-#: misc/tune2fs.c:356
+#: misc/tune2fs.c:358
#, c-format
msgid "Clearing filesystem feature '%s' not supported.\n"
msgstr "Nollställning av filsystemsfunktion \"%s\" stöds inte.\n"
-#: misc/tune2fs.c:362
+#: misc/tune2fs.c:364
#, c-format
msgid "Setting filesystem feature '%s' not supported.\n"
msgstr "Att sätta filsystemsfunktion \"%s\" stöds inte.\n"
-#: misc/tune2fs.c:371
+#: misc/tune2fs.c:373
msgid ""
"The has_journal feature may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
@@ -4476,7 +4426,7 @@ msgstr ""
"Flaggan has_journal får endast nollställas när filsystemet är\n"
"omonterat eller monterat enbart för läsning.\n"
-#: misc/tune2fs.c:379
+#: misc/tune2fs.c:381
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
@@ -4484,7 +4434,7 @@ msgstr ""
"Flaggan needs_recovery är satt. Kör e2fsck före flaggan has_journal\n"
"nollställs.\n"
-#: misc/tune2fs.c:412
+#: misc/tune2fs.c:414
msgid ""
"Clearing the flex_bg flag would cause the the filesystem to be\n"
"inconsistent.\n"
@@ -4492,7 +4442,7 @@ msgstr ""
"Att nollställa flaggan flex_bg skulle få filsystemet att bli\n"
"inkonsistent.\n"
-#: misc/tune2fs.c:423
+#: misc/tune2fs.c:425
msgid ""
"The huge_file feature may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
@@ -4500,16 +4450,16 @@ msgstr ""
"Flaggan huge_file får endast nollställas när filsystemet är\n"
"omonterat eller monterat enbart för läsning.\n"
-#: misc/tune2fs.c:451
+#: misc/tune2fs.c:453
#, c-format
msgid "(and reboot afterwards!)\n"
msgstr "(och starta om efteråt!)\n"
-#: misc/tune2fs.c:472
+#: misc/tune2fs.c:474
msgid "The filesystem already has a journal.\n"
msgstr "Filsystemet har redan en journal.\n"
-#: misc/tune2fs.c:490
+#: misc/tune2fs.c:492
#, c-format
msgid ""
"\n"
@@ -4518,21 +4468,21 @@ msgstr ""
"\n"
"\tvid försök att öppna journal på %s\n"
-#: misc/tune2fs.c:494
+#: misc/tune2fs.c:496
#, c-format
msgid "Creating journal on device %s: "
msgstr "Skapar journal på enhet %s: "
-#: misc/tune2fs.c:502
+#: misc/tune2fs.c:504
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr "vid tillägg av filsystem till journal på %s"
-#: misc/tune2fs.c:508
+#: misc/tune2fs.c:510
msgid "Creating journal inode: "
msgstr "Skapar journalinod: "
-#: misc/tune2fs.c:517
+#: misc/tune2fs.c:519
msgid ""
"\n"
"\twhile trying to create journal file"
@@ -4540,85 +4490,85 @@ msgstr ""
"\n"
"\tvid försök att skapa journalfil"
-#: misc/tune2fs.c:584
+#: misc/tune2fs.c:585
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr "Kunde inte tolka datum-/tidsangivelse: %s"
-#: misc/tune2fs.c:608 misc/tune2fs.c:621
+#: misc/tune2fs.c:609 misc/tune2fs.c:622
#, c-format
msgid "bad mounts count - %s"
msgstr "felaktigt antal monteringar - %s"
-#: misc/tune2fs.c:637
+#: misc/tune2fs.c:638
#, c-format
msgid "bad error behavior - %s"
msgstr "felaktigt felbeteende - %s"
-#: misc/tune2fs.c:664
+#: misc/tune2fs.c:665
#, c-format
msgid "bad gid/group name - %s"
msgstr "felaktigt gid/gruppnamn - %s"
-#: misc/tune2fs.c:697
+#: misc/tune2fs.c:698
#, c-format
msgid "bad interval - %s"
msgstr "felaktigt intervall - %s"
-#: misc/tune2fs.c:725
+#: misc/tune2fs.c:727
#, c-format
msgid "bad reserved block ratio - %s"
msgstr "felaktig andel reserverade block - %s"
-#: misc/tune2fs.c:740
+#: misc/tune2fs.c:742
msgid "-o may only be specified once"
msgstr "-o får endast anges en gång"
-#: misc/tune2fs.c:750
+#: misc/tune2fs.c:752
msgid "-O may only be specified once"
msgstr "-O får endast anges en gång"
-#: misc/tune2fs.c:760
+#: misc/tune2fs.c:762
#, c-format
msgid "bad reserved blocks count - %s"
msgstr "felaktigt antal reserverade block - %s"
-#: misc/tune2fs.c:789
+#: misc/tune2fs.c:791
#, c-format
msgid "bad uid/user name - %s"
msgstr "felagtigt uid/användarnamn - %s"
-#: misc/tune2fs.c:806
+#: misc/tune2fs.c:808
#, c-format
msgid "bad inode size - %s"
msgstr "felaktig inodsstorlek - %s"
-#: misc/tune2fs.c:813
+#: misc/tune2fs.c:815
#, c-format
msgid "Inode size must be a power of two- %s"
msgstr "Inodsstorlek måste vara en multipel av två- %s"
-#: misc/tune2fs.c:900
+#: misc/tune2fs.c:904
#, c-format
msgid "Invalid RAID stride: %s\n"
msgstr "Ogiltig RAID-kliv: %s\n"
-#: misc/tune2fs.c:915
+#: misc/tune2fs.c:919
#, c-format
msgid "Invalid RAID stripe-width: %s\n"
msgstr "Ogiltig RAID-remsbredd: %s\n"
-#: misc/tune2fs.c:930
+#: misc/tune2fs.c:934
#, c-format
msgid "Invalid hash algorithm: %s\n"
msgstr "Ogiltig hash-algoritm: %s\n"
-#: misc/tune2fs.c:936
+#: misc/tune2fs.c:940
#, c-format
msgid "Setting default hash algorithm to %s (%d)\n"
msgstr "Sätter standardhashalgoritm till %s (%d)\n"
-#: misc/tune2fs.c:944
+#: misc/tune2fs.c:948
#, c-format
msgid ""
"\n"
@@ -4637,8 +4587,7 @@ msgstr ""
"\n"
"Felaktiga flaggor angivna.\n"
"\n"
-"Utökade flaggor separeras med komman, och kan ta ett argument som avdelas "
-"med\n"
+"Utökade flaggor separeras med komman, och kan ta ett argument som avdelas med\n"
"\tett likhetstecken (\"=\").\n"
"\n"
"Giltiga utökade flaggor är:\n"
@@ -4648,72 +4597,72 @@ msgstr ""
"\ttest_fs\n"
"\t^test_fs\n"
-#: misc/tune2fs.c:1384 misc/tune2fs.c:1389 resize/resize2fs.c:760
+#: misc/tune2fs.c:1388 misc/tune2fs.c:1393 resize/resize2fs.c:790
msgid "blocks to be moved"
msgstr "block att flytta"
-#: misc/tune2fs.c:1471
-#, fuzzy, c-format
+#: misc/tune2fs.c:1485
+#, c-format
msgid ""
"To undo the tune2fs operation please run the command\n"
" e2undo %s %s\n"
"\n"
msgstr ""
-"För att göra tune2fs-operationer ogjorda, kör kommandot\n"
+"För att göra tune2fs-operationen ogjord, kör kommandot\n"
" e2undo %s %s\n"
"\n"
-#: misc/tune2fs.c:1529
+#: misc/tune2fs.c:1546
#, c-format
-msgid "The inode size is already %d\n"
-msgstr "Inodsstorleken är redan %d\n"
+msgid "The inode size is already %lu\n"
+msgstr "Inodsstorleken är redan %lu\n"
-#: misc/tune2fs.c:1534
+#: misc/tune2fs.c:1551
#, c-format
msgid "Shrinking the inode size is not supported\n"
msgstr "Att krympa inodsstorleken stöds inte.\n"
-#: misc/tune2fs.c:1577
+#: misc/tune2fs.c:1594
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr "Sätter max antal monteringar till %d\n"
-#: misc/tune2fs.c:1583
+#: misc/tune2fs.c:1600
#, c-format
msgid "Setting current mount count to %d\n"
msgstr "Sätter aktuellt antal monteringar till %d\n"
-#: misc/tune2fs.c:1588
+#: misc/tune2fs.c:1605
#, c-format
msgid "Setting error behavior to %d\n"
msgstr "Sätter felbeteende till %d\n"
-#: misc/tune2fs.c:1593
+#: misc/tune2fs.c:1610
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr "Sätter gid för reserverade block till %lu\n"
-#: misc/tune2fs.c:1598
+#: misc/tune2fs.c:1615
#, c-format
msgid "Setting interval between checks to %lu seconds\n"
msgstr "Sätter intervall mellan kontroller till %lu sekunder\n"
-#: misc/tune2fs.c:1605
+#: misc/tune2fs.c:1622
#, c-format
msgid "Setting reserved blocks percentage to %g%% (%u blocks)\n"
msgstr "Sätter procent reserverade block till %g%% (%u block)\n"
-#: misc/tune2fs.c:1612
+#: misc/tune2fs.c:1629
#, c-format
msgid "reserved blocks count is too big (%lu)"
msgstr "antal reserverade block för stort (%lu)"
-#: misc/tune2fs.c:1618
+#: misc/tune2fs.c:1635
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr "Sätter antal reserverade block till %lu\n"
-#: misc/tune2fs.c:1624
+#: misc/tune2fs.c:1641
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
@@ -4721,7 +4670,7 @@ msgstr ""
"\n"
"Filsystemet har redan glesa superblock.\n"
-#: misc/tune2fs.c:1631
+#: misc/tune2fs.c:1648
#, c-format
msgid ""
"\n"
@@ -4730,7 +4679,7 @@ msgstr ""
"\n"
"Flaggan för glesa superblock satt. %s"
-#: misc/tune2fs.c:1636
+#: misc/tune2fs.c:1653
msgid ""
"\n"
"Clearing the sparse superflag not supported.\n"
@@ -4738,31 +4687,33 @@ msgstr ""
"\n"
"Nollställning av superflaggan gles stöds inte.\n"
-#: misc/tune2fs.c:1643
+#: misc/tune2fs.c:1660
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr "Sätter tidpunkt för senaste filsystemskontroll till %s\n"
-#: misc/tune2fs.c:1649
+#: misc/tune2fs.c:1666
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr "Sätter uid för reserverade block till %lu\n"
-#: misc/tune2fs.c:1700
+#: misc/tune2fs.c:1717
msgid "Invalid UUID format\n"
msgstr "Ogiltigt UUID-format\n"
-#: misc/tune2fs.c:1712
+#: misc/tune2fs.c:1729
msgid "The inode size may only be changed when the filesystem is unmounted.\n"
msgstr "Inodsstorleken får endast ändras när filsystemet är omonterat.\n"
-#: misc/tune2fs.c:1719
+#: misc/tune2fs.c:1736
msgid ""
"Changing the inode size not supported for filesystems with the flex_bg\n"
"feature enabled.\n"
msgstr ""
+"Att ändra inodsstorlek stöds inte för filsystem med funktionen flex_bg\n"
+"aktiverad.\n"
-#: misc/tune2fs.c:1731
+#: misc/tune2fs.c:1748
msgid ""
"Error in resizing the inode size.\n"
"Run e2undo to undo the file system changes. \n"
@@ -4770,17 +4721,17 @@ msgstr ""
"Fel när storleken på inoder ändrades.\n"
"Kör e2undo för att göra filsystemsändringarna ogjorda. \n"
-#: misc/tune2fs.c:1735
+#: misc/tune2fs.c:1752
#, c-format
msgid "Setting inode size %lu\n"
msgstr "Sätter inodsstorlek till %lu\n"
-#: misc/tune2fs.c:1745
+#: misc/tune2fs.c:1762
#, c-format
msgid "Setting stride size to %d\n"
msgstr "Sätter klivstorlek till %d\n"
-#: misc/tune2fs.c:1750
+#: misc/tune2fs.c:1767
#, c-format
msgid "Setting stripe width to %d\n"
msgstr "Sätter remsbredd till %d\n"
@@ -4921,8 +4872,7 @@ msgid ""
"Usage: %s [-d debug_flags] [-f] [-F] [-M] [-P] [-p] device [new_size]\n"
"\n"
msgstr ""
-"Användning: %s [-d felsökningflaggor] [-f] [-F] [-M] [-P] [-p] enhet "
-"[ny_storlek]\n"
+"Användning: %s [-d felsökningflaggor] [-f] [-F] [-M] [-P] [-p] enhet [ny_storlek]\n"
"\n"
#: resize/main.c:64
@@ -4954,17 +4904,17 @@ msgstr "Ok
msgid "Begin pass %d (max = %lu)\n"
msgstr "Börja pass %d (max = %lu)\n"
-#: resize/main.c:264
+#: resize/main.c:265
#, c-format
msgid "while opening %s"
msgstr "när %s öppnades"
-#: resize/main.c:276
+#: resize/main.c:277
#, c-format
msgid "while getting stat information for %s"
msgstr "när statusinformation för %s hämtades"
-#: resize/main.c:337
+#: resize/main.c:338
#, c-format
msgid ""
"%s: The combination of flex_bg and\n"
@@ -4973,21 +4923,26 @@ msgstr ""
"%s: Kombinationen av funktionerna flex_bg och\n"
"\t!resize_inode stöds inte av resize2fs.\n"
-#: resize/main.c:345
+#: resize/main.c:348
#, c-format
msgid "Estimated minimum size of the filesystem: %u\n"
msgstr "Uppskattad minsta storlek på filsystemet: %u\n"
-#: resize/main.c:381
-#, fuzzy, c-format
+#: resize/main.c:384
+#, c-format
msgid "Invalid new size: %s\n"
-msgstr "ogiltig inodsstorlek - %s"
+msgstr "Ogiltig ny storlek: %s\n"
+
+#: resize/main.c:396
+#, c-format
+msgid "New size smaller than minimum (%u)\n"
+msgstr "Ny storlek mindre än minimum (%u)\n"
-#: resize/main.c:394
+#: resize/main.c:402
msgid "Invalid stride length"
msgstr "Ogiltig stride-längd"
-#: resize/main.c:418
+#: resize/main.c:426
#, c-format
msgid ""
"The containing partition (or device) is only %u (%dk) blocks.\n"
@@ -4998,7 +4953,7 @@ msgstr ""
"De begärde en ny storlek på %u block.\n"
"\n"
-#: resize/main.c:425
+#: resize/main.c:433
#, c-format
msgid ""
"The filesystem is already %u blocks long. Nothing to do!\n"
@@ -5007,7 +4962,7 @@ msgstr ""
"Filsystemet är redan %u block långt. Inget behöver göras!\n"
"\n"
-#: resize/main.c:436
+#: resize/main.c:444
#, c-format
msgid ""
"Please run 'e2fsck -f %s' first.\n"
@@ -5016,12 +4971,26 @@ msgstr ""
"Kör \"e2fsck -f %s\" först.\n"
"\n"
-#: resize/main.c:447
+#: resize/main.c:448
+#, c-format
+msgid "Resizing the filesystem on %s to %u (%dk) blocks.\n"
+msgstr "Ändrar storlek på filsystemet på %s till %u (%d k) block.\n"
+
+#: resize/main.c:457
#, c-format
msgid "while trying to resize %s"
msgstr "vid försök att ändra storlek på %s"
-#: resize/main.c:452
+#: resize/main.c:460
+#, c-format
+msgid ""
+"Please run 'e2fsck -fy %s' to fix the filesystem\n"
+"after the aborted resize operation.\n"
+msgstr ""
+"Kör \"e2fsck -fy %s\" för att laga filsystemet\n"
+"efter den avbrutna storleksändringen.\n"
+
+#: resize/main.c:466
#, c-format
msgid ""
"The filesystem on %s is now %u blocks long.\n"
@@ -5030,6 +4999,11 @@ msgstr ""
"Filsystemet på %s är nu %u block långt.\n"
"\n"
+#: resize/main.c:481
+#, c-format
+msgid "while trying to truncate %s"
+msgstr "vid försök att korta av %s"
+
#: resize/online.c:37
#, c-format
msgid "Filesystem at %s is mounted on %s; on-line resizing required\n"
@@ -5077,36 +5051,23 @@ msgstr "Vid f
#: resize/online.c:191
#, c-format
-msgid ""
-"Filesystem at %s is mounted on %s, and on-line resizing is not supported on "
-"this system.\n"
-msgstr ""
-"Filsystemet på %s är monterat på %s, och storleksändring on-line stöds inte "
-"på detta system.\n"
+msgid "Filesystem at %s is mounted on %s, and on-line resizing is not supported on this system.\n"
+msgstr "Filsystemet på %s är monterat på %s, och storleksändring on-line stöds inte på detta system.\n"
-#: resize/resize2fs.c:322
+#: resize/resize2fs.c:350
#, c-format
msgid "inodes (%llu) must be less than %u"
msgstr "inoder (%llu) måste vara mindre än %u"
-#: resize/resize2fs.c:755
+#: resize/resize2fs.c:582
msgid "reserved blocks"
msgstr "reserverade block"
-#: resize/resize2fs.c:765
+#: resize/resize2fs.c:795
msgid "meta-data blocks"
msgstr "metadatablock"
-#: resize/resize2fs.c:1703
+#: resize/resize2fs.c:1752
#, c-format
msgid "Should never happen: resize inode corrupt!\n"
msgstr "Skulle aldrig inträffa: storleksändringsinoden trasig!\n"
-
-#~ msgid "@S doesn't have has_ at j flag, but has ext3 @j %s.\n"
-#~ msgstr "superblock har inte har-journal-flagga, men har ext3-journal %s.\n"
-
-#~ msgid "Error while deleting extent: %m\n"
-#~ msgstr "Fel vid radering av utsträckning: %m\n"
-
-#~ msgid "Recreate journal to make the filesystem ext3 again?\n"
-#~ msgstr "Återskapa journal för att göra filsystemet till ext3 igen?\n"
diff --git a/po/vi.gmo b/po/vi.gmo
index 329c814..72a3681 100644
Binary files a/po/vi.gmo and b/po/vi.gmo differ
diff --git a/po/vi.po b/po/vi.po
index b0f8327..137f1c8 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,7 +1,7 @@
# Vietnamese translation for e2fsprogs.
-# Copyright © 2008 Theodore Tso (msgids)
+# Copyright © 2009 Theodore Tso (msgids)
# This file is distributed under the same license as the e2fsprogs package.
-# Clytie Siddall <clytie at riverland.net.au>, 2006-2008.
+# Clytie Siddall <clytie at riverland.net.au>, 2006-2009.
#
#. The strings in e2fsck's problem.c can be very hard to translate,
#. since the strings are expanded in two different ways. First of all,
@@ -63,17 +63,17 @@
#.
msgid ""
msgstr ""
-"Project-Id-Version: e2fsprogs 1.41.1\n"
+"Project-Id-Version: e2fsprogs 1.41.8\n"
"Report-Msgid-Bugs-To: tytso at alum.mit.edu\n"
-"POT-Creation-Date: 2009-01-26 20:41-0500\n"
-"PO-Revision-Date: 2008-09-06 16:35+0930\n"
+"POT-Creation-Date: 2009-07-11 17:49-0400\n"
+"PO-Revision-Date: 2009-09-18 23:30+0930\n"
"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN at googlegroups.com>\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=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.7b3\n"
+"X-Generator: LocFactoryEditor 1.8\n"
#: e2fsck/badblocks.c:22 misc/mke2fs.c:165
#, c-format
@@ -89,10 +89,10 @@ msgid "while reading the bad blocks inode"
msgstr "trong khi Ä‘á»c nút thông tin khối há»ng"
#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:1037 e2fsck/unix.c:1120 misc/badblocks.c:1148
-#: misc/badblocks.c:1156 misc/badblocks.c:1170 misc/badblocks.c:1182
-#: misc/dumpe2fs.c:505 misc/e2image.c:576 misc/e2image.c:672
-#: misc/e2image.c:688 misc/mke2fs.c:181 misc/tune2fs.c:1515 resize/main.c:309
+#: e2fsck/unix.c:1057 e2fsck/unix.c:1140 misc/badblocks.c:1155
+#: misc/badblocks.c:1163 misc/badblocks.c:1177 misc/badblocks.c:1189
+#: misc/dumpe2fs.c:510 misc/e2image.c:583 misc/e2image.c:679
+#: misc/e2image.c:695 misc/mke2fs.c:181 misc/tune2fs.c:1532 resize/main.c:310
#, c-format
msgid "while trying to open %s"
msgstr "trong khi thỠmở %s"
@@ -113,8 +113,7 @@ msgstr "trong khi cáºp nháºt nút thông tin khối há»ng"
#: e2fsck/badblocks.c:130
#, c-format
msgid "Warning: illegal block %u found in bad block inode. Cleared.\n"
-msgstr ""
-"Cảnh báo : tìm thấy khối cấm %u trong nút thông tin khối há»ng nên bị xoá.\n"
+msgstr "Cảnh báo : tìm thấy khối cấm %u trong nút thông tin khối há»ng nên bị xoá.\n"
#: e2fsck/ehandler.c:54
#, c-format
@@ -191,21 +190,21 @@ msgstr ""
"[KÄN: các khối đệm nút thông tin]\n"
"\n"
-#: e2fsck/iscan.c:83 e2fsck/unix.c:818
+#: e2fsck/iscan.c:83 e2fsck/unix.c:817
#, c-format
msgid "while opening %s for flushing"
msgstr "trong khi mở %s để xoá sạch"
-#: e2fsck/iscan.c:88 e2fsck/unix.c:824 resize/main.c:285
+#: e2fsck/iscan.c:88 e2fsck/unix.c:823 resize/main.c:286
#, c-format
msgid "while trying to flush %s"
msgstr "trong khi thỠxoá sạch %s"
-#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:482
+#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:489
msgid "while opening inode scan"
msgstr "trong khi mở việc quét nút thông tin"
-#: e2fsck/iscan.c:129 misc/e2image.c:500
+#: e2fsck/iscan.c:129 misc/e2image.c:507
msgid "while getting next inode"
msgstr "trong khi lấy nút thông tin kế tiếp"
@@ -228,17 +227,17 @@ msgstr "%s: không tìm thấy siêu khối nháºt ký hợp lệ\n"
msgid "%s: journal too short\n"
msgstr "%s: nháºt ký quá ngắn\n"
-#: e2fsck/journal.c:858
+#: e2fsck/journal.c:860
#, c-format
msgid "%s: recovering journal\n"
msgstr "%s: Ä‘ang phục hồi nháºt ký\n"
-#: e2fsck/journal.c:860
+#: e2fsck/journal.c:862
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
msgstr "%s: sẽ không phục hồi nháºt ký trong khi có tình trạng chỉ Ä‘á»c\n"
-#: e2fsck/journal.c:881
+#: e2fsck/journal.c:887
#, c-format
msgid "while trying to re-open %s"
msgstr "trong khi thỠmở lại %s"
@@ -443,30 +442,30 @@ msgstr "ổ cắm"
msgid "unknown file type with mode 0%o"
msgstr "kiểu táºp tin không rõ vá»›i chế Ä‘á»™ 0%o"
-#: e2fsck/pass1b.c:215
+#: e2fsck/pass1b.c:220
msgid "multiply claimed inode map"
msgstr "sơ đồ nút thông tin đa tuyên bố"
-#: e2fsck/pass1b.c:567 e2fsck/pass1b.c:700
+#: e2fsck/pass1b.c:581 e2fsck/pass1b.c:714
#, c-format
msgid "internal error: can't find dup_blk for %u\n"
msgstr "lỗi nội bộ : không tìm thấy khối trùng (dup_blk) cho %u\n"
-#: e2fsck/pass1b.c:743
+#: e2fsck/pass1b.c:757
msgid "returned from clone_file_block"
msgstr "đã trả lại từ khối táºp tin nhái (clone_file_block)"
-#: e2fsck/pass1b.c:762
+#: e2fsck/pass1b.c:776
#, c-format
msgid "internal error: couldn't lookup EA block record for %u"
msgstr "lỗi nội bộ : không thể tra tìm mục ghi khối EA cho %u"
-#: e2fsck/pass1b.c:774
+#: e2fsck/pass1b.c:788
#, c-format
msgid "internal error: couldn't lookup EA inode record for %u"
msgstr "lỗi nội bộ : không thể tra tìm mục ghi nút thông tin EA cho %u"
-#: e2fsck/pass1.c:430 e2fsck/pass2.c:780
+#: e2fsck/pass1.c:430 e2fsck/pass2.c:782
msgid "reading directory block"
msgstr "Ä‘ang Ä‘á»c khối thÆ° mục"
@@ -494,39 +493,39 @@ msgstr "đang mở bản quét nút thông tin"
msgid "getting next inode from scan"
msgstr "đang lấy nút thông tin kế tiếp từ bản quét"
-#: e2fsck/pass1.c:1122
+#: e2fsck/pass1.c:1123
msgid "Pass 1"
msgstr "Lần qua 1"
-#: e2fsck/pass1.c:1181
+#: e2fsck/pass1.c:1180
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr "Ä‘ang Ä‘á»c khối gián tiếp của nút thông tin %u"
-#: e2fsck/pass1.c:1225
+#: e2fsck/pass1.c:1224
msgid "bad inode map"
msgstr "sơ đồ nút thông tin sai"
-#: e2fsck/pass1.c:1247
+#: e2fsck/pass1.c:1246
msgid "inode in bad block map"
msgstr "nút thông tin trong sơ đồ khối sai"
-#: e2fsck/pass1.c:1267
+#: e2fsck/pass1.c:1266
msgid "imagic inode map"
msgstr "sÆ¡ đồ nút thông tin ma thuáºt imagic"
-#: e2fsck/pass1.c:1294
+#: e2fsck/pass1.c:1293
msgid "multiply claimed block map"
msgstr "sơ đồ khối đa tuyên bố"
-#: e2fsck/pass1.c:1393
+#: e2fsck/pass1.c:1392
msgid "ext attr block map"
msgstr "sÆ¡ đồ khối ext attr (thuá»™c tÃnh thêm?)"
#: e2fsck/pass1.c:2134
-#, fuzzy, c-format
+#, c-format
msgid "%6lu(%c): expecting %6lu got phys %6lu (blkcnt %lld)\n"
-msgstr "%6lu: mong đợi %6lu còn nháºn %6lu váºt lý (đếm khối %lld)\n"
+msgstr "%6lu (%c): mong đợi %6lu còn nháºn %6lu váºt lý (đếm khối %lld)\n"
#: e2fsck/pass1.c:2449
msgid "block bitmap"
@@ -540,35 +539,35 @@ msgstr "mảng ảnh nút thông tin"
msgid "inode table"
msgstr "bảng nút thông tin"
-#: e2fsck/pass2.c:284
+#: e2fsck/pass2.c:283
msgid "Pass 2"
msgstr "Lần qua 2"
-#: e2fsck/pass2.c:803
+#: e2fsck/pass2.c:805
msgid "Can not continue."
msgstr "Không thể tiếp tục."
-#: e2fsck/pass3.c:79
+#: e2fsck/pass3.c:76
msgid "inode done bitmap"
msgstr "mảng ảnh nút thông tin hoà n tất"
-#: e2fsck/pass3.c:90
+#: e2fsck/pass3.c:84
msgid "Peak memory"
msgstr "Bộ nhớ cao điểm"
-#: e2fsck/pass3.c:146
+#: e2fsck/pass3.c:134
msgid "Pass 3"
msgstr "Lần qua 3"
-#: e2fsck/pass3.c:334
+#: e2fsck/pass3.c:320
msgid "inode loop detection bitmap"
msgstr "mảng ảnh phát hiện vòng lặp nút thông tin"
-#: e2fsck/pass4.c:196
+#: e2fsck/pass4.c:191
msgid "Pass 4"
msgstr "Lần qua 4"
-#: e2fsck/pass5.c:70
+#: e2fsck/pass5.c:64
msgid "Pass 5"
msgstr "Lần qua 5"
@@ -862,9 +861,9 @@ msgstr "Hurd không há»— trợ tÃnh năng kiểu táºp tin.\n"
#. @-expanded: superblock has an invalid journal (inode %i).\n
#: e2fsck/problem.c:187
-#, fuzzy, c-format
+#, c-format
msgid "@S has an @n @j (@i %i).\n"
-msgstr "@S có một @j ext3 @n (@i %i).\n"
+msgstr "@S có một @n @j (@i %i).\n"
#. @-expanded: External journal has multiple filesystem users (unsupported).\n
#: e2fsck/problem.c:192
@@ -891,109 +890,91 @@ msgstr "@j bên ngoà i không hỗ trợ @f nà y\n"
#. @-expanded: format.\n
#. @-expanded: It is also possible the journal superblock is corrupt.\n
#: e2fsck/problem.c:212
-#, fuzzy
msgid ""
"@f @j @S is unknown type %N (unsupported).\n"
-"It is likely that your copy of e2fsck is old and/or doesn't support this @j "
-"format.\n"
+"It is likely that your copy of e2fsck is old and/or doesn't support this @j format.\n"
"It is also possible the @j @S is corrupt.\n"
msgstr ""
-"@S @j ext3 có kiểu lạ %N (không được hỗ trợ).\n"
-"Rất có thể là bạn có một bản sao e2fsck cũ mà /hay không hỗ trợ định dạng @j "
-"nà y.\n"
-"It is also possible the @S @j is corrupt.\n"
+"@S @j @f có kiểu lạ %N (không được hỗ trợ).\n"
+"Rất có thể là bạn có một bản sao e2fsck cũ mà /hay không hỗ trợ định dạng @j nà y.\n"
+"CÅ©ng có thể là @S @j bị há»ng.\n"
#. @-expanded: journal superblock is corrupt.\n
#: e2fsck/problem.c:220
-#, fuzzy
msgid "@j @S is corrupt.\n"
-msgstr "@S @j ext3 bị há»ng.\n"
+msgstr "@S @j bị há»ng.\n"
#. @-expanded: superblock has_journal flag is clear, but a journal %s is present.\n
#: e2fsck/problem.c:225
-#, fuzzy, c-format
+#, c-format
msgid "@S has_ at j flag is clear, but a @j %s is present.\n"
-msgstr "CỠphục hồi ext3 là rõ, còn @j có dữ liệu.\n"
+msgstr "CỠ@S has_ at j vẫn tốt, mà cũng có một @j %s.\n"
#. @-expanded: superblock needs_recovery flag is set, but no journal is present.\n
#: e2fsck/problem.c:230
-#, fuzzy
msgid "@S needs_recovery flag is set, but no @j is present.\n"
-msgstr "@S đặt cỠext3 needs_recovery, còn không có @j.\n"
+msgstr "@S đặt cỠneeds_recovery, còn không có @j.\n"
#. @-expanded: superblock needs_recovery flag is clear, but journal has data.\n
#: e2fsck/problem.c:235
-#, fuzzy
msgid "@S needs_recovery flag is clear, but @j has data.\n"
-msgstr "CỠphục hồi ext3 là rõ, còn @j có dữ liệu.\n"
+msgstr "CỠ@S needs_recovery vẫn tốt, còn @j có dữ liệu.\n"
#. @-expanded: Clear journal
#: e2fsck/problem.c:240
msgid "Clear @j"
msgstr "Xoá sạch @j"
-#. @-expanded: Run journal anyway
-#: e2fsck/problem.c:245
-msgid "Run @j anyway"
-msgstr "Vẫn chạy @j"
-
-#. @-expanded: Recovery flag not set in backup superblock, so running journal anyway.\n
-#: e2fsck/problem.c:250
-msgid "Recovery flag not set in backup @S, so running @j anyway.\n"
-msgstr "Chưa đặt cỠphục hồi trong @S dự trữ nên vẫn chạy @j.\n"
+#. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem.
+#: e2fsck/problem.c:245 e2fsck/problem.c:647
+msgid "@f has feature flag(s) set, but is a revision 0 @f. "
+msgstr "@f đặt (các) cá» tÃnh năng, còn là @f bản sá»a đổi 0."
#. @-expanded: %s orphaned inode %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n
-#: e2fsck/problem.c:255
+#: e2fsck/problem.c:250
msgid "%s @o @i %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n"
msgstr "@i @o %s %i (uid=%Iu, gid=%Ig, chế độ=%Im, cỡ=%Is)\n"
#. @-expanded: illegal block #%B (%b) found in orphaned inode %i.\n
-#: e2fsck/problem.c:260
+#: e2fsck/problem.c:255
msgid "@I @b #%B (%b) found in @o @i %i.\n"
msgstr "@b @I #%B (%b) tìm thấy trong @i @o %i.\n"
#. @-expanded: Already cleared block #%B (%b) found in orphaned inode %i.\n
-#: e2fsck/problem.c:265
+#: e2fsck/problem.c:260
msgid "Already cleared @b #%B (%b) found in @o @i %i.\n"
msgstr "Äã xoá sạch @b #%B (%b) được tìm trong @i @o %i.\n"
#. @-expanded: illegal orphaned inode %i in superblock.\n
-#: e2fsck/problem.c:270
+#: e2fsck/problem.c:265
#, c-format
msgid "@I @o @i %i in @S.\n"
msgstr "@i @o %i @l trong @S.\n"
#. @-expanded: illegal inode %i in orphaned inode list.\n
-#: e2fsck/problem.c:275
+#: e2fsck/problem.c:270
#, c-format
msgid "@I @i %i in @o @i list.\n"
msgstr "@I @i %i in @o @i list.\n"
-#. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem.
-#: e2fsck/problem.c:280 e2fsck/problem.c:647
-msgid "@f has feature flag(s) set, but is a revision 0 @f. "
-msgstr "@f đặt (các) cá» tÃnh năng, còn là @f bản sá»a đổi 0."
-
#. @-expanded: journal superblock has an unknown read-only feature flag set.\n
-#: e2fsck/problem.c:285
-#, fuzzy
+#: e2fsck/problem.c:275
msgid "@j @S has an unknown read-only feature flag set.\n"
-msgstr "@S @j ext3 đặt má»™t cá» tÃnh năng chỉ Ä‘á»c lạ.\n"
+msgstr "@S @j đặt má»™t cá» tÃnh năng chỉ Ä‘á»c không rõ.\n"
#. @-expanded: journal superblock has an unknown incompatible feature flag set.\n
-#: e2fsck/problem.c:290
-#, fuzzy
+#: e2fsck/problem.c:280
msgid "@j @S has an unknown incompatible feature flag set.\n"
-msgstr "@S @j ext3 đặt má»™t cá» tÃnh năng không tÆ°Æ¡ng thÃch lạ.\n"
+msgstr "@S @j đặt má»™t cá» tÃnh năng không tÆ°Æ¡ng thÃch không rõ.\n"
#. @-expanded: journal version not supported by this e2fsck.\n
-#: e2fsck/problem.c:295
+#: e2fsck/problem.c:285
msgid "@j version not supported by this e2fsck.\n"
msgstr "Phiên bản @j không hỗ trợ trong e2fsck nà y.\n"
#. @-expanded: Moving journal from /%s to hidden inode.\n
#. @-expanded: \n
-#: e2fsck/problem.c:300
+#: e2fsck/problem.c:290
#, c-format
msgid ""
"Moving @j from /%s to hidden @i.\n"
@@ -1004,7 +985,7 @@ msgstr ""
#. @-expanded: Error moving journal: %m\n
#. @-expanded: \n
-#: e2fsck/problem.c:305
+#: e2fsck/problem.c:295
#, c-format
msgid ""
"Error moving @j: %m\n"
@@ -1016,7 +997,7 @@ msgstr ""
#. @-expanded: Found invalid V2 journal superblock fields (from V1 journal).\n
#. @-expanded: Clearing fields beyond the V1 journal superblock...\n
#. @-expanded: \n
-#: e2fsck/problem.c:310
+#: e2fsck/problem.c:300
msgid ""
"Found @n V2 @j @S fields (from V1 @j).\n"
"Clearing fields beyond the V1 @j @S...\n"
@@ -1026,6 +1007,16 @@ msgstr ""
"Äang xoá sạch các trÆ°á»ng nằm ở bên kia @S @j pb1...\n"
"\n"
+#. @-expanded: Run journal anyway
+#: e2fsck/problem.c:306
+msgid "Run @j anyway"
+msgstr "Vẫn chạy @j"
+
+#. @-expanded: Recovery flag not set in backup superblock, so running journal anyway.\n
+#: e2fsck/problem.c:311
+msgid "Recovery flag not set in backup @S, so running @j anyway.\n"
+msgstr "Chưa đặt cỠphục hồi trong @S dự trữ nên vẫn chạy @j.\n"
+
#. @-expanded: Backing up journal inode block information.\n
#. @-expanded: \n
#: e2fsck/problem.c:316
@@ -1117,7 +1108,7 @@ msgstr "Giao dịch nháºt ký %i bị há»ng nên hủy bá» tiến trình phá
#: e2fsck/problem.c:385
msgid "The test_fs flag is set (and ext4 is available). "
-msgstr ""
+msgstr "CỠ« test_fs » được đặt (và ext4 sẵn sà ng)"
#. @-expanded: Pass 1: Checking inodes, blocks, and sizes\n
#: e2fsck/problem.c:392
@@ -1280,8 +1271,7 @@ msgstr "@S chÃnh (%b) nằm trên danh sách các @b sai.\n"
#. @-expanded: Block %b in the primary group descriptors is on the bad block list\n
#: e2fsck/problem.c:524
msgid "Block %b in the primary @g descriptors is on the bad @b list\n"
-msgstr ""
-"Khối %b trong những mô tả @g chÃnh có nằm trong danh sách các @b sai.\n"
+msgstr "Khối %b trong những mô tả @g chÃnh có nằm trong danh sách các @b sai.\n"
#. @-expanded: Warning: Group %g's superblock (%b) is bad.\n
#: e2fsck/problem.c:530
@@ -1296,8 +1286,7 @@ msgstr "Cảnh báo : bản sao các mô tả @g của nhóm %g có một @b sai
#. @-expanded: Programming error? block #%b claimed for no reason in process_bad_block.\n
#: e2fsck/problem.c:541
msgid "Programming error? @b #%b claimed for no reason in process_bad_ at b.\n"
-msgstr ""
-"Lá»—i láºp trình ? @b %b được tuyên bố, không có lý do, trong process_bad_ at b\n"
+msgstr "Lá»—i láºp trình ? @b %b được tuyên bố, không có lý do, trong process_bad_ at b\n"
#. @-expanded: error allocating %N contiguous block(s) in block group %g for %s: %m\n
#: e2fsck/problem.c:547
@@ -1332,7 +1321,7 @@ msgid "Warning: could not write @b %b for %s: %m\n"
msgstr "Cảnh báo : không thể ghi @b %b cho %s: %m\n"
#. @-expanded: error allocating inode bitmap (%N): %m\n
-#: e2fsck/problem.c:577 e2fsck/problem.c:1378
+#: e2fsck/problem.c:577 e2fsck/problem.c:1383
msgid "@A @i @B (%N): %m\n"
msgstr "@A @B @i (%N): %m\n"
@@ -1568,21 +1557,21 @@ msgstr "@i %i có má»™t kÃch cỡ thêm (%IS) @n\n"
msgid "@a in @i %i has a namelen (%N) which is @n\n"
msgstr "@a trong @i %i có một namelen (%N) @n\n"
-#. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n
-#: e2fsck/problem.c:798
-msgid "@a in @i %i has a value size (%N) which is @n\n"
-msgstr "@a trong @i %i có má»™t kÃch cỡ giá trị (%N) @n\n"
-
#. @-expanded: extended attribute in inode %i has a value offset (%N) which is invalid\n
-#: e2fsck/problem.c:803
+#: e2fsck/problem.c:798
msgid "@a in @i %i has a value offset (%N) which is @n\n"
msgstr "@a trong @i %i có một hiệu giá trị (%N) @n\n"
#. @-expanded: extended attribute in inode %i has a value block (%N) which is invalid (must be 0)\n
-#: e2fsck/problem.c:808
+#: e2fsck/problem.c:803
msgid "@a in @i %i has a value @b (%N) which is @n (must be 0)\n"
msgstr "@a trong @i %i có một giá trị @b (%N) @n (phải là 0)\n"
+#. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n
+#: e2fsck/problem.c:808
+msgid "@a in @i %i has a value size (%N) which is @n\n"
+msgstr "@a trong @i %i có má»™t kÃch cỡ giá trị (%N) @n\n"
+
#. @-expanded: extended attribute in inode %i has a hash (%N) which is invalid\n
#: e2fsck/problem.c:813
msgid "@a in @i %i has a hash (%N) which is @n\n"
@@ -1606,6 +1595,8 @@ msgid ""
"Failed to iterate extents in @i %i\n"
"\t(op %s, blk %b, lblk %c): %m\n"
msgstr ""
+"Không lặp lại tầm trong @i %i\n"
+"\t(op %s, blk %b, lblk %c): %m\n"
#. @-expanded: inode %i has an invalid extent\n
#. @-expanded: \t(logical block %c, invalid physical block %b, len %N)\n
@@ -1637,8 +1628,7 @@ msgstr "@i %i đặt cỠEXTENTS_FL trên @f mà không hỗ trợ phạm vi.\n
#: e2fsck/problem.c:849
#, c-format
msgid "@i %i is in extent format, but @S is missing EXTENTS feature\n"
-msgstr ""
-"@i %i theo định dạng phạm vi, còn @S thiếu tÃnh năng phạm vi (EXTENTS)\n"
+msgstr "@i %i theo định dạng phạm vi, còn @S thiếu tÃnh năng phạm vi (EXTENTS)\n"
#. @-expanded: inode %i missing EXTENT_FL, but is in extents format\n
#: e2fsck/problem.c:854
@@ -1664,7 +1654,7 @@ msgstr ""
#. @-expanded: inode %i has an invalid extent node (blk %b, lblk %c)\n
#: e2fsck/problem.c:868
msgid "@i %i has an invalid extent node (blk %b, lblk %c)\n"
-msgstr ""
+msgstr "@i %i có một nút tầm không hợp lệ (blk %b, lblk %c)\n"
#. @-expanded: \n
#. @-expanded: Running additional passes to resolve blocks claimed by more than one inode...\n
@@ -1886,8 +1876,7 @@ msgstr "@e @d « . » trong @i @d %i không được chấm dứt bằng NULL (v
#: e2fsck/problem.c:1083
#, c-format
msgid "'..' @d @e in @d @i %i is not NULL terminated\n"
-msgstr ""
-"@e @d « .. » trong @i @d %i không được chấm dứt bằng NULL (vô giá trị)\n"
+msgstr "@e @d « .. » trong @i @d %i không được chấm dứt bằng NULL (vô giá trị)\n"
#. @-expanded: inode %i (%Q) is an illegal character device.\n
#: e2fsck/problem.c:1088
@@ -1909,7 +1898,7 @@ msgstr "@E là @e « . » trùng.\n"
msgid "@E is duplicate '..' @e.\n"
msgstr "@E là @e « .. » trùng.\n"
-#: e2fsck/problem.c:1108 e2fsck/problem.c:1403
+#: e2fsck/problem.c:1108 e2fsck/problem.c:1408
#, c-format
msgid "Internal error: couldn't find dir_info for %i.\n"
msgstr "Lỗi nội bộ : không tìm thấy thông tin thư mục (dir_info) vỠ%i.\n"
@@ -2101,103 +2090,105 @@ msgstr "Gặp @b bất thÆ°á»ng trong @h %d (%q).\n"
#. @-expanded: entry '%Dn' in %p (%i) references inode %Di in group %g where _INODE_UNINIT is set.\n
#: e2fsck/problem.c:1281
-#, fuzzy
msgid "@E references @i %Di in @g %g where _INODE_UNINIT is set.\n"
-msgstr "@i %i được tìm thấy trong @g %g mà đặt _INODE_UNINIT. "
+msgstr "@E tham chiếu đến @i %Di trong @g %g ở vị trà đặt _INODE_UNINIT.\n"
#. @-expanded: entry '%Dn' in %p (%i) references inode %Di found in group %g's unused inodes area.\n
#: e2fsck/problem.c:1286
-#, fuzzy
msgid "@E references @i %Di found in @g %g's unused inodes area.\n"
-msgstr ""
-"@i %i được tìm thấy trong vùng các nút thông tin không dùng của @g %g. "
+msgstr "@E tham chiếu đến @i %Di được tìm trong vùng nút thông tin không dùng của @g %g.\n"
+
+#. @-expanded: i_file_acl_hi for inode %i (%Q) is %N, should be zero.\n
+#: e2fsck/problem.c:1291
+msgid "i_file_acl_hi @F %N, @s zero.\n"
+msgstr "i_file_acl_hi @F %N, @s số không.\n"
#. @-expanded: Pass 3: Checking directory connectivity\n
-#: e2fsck/problem.c:1293
+#: e2fsck/problem.c:1298
msgid "Pass 3: Checking @d connectivity\n"
msgstr "Lần qua 3: đang kiểm tra khả năng kết nối của @d\n"
#. @-expanded: root inode not allocated.
-#: e2fsck/problem.c:1298
+#: e2fsck/problem.c:1303
msgid "@r not allocated. "
msgstr "Chưa cấp phát @r."
#. @-expanded: No room in lost+found directory.
-#: e2fsck/problem.c:1303
+#: e2fsck/problem.c:1308
msgid "No room in @l @d. "
msgstr "Không có chỗ còn rảnh trong @d @l."
#. @-expanded: Unconnected directory inode %i (%p)\n
-#: e2fsck/problem.c:1308
+#: e2fsck/problem.c:1313
#, c-format
msgid "Unconnected @d @i %i (%p)\n"
msgstr "@i @d %i không được kết nối (%p)\n"
#. @-expanded: /lost+found not found.
-#: e2fsck/problem.c:1313
+#: e2fsck/problem.c:1318
msgid "/@l not found. "
msgstr "/@l không tìm thấy."
#. @-expanded: '..' in %Q (%i) is %P (%j), should be %q (%d).\n
-#: e2fsck/problem.c:1318
+#: e2fsck/problem.c:1323
msgid "'..' in %Q (%i) is %P (%j), @s %q (%d).\n"
msgstr "« .. » trong %Q (%i) là %P (%j), @s %q (%d).\n"
#. @-expanded: Bad or non-existent /lost+found. Cannot reconnect.\n
-#: e2fsck/problem.c:1323
+#: e2fsck/problem.c:1328
msgid "Bad or non-existent /@l. Cannot reconnect.\n"
msgstr "Có /@l sai hay không tồn tại nên không thể kết nối lại.\n"
#. @-expanded: Could not expand /lost+found: %m\n
-#: e2fsck/problem.c:1328
+#: e2fsck/problem.c:1333
#, c-format
msgid "Could not expand /@l: %m\n"
msgstr "Không thể mở rộng /@l: %m\n"
-#: e2fsck/problem.c:1333
+#: e2fsck/problem.c:1338
#, c-format
msgid "Could not reconnect %i: %m\n"
msgstr "Không thể kết nối lại %i: %m\n"
#. @-expanded: Error while trying to find /lost+found: %m\n
-#: e2fsck/problem.c:1338
+#: e2fsck/problem.c:1343
#, c-format
msgid "Error while trying to find /@l: %m\n"
msgstr "Gặp lỗi khi thỠtìm /@l: %m\n"
#. @-expanded: ext2fs_new_block: %m while trying to create /lost+found directory\n
-#: e2fsck/problem.c:1343
+#: e2fsck/problem.c:1348
#, c-format
msgid "ext2fs_new_ at b: %m while trying to create /@l @d\n"
msgstr "ext2fs_new_ at b: %m trong khi thỠtạo @d /@l\n"
#. @-expanded: ext2fs_new_inode: %m while trying to create /lost+found directory\n
-#: e2fsck/problem.c:1348
+#: e2fsck/problem.c:1353
#, c-format
msgid "ext2fs_new_ at i: %m while trying to create /@l @d\n"
msgstr "ext2fs_new_ at i: %m trong khi thỠtạo @d /@l\n"
#. @-expanded: ext2fs_new_dir_block: %m while creating new directory block\n
-#: e2fsck/problem.c:1353
+#: e2fsck/problem.c:1358
#, c-format
msgid "ext2fs_new_dir_ at b: %m while creating new @d @b\n"
msgstr "ext2fs_new_dir_ at b: %m trong khi thỠtạo @b @d mới\n"
#. @-expanded: ext2fs_write_dir_block: %m while writing the directory block for /lost+found\n
-#: e2fsck/problem.c:1358
+#: e2fsck/problem.c:1363
#, c-format
msgid "ext2fs_write_dir_ at b: %m while writing the @d @b for /@l\n"
msgstr "ext2fs_write_dir_ at b: %m trong khi ghi @b @d cho /@l\n"
#. @-expanded: Error while adjusting inode count on inode %i\n
-#: e2fsck/problem.c:1363
+#: e2fsck/problem.c:1368
#, c-format
msgid "Error while adjusting @i count on @i %i\n"
msgstr "Gặp lá»—i khi Ä‘iá»u chỉnh số đếm @i trên @i %i\n"
#. @-expanded: Couldn't fix parent of inode %i: %m\n
#. @-expanded: \n
-#: e2fsck/problem.c:1368
+#: e2fsck/problem.c:1373
#, c-format
msgid ""
"Couldn't fix parent of @i %i: %m\n"
@@ -2208,7 +2199,7 @@ msgstr ""
#. @-expanded: Couldn't fix parent of inode %i: Couldn't find parent directory entry\n
#. @-expanded: \n
-#: e2fsck/problem.c:1373
+#: e2fsck/problem.c:1378
#, c-format
msgid ""
"Couldn't fix parent of @i %i: Couldn't find parent @d @e\n"
@@ -2218,76 +2209,75 @@ msgstr ""
"\n"
#. @-expanded: Error creating root directory (%s): %m\n
-#: e2fsck/problem.c:1383
+#: e2fsck/problem.c:1388
#, c-format
msgid "Error creating root @d (%s): %m\n"
msgstr "Gặp lỗi khi tạo @d gốc (%s): %m\n"
#. @-expanded: Error creating /lost+found directory (%s): %m\n
-#: e2fsck/problem.c:1388
+#: e2fsck/problem.c:1393
#, c-format
msgid "Error creating /@l @d (%s): %m\n"
msgstr "Gặp lỗi khi tạo @d /@l (%s): %m\n"
#. @-expanded: root inode is not a directory; aborting.\n
-#: e2fsck/problem.c:1393
+#: e2fsck/problem.c:1398
msgid "@r is not a @d; aborting.\n"
msgstr "@r không phải @d nên hủy bá».\n"
#. @-expanded: Cannot proceed without a root inode.\n
-#: e2fsck/problem.c:1398
+#: e2fsck/problem.c:1403
msgid "Cannot proceed without a @r.\n"
msgstr "Không thể tiếp tục khi không có @r.\n"
#. @-expanded: /lost+found is not a directory (ino=%i)\n
-#: e2fsck/problem.c:1408
+#: e2fsck/problem.c:1413
#, c-format
msgid "/@l is not a @d (ino=%i)\n"
msgstr "/@l không phải @d (ino=%i)\n"
-#: e2fsck/problem.c:1415
+#: e2fsck/problem.c:1420
msgid "Pass 3A: Optimizing directories\n"
msgstr "Lần qua 3A: đang tối ưu hoá các thư mục\n"
-#: e2fsck/problem.c:1420
-#, fuzzy, c-format
+#: e2fsck/problem.c:1425
+#, c-format
msgid "Failed to create dirs_to_hash iterator: %m\n"
-msgstr "Lỗi tạo bộ lặp lại thư mục tới băm (dirs_to_hash): %m"
+msgstr "Lỗi tạo bộ lặp lại thư mục tới băm (dirs_to_hash): %m\n"
-#: e2fsck/problem.c:1425
-#, fuzzy
+#: e2fsck/problem.c:1430
msgid "Failed to optimize directory %q (%d): %m\n"
-msgstr "Lỗi tối ưu hoá thư mục %q (%d): %m"
+msgstr "Lỗi tối ưu hoá thư mục %q (%d): %m\n"
-#: e2fsck/problem.c:1430
+#: e2fsck/problem.c:1435
msgid "Optimizing directories: "
msgstr "Äang tối Æ°u hoá các thÆ° mục: "
-#: e2fsck/problem.c:1447
+#: e2fsck/problem.c:1452
msgid "Pass 4: Checking reference counts\n"
msgstr "Lần qua 4: đang kiểm tra các số đếm tham chiếu\n"
#. @-expanded: unattached zero-length inode %i.
-#: e2fsck/problem.c:1452
+#: e2fsck/problem.c:1457
#, c-format
msgid "@u @z @i %i. "
msgstr "@i @u @z %i. "
#. @-expanded: unattached inode %i\n
-#: e2fsck/problem.c:1457
+#: e2fsck/problem.c:1462
#, c-format
msgid "@u @i %i\n"
msgstr "@i @u %i\n"
#. @-expanded: inode %i ref count is %Il, should be %N.
-#: e2fsck/problem.c:1462
+#: e2fsck/problem.c:1467
msgid "@i %i ref count is %Il, @s %N. "
msgstr "@i %i có số đếm tham chiếu %Il, @s %N. "
#. @-expanded: WARNING: PROGRAMMING BUG IN E2FSCK!\n
#. @-expanded: \tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n
#. @-expanded: inode_link_info[%i] is %N, inode.i_links_count is %Il. They should be the same!\n
-#: e2fsck/problem.c:1466
+#: e2fsck/problem.c:1471
msgid ""
"WARNING: PROGRAMMING BUG IN E2FSCK!\n"
"\tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n"
@@ -2298,87 +2288,77 @@ msgstr ""
"@i_link_info[%i] là %N, @i.i_links_count là %Il: @s trùng.\n"
#. @-expanded: Pass 5: Checking group summary information\n
-#: e2fsck/problem.c:1476
+#: e2fsck/problem.c:1481
msgid "Pass 5: Checking @g summary information\n"
msgstr "Lần qua 5: đang kiểm tra thông tin tóm tắt nhóm\n"
#. @-expanded: Padding at end of inode bitmap is not set.
-#: e2fsck/problem.c:1481
+#: e2fsck/problem.c:1486
msgid "Padding at end of @i @B is not set. "
msgstr "Chưa đặt độ đệm tại kết thúc của @B @I."
#. @-expanded: Padding at end of block bitmap is not set.
-#: e2fsck/problem.c:1486
+#: e2fsck/problem.c:1491
msgid "Padding at end of @b @B is not set. "
msgstr "Chưa đặt độ đệm tại kết thúc của @B @b."
#. @-expanded: block bitmap differences:
-#: e2fsck/problem.c:1491
+#: e2fsck/problem.c:1496
msgid "@b @B differences: "
msgstr "Hiệu @B @b:"
#. @-expanded: inode bitmap differences:
-#: e2fsck/problem.c:1511
+#: e2fsck/problem.c:1516
msgid "@i @B differences: "
msgstr "Hiệu @B @i:"
#. @-expanded: Free inodes count wrong for group #%g (%i, counted=%j).\n
-#: e2fsck/problem.c:1531
+#: e2fsck/problem.c:1536
msgid "Free @is count wrong for @g #%g (%i, counted=%j).\n"
msgstr "Số đếm các @i rảnh không đúng cho @g #%g (%i, đã đếm=%j).\n"
#. @-expanded: Directories count wrong for group #%g (%i, counted=%j).\n
-#: e2fsck/problem.c:1536
+#: e2fsck/problem.c:1541
msgid "Directories count wrong for @g #%g (%i, counted=%j).\n"
msgstr "Số đếm các thư mục không đúng cho @g #%g (%i, đã đếm=%j).\n"
#. @-expanded: Free inodes count wrong (%i, counted=%j).\n
-#: e2fsck/problem.c:1541
+#: e2fsck/problem.c:1546
msgid "Free @is count wrong (%i, counted=%j).\n"
msgstr "Số đếm các @i rảnh không đúng (%i, đã đếm=%j).\n"
#. @-expanded: Free blocks count wrong for group #%g (%b, counted=%c).\n
-#: e2fsck/problem.c:1546
+#: e2fsck/problem.c:1551
msgid "Free @bs count wrong for @g #%g (%b, counted=%c).\n"
msgstr "Số đếm các @b rảnh không đúng cho @g #%g (%b, đã đếm=%c).\n"
#. @-expanded: Free blocks count wrong (%b, counted=%c).\n
-#: e2fsck/problem.c:1551
+#: e2fsck/problem.c:1556
msgid "Free @bs count wrong (%b, counted=%c).\n"
msgstr "Số đếm các @b rảnh không đúng (%b, đã đếm=%c).\n"
#. @-expanded: PROGRAMMING ERROR: filesystem (#%N) bitmap endpoints (%b, %c) don't match calculated bitmap
#. @-expanded: endpoints (%i, %j)\n
-#: e2fsck/problem.c:1556
-msgid ""
-"PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B "
-"endpoints (%i, %j)\n"
-msgstr ""
-"LỖI LẬP TRÌNH: trong @f (#%N) có các điểm cuối @B (%b, %c) không tương ứng "
-"vá»›i các Ä‘iểm cuối @B đã tÃnh (%i, %j)\n"
+#: e2fsck/problem.c:1561
+msgid "PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B endpoints (%i, %j)\n"
+msgstr "Lá»–I LẬP TRÃŒNH: trong @f (#%N) có các Ä‘iểm cuối @B (%b, %c) không tÆ°Æ¡ng ứng vá»›i các Ä‘iểm cuối @B đã tÃnh (%i, %j)\n"
-#: e2fsck/problem.c:1562
+#: e2fsck/problem.c:1567
msgid "Internal error: fudging end of bitmap (%N)\n"
msgstr "Lỗi nội bộ : đang là m quấy quá kết thúc của mảng ảnh (%N)\n"
#. @-expanded: Error copying in replacement inode bitmap: %m\n
-#: e2fsck/problem.c:1567
+#: e2fsck/problem.c:1572
#, c-format
msgid "Error copying in replacement @i @B: %m\n"
msgstr "Gặp lỗi khi sao chép và o @B @i thay thế: %m\n"
#. @-expanded: Error copying in replacement block bitmap: %m\n
-#: e2fsck/problem.c:1572
+#: e2fsck/problem.c:1577
#, c-format
msgid "Error copying in replacement @b @B: %m\n"
msgstr "Gặp lỗi khi sao chép và o @B @b thay thế: %m\n"
-#. @-expanded: Recreate journal
-#: e2fsck/problem.c:1597
-#, fuzzy
-msgid "Recreate @j"
-msgstr "Tạo lại"
-
#. @-expanded: group %g block(s) in use but group is marked BLOCK_UNINIT\n
#: e2fsck/problem.c:1602
#, c-format
@@ -2391,12 +2371,17 @@ msgstr "Các @b của @g %g đang được dùng, còn @g có nhãn là BLOCK_UN
msgid "@g %g @i(s) in use but @g is marked INODE_UNINIT\n"
msgstr "Các @i của @g %g đang được dùng, còn @g có nhãn là INODE_UNINIT\n"
-#: e2fsck/problem.c:1725
+#. @-expanded: Recreate journal
+#: e2fsck/problem.c:1614
+msgid "Recreate @j"
+msgstr "Tạo lại @j"
+
+#: e2fsck/problem.c:1732
#, c-format
msgid "Unhandled error code (0x%x)!\n"
msgstr "Mã lỗi chưa quản lý (0x%x)!\n"
-#: e2fsck/problem.c:1820
+#: e2fsck/problem.c:1827
msgid "IGNORED"
msgstr "BỊ BỎ QUA"
@@ -2421,8 +2406,7 @@ msgstr "trong khi chạy tiến trình quét nút thông tin"
#: e2fsck/super.c:187
#, c-format
msgid "while calling ext2fs_block_iterate for inode %d"
-msgstr ""
-"trong khi gá»i hà m lặp lại khối « ext2fs_block_iterate » cho nút thông tin %d"
+msgstr "trong khi gá»i hà m lặp lại khối « ext2fs_block_iterate » cho nút thông tin %d"
#: e2fsck/super.c:209
#, c-format
@@ -2460,8 +2444,7 @@ msgid ""
" -p Automatic repair (no questions)\n"
" -n Make no changes to the filesystem\n"
" -y Assume \"yes\" to all questions\n"
-" -c Check for bad blocks and add them to the badblock "
-"list\n"
+" -c Check for bad blocks and add them to the badblock list\n"
" -f Force checking even if filesystem is marked clean\n"
msgstr ""
"\n"
@@ -2470,8 +2453,7 @@ msgstr ""
" -n Không thay đổi hệ thống táºp tin\n"
" -y Giả sá» trả lá»i « Có » má»i câu há»i\n"
" -c Kiểm tra tìm khối sai: thêm và o danh sách khối sai\n"
-" -f Buá»™c kiểm tra ngay cả khi hệ thống táºp tin có nhãn là "
-"sạch\n"
+" -f Buá»™c kiểm tra ngay cả khi hệ thống táºp tin có nhãn là sạch\n"
#: e2fsck/unix.c:88
#, c-format
@@ -2505,8 +2487,8 @@ msgstr " số inode có khối ind/dind/tind: %u/%u/%u\n"
msgid " Extent depth histogram: "
msgstr " Äồ thị Ä‘á»™ sâu : "
-#: e2fsck/unix.c:207 misc/badblocks.c:916 misc/tune2fs.c:1567 misc/util.c:151
-#: resize/main.c:248
+#: e2fsck/unix.c:207 misc/badblocks.c:928 misc/tune2fs.c:1584 misc/util.c:151
+#: resize/main.c:249
#, c-format
msgid "while determining whether %s is mounted."
msgstr "trong khi quyết định nếu %s đã gắn kết chưa."
@@ -2643,17 +2625,17 @@ msgstr "Có thể xác định chỉ má»™t của những tùy chá»n -p/-a, -n v
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr "Tùy chá»n « -t » không được há»— trợ trong phiên bản e2fsck nà y.\n"
-#: e2fsck/unix.c:801 misc/tune2fs.c:549 misc/tune2fs.c:833 misc/tune2fs.c:850
+#: e2fsck/unix.c:801 misc/tune2fs.c:550 misc/tune2fs.c:835 misc/tune2fs.c:853
#, c-format
msgid "Unable to resolve '%s'"
msgstr "Không thể quyết định « %s »"
-#: e2fsck/unix.c:831
+#: e2fsck/unix.c:830
#, c-format
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
msgstr "Không cho phép sá» dụng đồng thá»i cả hai tùy chá»n « --c » và « --l/L ».\n"
-#: e2fsck/unix.c:879
+#: e2fsck/unix.c:878
#, c-format
msgid ""
"E2FSCK_JBD_DEBUG \"%s\" not an integer\n"
@@ -2662,7 +2644,7 @@ msgstr ""
"E2FSCK_JBD_DEBUG « %s » không phải số nguyên\n"
"\n"
-#: e2fsck/unix.c:888
+#: e2fsck/unix.c:887
#, c-format
msgid ""
"\n"
@@ -2673,38 +2655,43 @@ msgstr ""
"Äối số không thuá»™c số không hợp lệ đối vá»›i -%c (« %s »)\n"
"\n"
-#: e2fsck/unix.c:929
+#: e2fsck/unix.c:961
#, c-format
msgid "Error: ext2fs library version out of date!\n"
msgstr "Lỗi: phiên bản thư viện ext2fs quá cũ.\n"
-#: e2fsck/unix.c:937
+#: e2fsck/unix.c:969
msgid "while trying to initialize program"
msgstr "trong khi thỠsở khởi chương trình"
-#: e2fsck/unix.c:951
+#: e2fsck/unix.c:980
#, c-format
msgid "\tUsing %s, %s\n"
msgstr "\tDùng %s, %s\n"
-#: e2fsck/unix.c:963
+#: e2fsck/unix.c:992
msgid "need terminal for interactive repairs"
msgstr "cần thiết thiết bị cuối để sá»a chữa tÆ°Æ¡ng tác"
-#: e2fsck/unix.c:1010
+#: e2fsck/unix.c:1021
#, c-format
msgid "%s: %s trying backup blocks...\n"
msgstr "%s %s đang thỠcác khối dự trữ...\n"
-#: e2fsck/unix.c:1012
+#: e2fsck/unix.c:1023
msgid "Superblock invalid,"
msgstr "Siêu khối không hợp lệ,"
-#: e2fsck/unix.c:1013
+#: e2fsck/unix.c:1024
msgid "Group descriptors look bad..."
msgstr "Có vẻ là các mô tả nhóm sai..."
-#: e2fsck/unix.c:1040
+#: e2fsck/unix.c:1034
+#, c-format
+msgid "%s: going back to original superblock\n"
+msgstr "%s: đang trở vỠsiêu khối gốc\n"
+
+#: e2fsck/unix.c:1060
#, c-format
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
@@ -2715,30 +2702,27 @@ msgstr ""
"(hoặc siêu khối hệ thống táºp tin bị há»ng).\n"
"\n"
-#: e2fsck/unix.c:1046
+#: e2fsck/unix.c:1066
#, c-format
msgid "Could this be a zero-length partition?\n"
msgstr "Phân vùng nà y có thể có độ dà i bằng không ?\n"
-#: e2fsck/unix.c:1048
+#: e2fsck/unix.c:1068
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
-msgstr ""
-"Bạn phải có quyá»n truy cáºp %s và o hệ thống táºp tin, hoặc là ngÆ°á»i chủ "
-"(root)\n"
+msgstr "Bạn phải có quyá»n truy cáºp %s và o hệ thống táºp tin, hoặc là ngÆ°á»i chủ (root)\n"
-#: e2fsck/unix.c:1053
+#: e2fsck/unix.c:1073
#, c-format
msgid "Possibly non-existent or swap device?\n"
msgstr "Có thể là thiết bị không tồn tại, hoặc thiết bị trao đổi ?\n"
-#: e2fsck/unix.c:1055
+#: e2fsck/unix.c:1075
#, c-format
msgid "Filesystem mounted or opened exclusively by another program?\n"
-msgstr ""
-"Hệ thống táºp tin đã được gắn kết hay mở hoà n toà n bởi chÆ°Æ¡ng trình khác ?\n"
+msgstr "Hệ thống táºp tin đã được gắn kết hay mở hoà n toà n bởi chÆ°Æ¡ng trình khác ?\n"
-#: e2fsck/unix.c:1059
+#: e2fsck/unix.c:1079
#, c-format
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
@@ -2747,44 +2731,40 @@ msgstr ""
"ÄÄ©a bị chống ghi; hãy dùng tùy chá»n « -n » để chạy\n"
"việc kiểm tra chỉ Ä‘á»c trên thiết bị đó.\n"
-#: e2fsck/unix.c:1123
+#: e2fsck/unix.c:1143
msgid "Get a newer version of e2fsck!"
msgstr "Lấy phiên bản e2fsck mới hơn."
-#: e2fsck/unix.c:1147
+#: e2fsck/unix.c:1173
#, c-format
msgid "while checking ext3 journal for %s"
msgstr "trong khi kiểm tra nháºt ký ext3 tìm %s"
-#: e2fsck/unix.c:1158
+#: e2fsck/unix.c:1184
#, c-format
-msgid ""
-"Warning: skipping journal recovery because doing a read-only filesystem "
-"check.\n"
-msgstr ""
-"Cảnh báo : Ä‘ang bá» qua việc phục hồi nháºt ký vì Ä‘ang kiểm tra hệ thống táºp "
-"tin má»™t cách chỉ Ä‘á»c.\n"
+msgid "Warning: skipping journal recovery because doing a read-only filesystem check.\n"
+msgstr "Cảnh báo : Ä‘ang bá» qua việc phục hồi nháºt ký vì Ä‘ang kiểm tra hệ thống táºp tin má»™t cách chỉ Ä‘á»c.\n"
-#: e2fsck/unix.c:1171
+#: e2fsck/unix.c:1197
#, c-format
msgid "unable to set superblock flags on %s\n"
msgstr "không thể đặt cỠsiêu khối trên %s\n"
-#: e2fsck/unix.c:1177
+#: e2fsck/unix.c:1203
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr "trong khi phục hồi nháºt ký ext3 của %s"
-#: e2fsck/unix.c:1201
+#: e2fsck/unix.c:1228
#, c-format
msgid "%s has unsupported feature(s):"
msgstr "%s có tÃnh năng không được há»— trợ :"
-#: e2fsck/unix.c:1217
+#: e2fsck/unix.c:1244
msgid "Warning: compression support is experimental.\n"
msgstr "Cảnh báo : sự hỗ trợ khả năng nén là thực nghiệm.\n"
-#: e2fsck/unix.c:1222
+#: e2fsck/unix.c:1249
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
@@ -2793,26 +2773,25 @@ msgstr ""
"E2fsck không được biên dịch với khả năng hỗ trợ HCÂY,\n"
"nhÆ°ng hệ thống táºp tin %s có thÆ° mục HCÂY.\n"
-#: e2fsck/unix.c:1276
+#: e2fsck/unix.c:1302
msgid "while reading bad blocks inode"
msgstr "trong khi Ä‘á»c nút thông tin khối sai"
-#: e2fsck/unix.c:1278
+#: e2fsck/unix.c:1304
#, c-format
msgid "This doesn't bode well, but we'll try to go on...\n"
-msgstr ""
-"Äây không phải báo trÆ°á»›c Ä‘iá»m hay, nhÆ°ng tiến trình nà y sẽ thá» tiếp tục...\n"
+msgstr "Äây không phải báo trÆ°á»›c Ä‘iá»m hay, nhÆ°ng tiến trình nà y sẽ thá» tiếp tục...\n"
-#: e2fsck/unix.c:1304
+#: e2fsck/unix.c:1330
msgid "Couldn't determine journal size"
msgstr "Không thể quyết định kÃch cỡ nháºt ký"
-#: e2fsck/unix.c:1307
+#: e2fsck/unix.c:1333
#, c-format
msgid "Creating journal (%d blocks): "
msgstr "Äang tạo nháºt ký (%d khối): "
-#: e2fsck/unix.c:1314 misc/mke2fs.c:2091
+#: e2fsck/unix.c:1340 misc/mke2fs.c:2113
msgid ""
"\n"
"\twhile trying to create journal"
@@ -2820,12 +2799,12 @@ msgstr ""
"\n"
"trong khi thá» tạo nháºt ký"
-#: e2fsck/unix.c:1317
+#: e2fsck/unix.c:1343
#, c-format
msgid " Done.\n"
msgstr " Hoà n tất\n"
-#: e2fsck/unix.c:1318
+#: e2fsck/unix.c:1344
#, c-format
msgid ""
"\n"
@@ -2834,25 +2813,25 @@ msgstr ""
"\n"
"••• nháºt ký đã được tạo lại — hệ thống táºp tin lúc nà y là ext3 lại •••\n"
-#: e2fsck/unix.c:1325
+#: e2fsck/unix.c:1351
#, c-format
msgid "Restarting e2fsck from the beginning...\n"
msgstr "Äang khởi chạy lại hoà n toà n e2fsck...\n"
-#: e2fsck/unix.c:1329
+#: e2fsck/unix.c:1355
msgid "while resetting context"
msgstr "trong khi đặt lại ngữ cảnh"
-#: e2fsck/unix.c:1336
+#: e2fsck/unix.c:1362
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr "%s: e2fsck bị thôi.\n"
-#: e2fsck/unix.c:1341
+#: e2fsck/unix.c:1367
msgid "aborted"
msgstr "bị hủy bá»"
-#: e2fsck/unix.c:1353
+#: e2fsck/unix.c:1379
#, c-format
msgid ""
"\n"
@@ -2861,12 +2840,12 @@ msgstr ""
"\n"
"%s: ••••• HỆ THá»NG TẬP TIN BỊ SỬA Äá»”I •••••\n"
-#: e2fsck/unix.c:1356
+#: e2fsck/unix.c:1382
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr "%s: ••••• HÃY KHỞI ÄỘNG LẠI LINUX •••••\n"
-#: e2fsck/unix.c:1364
+#: e2fsck/unix.c:1390
#, c-format
msgid ""
"\n"
@@ -2877,7 +2856,7 @@ msgstr ""
"%s: •••••••••• CẢNH BÃO : hệ thống táºp tin vẫn còn có lá»—i ••••••••••\n"
"\n"
-#: e2fsck/unix.c:1400
+#: e2fsck/unix.c:1426
msgid "while setting block group checksum info"
msgstr "trong khi đặt thông tin tổng kiểm nhóm khối"
@@ -2975,37 +2954,37 @@ msgstr ""
"%s: MÂU THUẪN BẤT THƯỜNG : HÃY TỰ CHẠY fsck.\n"
"\t(tức là không có tùy chá»n « -a » hay « -p »).\n"
-#: e2fsck/util.c:336
+#: e2fsck/util.c:341
#, c-format
-msgid "Memory used: %dk/%dk (%dk/%dk), "
-msgstr "Bộ nhớ đã chiếm: %dk/%dk (%dk/%dk), "
+msgid "Memory used: %luk/%luk (%luk/%luk), "
+msgstr "Vùng nhớ được dùng: %luk/%luk (%luk/%luk), "
-#: e2fsck/util.c:340
+#: e2fsck/util.c:345
#, c-format
-msgid "Memory used: %d, "
-msgstr "Bộ nhớ đã chiếm: %d, "
+msgid "Memory used: %lu, "
+msgstr "Vùng nhớ được dùng: %lu, "
-#: e2fsck/util.c:346
+#: e2fsck/util.c:352
#, c-format
msgid "time: %5.2f/%5.2f/%5.2f\n"
msgstr "thá»i gian: %5.2f/%5.2f/%5.2f\n"
-#: e2fsck/util.c:351
+#: e2fsck/util.c:357
#, c-format
msgid "elapsed time: %6.3f\n"
msgstr "thá»i gian đã qua: %6.3f\n"
-#: e2fsck/util.c:385 e2fsck/util.c:399
+#: e2fsck/util.c:391 e2fsck/util.c:405
#, c-format
-msgid "while reading inode %ld in %s"
-msgstr "trong khi Ä‘á»c nút thông tin %ld trong %s"
+msgid "while reading inode %lu in %s"
+msgstr "trong khi Ä‘á»c nút thông tin %lu trong %s"
-#: e2fsck/util.c:413 e2fsck/util.c:426
+#: e2fsck/util.c:419 e2fsck/util.c:432
#, c-format
-msgid "while writing inode %ld in %s"
-msgstr "trong khi ghi nút thông tin %ld trong %s"
+msgid "while writing inode %lu in %s"
+msgstr "trong khi ghi nút thông tin %lu trong %s"
-#: e2fsck/util.c:575
+#: e2fsck/util.c:581
msgid "while allocating zeroizing buffer"
msgstr "trong khi cấp phát bộ đếm là m số không"
@@ -3017,8 +2996,7 @@ msgstr "hoà n tất \n"
#, c-format
msgid ""
"Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnf]\n"
-" [-c blocks_at_once] [-d delay_factor_between_reads] [-e "
-"max_bad_blocks]\n"
+" [-c blocks_at_once] [-d delay_factor_between_reads] [-e max_bad_blocks]\n"
" [-p num_passes] [-t test_pattern [-t test_pattern [...]]]\n"
" device [last_block [first_block]]\n"
msgstr ""
@@ -3039,77 +3017,77 @@ msgstr ""
#: misc/badblocks.c:202
#, c-format
msgid "%6.2f%% done, %s elapsed"
-msgstr ""
+msgstr "%6.2f%% hoà n tất, %s đã trôi qua"
-#: misc/badblocks.c:289
+#: misc/badblocks.c:293
msgid "Testing with random pattern: "
msgstr "Äang thá» ra bằng mẫu ngẫu nhiên: "
-#: misc/badblocks.c:307
+#: misc/badblocks.c:311
msgid "Testing with pattern 0x"
msgstr "Äang thá» ra bằng mẫu 0x"
-#: misc/badblocks.c:335 misc/badblocks.c:404
+#: misc/badblocks.c:339 misc/badblocks.c:408
msgid "during seek"
msgstr "trong khi tìm nơi"
-#: misc/badblocks.c:346
+#: misc/badblocks.c:350
#, c-format
msgid "Weird value (%ld) in do_read\n"
msgstr "Giá trị lạ (%ld) trong việc Ä‘á»c « do_read »\n"
-#: misc/badblocks.c:424
+#: misc/badblocks.c:428
msgid "during ext2fs_sync_device"
msgstr "trong khi đồng bộ hoá thiết bị « ext2fs_sync_device »"
-#: misc/badblocks.c:440 misc/badblocks.c:699
+#: misc/badblocks.c:447 misc/badblocks.c:711
msgid "while beginning bad block list iteration"
msgstr "trong khi bắt đầu lặp lại danh sách các khối sai"
-#: misc/badblocks.c:454 misc/badblocks.c:551 misc/badblocks.c:709
+#: misc/badblocks.c:461 misc/badblocks.c:563 misc/badblocks.c:721
msgid "while allocating buffers"
msgstr "trong khi cấp phát bộ đệm"
-#: misc/badblocks.c:458
+#: misc/badblocks.c:465
#, c-format
msgid "Checking blocks %lu to %lu\n"
msgstr "Äang kiểm tra khối trong phạm vi %lu đến %lu\n"
-#: misc/badblocks.c:463
+#: misc/badblocks.c:470
msgid "Checking for bad blocks in read-only mode\n"
msgstr "Äang kiểm tra tìm khối sai trong chế Ä‘á»™ chỉ Ä‘á»c\n"
-#: misc/badblocks.c:472
+#: misc/badblocks.c:479
msgid "Checking for bad blocks (read-only test): "
msgstr "Äang kiểm tra tìm khối sai (thá» ra chỉ Ä‘á»c): "
-#: misc/badblocks.c:480 misc/badblocks.c:583 misc/badblocks.c:628
-#: misc/badblocks.c:772
+#: misc/badblocks.c:487 misc/badblocks.c:595 misc/badblocks.c:640
+#: misc/badblocks.c:784
msgid "Too many bad blocks, aborting test\n"
msgstr "Quá nhiá»u khối sai nên hủy bá» phép thá»\n"
-#: misc/badblocks.c:558
+#: misc/badblocks.c:570
msgid "Checking for bad blocks in read-write mode\n"
msgstr "Äang kiểm tra tìm khối sai trong chế Ä‘á»™ Ä‘á»c-ghi\n"
-#: misc/badblocks.c:560 misc/badblocks.c:722
+#: misc/badblocks.c:572 misc/badblocks.c:734
#, c-format
msgid "From block %lu to %lu\n"
msgstr "Phạm vi khối %lu đến %lu\n"
-#: misc/badblocks.c:618
+#: misc/badblocks.c:630
msgid "Reading and comparing: "
msgstr "Äang Ä‘á»c và so sánh: "
-#: misc/badblocks.c:721
+#: misc/badblocks.c:733
msgid "Checking for bad blocks in non-destructive read-write mode\n"
msgstr "Äang kiểm tra tìm khối sai trong chế Ä‘á»™ Ä‘á»c-ghi không hủy\n"
-#: misc/badblocks.c:727
+#: misc/badblocks.c:739
msgid "Checking for bad blocks (non-destructive read-write test)\n"
msgstr "Äang kiểm tra tìm khối sai (thá» ra Ä‘á»c-ghi không hủy)\n"
-#: misc/badblocks.c:734
+#: misc/badblocks.c:746
msgid ""
"\n"
"Interrupt caught, cleaning up\n"
@@ -3117,60 +3095,54 @@ msgstr ""
"\n"
"Má»›i bắt tÃn hiệu ngắt nên là m sạch\n"
-#: misc/badblocks.c:810
+#: misc/badblocks.c:822
#, c-format
msgid "during test data write, block %lu"
msgstr "trong khi thỠra ghi dữ liệu, khối %lu"
-#: misc/badblocks.c:921 misc/util.c:156
+#: misc/badblocks.c:933 misc/util.c:156
#, c-format
msgid "%s is mounted; "
msgstr "%s đã gắn kết; "
-#: misc/badblocks.c:923
+#: misc/badblocks.c:935
msgid "badblocks forced anyway. Hope /etc/mtab is incorrect.\n"
msgstr ""
"tùy chá»n khối sai (badblocks) vẫn bị ép buá»™c.\n"
"Mong « /etc/mtab » không đúng.\n"
-#: misc/badblocks.c:928
+#: misc/badblocks.c:940
msgid "it's not safe to run badblocks!\n"
msgstr "Không an toà n khi chạy badblocks.\n"
-#: misc/badblocks.c:933 misc/util.c:167
+#: misc/badblocks.c:945 misc/util.c:167
#, c-format
msgid "%s is apparently in use by the system; "
msgstr "Có vẻ là %s đang bị hệ thống dùng; "
-#: misc/badblocks.c:936
+#: misc/badblocks.c:948
msgid "badblocks forced anyway.\n"
msgstr "vẫn ép buộc badblocks (khối sai).\n"
-#: misc/badblocks.c:956
+#: misc/badblocks.c:968
#, c-format
msgid "invalid %s - %s"
msgstr "%s không hợp lệ — %s"
-#: misc/badblocks.c:1015
-#, c-format
-msgid "bad block size - %s"
-msgstr "kÃch cỡ khối sai — %s"
-
-#: misc/badblocks.c:1070
+#: misc/badblocks.c:1077
#, c-format
msgid "can't allocate memory for test_pattern - %s"
msgstr "không thể cấp phát bộ nhớ cho mẫu thỠ(test_pattern) — %s"
-#: misc/badblocks.c:1097
+#: misc/badblocks.c:1104
msgid "Maximum of one test_pattern may be specified in read-only mode"
-msgstr ""
-"Trong chế Ä‘á»™ chỉ Ä‘á»c, có thể xác định tối Ä‘a má»™t mẫu thá» (test_pattern)"
+msgstr "Trong chế Ä‘á»™ chỉ Ä‘á»c, có thể xác định tối Ä‘a má»™t mẫu thá» (test_pattern)"
-#: misc/badblocks.c:1103
+#: misc/badblocks.c:1110
msgid "Random test_pattern is not allowed in read-only mode"
msgstr "Không cho phẹp mẫu thá» (test_pattern) ngẫu nhiên trong chế Ä‘á»™ chỉ Ä‘á»c"
-#: misc/badblocks.c:1117
+#: misc/badblocks.c:1124
msgid ""
"Couldn't determine device size; you must specify\n"
"the size manually\n"
@@ -3178,86 +3150,91 @@ msgstr ""
"Không thể quyết định kÃch cỡ của thiết bị;\n"
"bạn cần phải tá»± xác định kÃch cỡ đó.\n"
-#: misc/badblocks.c:1123
+#: misc/badblocks.c:1130
msgid "while trying to determine device size"
msgstr "trong khi thá» quyết định kÃch cỡ của thiết bị"
-#: misc/badblocks.c:1128
+#: misc/badblocks.c:1135
msgid "last block"
msgstr "khối cuối"
-#: misc/badblocks.c:1134
+#: misc/badblocks.c:1141
msgid "first block"
msgstr "khối đầu"
-#: misc/badblocks.c:1137
+#: misc/badblocks.c:1144
#, c-format
msgid "invalid starting block (%lu): must be less than %lu"
msgstr "khối đầu không hợp lệ (%lu): phải nhỠhơn %lu"
-#: misc/badblocks.c:1193
+#: misc/badblocks.c:1200
msgid "while creating in-memory bad blocks list"
msgstr "trong khi tạo danh sách các khối há»ng trong bá»™ nhá»›"
-#: misc/badblocks.c:1208
+#: misc/badblocks.c:1215
msgid "while adding to in-memory bad block list"
msgstr "trong khi thêm và o danh sách các khối há»ng trong bá»™ nhá»›"
-#: misc/badblocks.c:1232
+#: misc/badblocks.c:1239
#, c-format
msgid "Pass completed, %u bad blocks found.\n"
msgstr "Qua xong, tìm thấy %u khối sai.\n"
#: misc/chattr.c:85
#, c-format
-msgid "Usage: %s [-RVf] [-+=AacDdijsSu] [-v version] files...\n"
-msgstr "Sá» dụng: %s [-RVf] [-+=AacDdijsSu] [-v phiên_bản] táºp_tin...\n"
+msgid "Usage: %s [-RVf] [-+=AacDdeijsSu] [-v version] files...\n"
+msgstr "Sá» dụng: %s [-RVf] [-+=AacDdeijsSu] [-v phiên_bản] táºp_tin...\n"
-#: misc/chattr.c:152
+#: misc/chattr.c:153
#, c-format
msgid "bad version - %s\n"
msgstr "phiên bản sai — %s\n"
-#: misc/chattr.c:198 misc/lsattr.c:113
+#: misc/chattr.c:200 misc/lsattr.c:115
#, c-format
msgid "while trying to stat %s"
msgstr "trong khi thỠlấy các thông tin vỠ%s"
-#: misc/chattr.c:204 misc/chattr.c:222
-#, c-format
-msgid "Flags of %s set as "
-msgstr "Các cỠcủa %s đã đặt thà nh "
-
-#: misc/chattr.c:214
+#: misc/chattr.c:207
#, c-format
msgid "while reading flags on %s"
msgstr "trong khi Ä‘á»c các cá» trên %s"
-#: misc/chattr.c:231
+#: misc/chattr.c:216 misc/chattr.c:235
+#, c-format
+msgid "Clearing extent flag not supported on %s"
+msgstr "Chức năng xoá sạch cỠtầm không được hỗ trợ trên %s"
+
+#: misc/chattr.c:221 misc/chattr.c:240
+#, c-format
+msgid "Flags of %s set as "
+msgstr "Các cỠcủa %s đã đặt thà nh "
+
+#: misc/chattr.c:249
#, c-format
msgid "while setting flags on %s"
msgstr "trong khi đặt các cỠtrên %s"
-#: misc/chattr.c:239
+#: misc/chattr.c:257
#, c-format
msgid "Version of %s set as %lu\n"
msgstr "Phiên bản %s được đặt thà nh %lu\n"
-#: misc/chattr.c:243
+#: misc/chattr.c:261
#, c-format
msgid "while setting version on %s"
msgstr "trong khi đặt phiên bản trên %s"
-#: misc/chattr.c:263
+#: misc/chattr.c:281
#, c-format
msgid "Couldn't allocate path variable in chattr_dir_proc"
msgstr "Không thể cấp phát biến Ä‘Æ°á»ng dẫn trong chattr_dir_proc"
-#: misc/chattr.c:302
+#: misc/chattr.c:320
msgid "= is incompatible with - and +\n"
msgstr "= không tÆ°Æ¡ng thÃch vá»›i « - » và « + »\n"
-#: misc/chattr.c:310
+#: misc/chattr.c:328
msgid "Must use '-v', =, - or +\n"
msgstr "Phải dùng « -v », « = », « - » hay « + »\n"
@@ -3346,32 +3323,32 @@ msgstr " Khối rảnh: "
msgid " Free inodes: "
msgstr " Nút rảnh: "
-#: misc/dumpe2fs.c:264
+#: misc/dumpe2fs.c:268
msgid "while printing bad block list"
msgstr "trong khi in ra danh sách các khối sai"
-#: misc/dumpe2fs.c:270
+#: misc/dumpe2fs.c:274
#, c-format
msgid "Bad blocks: %u"
msgstr "Khối sai: %u"
-#: misc/dumpe2fs.c:292 misc/tune2fs.c:279
+#: misc/dumpe2fs.c:297 misc/tune2fs.c:281
msgid "while reading journal inode"
msgstr "trong khi Ä‘á»c nút thông tin nháºt ký"
-#: misc/dumpe2fs.c:295
+#: misc/dumpe2fs.c:300
msgid "Journal size: "
msgstr "KÃch cỡ nhất ký: "
-#: misc/dumpe2fs.c:319 misc/tune2fs.c:200
+#: misc/dumpe2fs.c:324 misc/tune2fs.c:202
msgid "while reading journal superblock"
msgstr "trong khi Ä‘á»c siêu khối nháºt ký"
-#: misc/dumpe2fs.c:327
+#: misc/dumpe2fs.c:332
msgid "Couldn't find journal superblock magic numbers"
msgstr "Không tìm thấy các số ma thuáºt siêu khối nháºt ký"
-#: misc/dumpe2fs.c:331
+#: misc/dumpe2fs.c:336
#, c-format
msgid ""
"\n"
@@ -3390,27 +3367,27 @@ msgstr ""
"Äầu nháºt ký: \t\t%u\n"
"Số ngÆ°á»i dùng nháºt ký: \t%u\n"
-#: misc/dumpe2fs.c:344
+#: misc/dumpe2fs.c:349
#, c-format
msgid "Journal users: %s\n"
msgstr "NgÆ°á»i dùng nháºt ký: %s\n"
-#: misc/dumpe2fs.c:360 misc/mke2fs.c:693 misc/tune2fs.c:868
+#: misc/dumpe2fs.c:365 misc/mke2fs.c:693 misc/tune2fs.c:872
#, c-format
msgid "Couldn't allocate memory to parse options!\n"
msgstr "Không thể cấp phát bá»™ nhá»› để phân tách tùy chá»n !\n"
-#: misc/dumpe2fs.c:386
+#: misc/dumpe2fs.c:391
#, c-format
msgid "Invalid superblock parameter: %s\n"
msgstr "Tham số siêu khối không hợp lệ: %s\n"
-#: misc/dumpe2fs.c:401
+#: misc/dumpe2fs.c:406
#, c-format
msgid "Invalid blocksize parameter: %s\n"
msgstr "Tham số kÃch cỡ khối không hợp lệ: %s\n"
-#: misc/dumpe2fs.c:412
+#: misc/dumpe2fs.c:417
#, c-format
msgid ""
"\n"
@@ -3433,18 +3410,18 @@ msgstr ""
"\tsuperblock=<số thứ tự siêu khối>\n"
"\tblocksize=<kÃch cỡ khối>\n"
-#: misc/dumpe2fs.c:471 misc/mke2fs.c:1355
+#: misc/dumpe2fs.c:476 misc/mke2fs.c:1355
#, c-format
msgid "\tUsing %s\n"
msgstr "\tDùng %s\n"
-#: misc/dumpe2fs.c:507 misc/e2image.c:674 misc/tune2fs.c:1518
-#: resize/main.c:311
+#: misc/dumpe2fs.c:512 misc/e2image.c:681 misc/tune2fs.c:1535
+#: resize/main.c:312
#, c-format
msgid "Couldn't find valid filesystem superblock.\n"
msgstr "Không tìm thấy siêu khối hệ thống táºp tin hợp lệ.\n"
-#: misc/dumpe2fs.c:532
+#: misc/dumpe2fs.c:537
#, c-format
msgid ""
"\n"
@@ -3503,7 +3480,7 @@ msgstr "e2label: gặp lá»—i khi Ä‘á»c siêu khối\n"
msgid "e2label: not an ext2 filesystem\n"
msgstr "e2label: không phải hệ thống táºp tin kiểu ext2\n"
-#: misc/e2label.c:96 misc/tune2fs.c:1653
+#: misc/e2label.c:96 misc/tune2fs.c:1670
#, c-format
msgid "Warning: label too long, truncating.\n"
msgstr "Cảnh báo : nhãn quá dà i nên cắt ngắn.\n"
@@ -3518,7 +3495,7 @@ msgstr "e2label: không thể tìm nơi lại tới siêu khối\n"
msgid "e2label: error writing superblock\n"
msgstr "e2label: gặp lỗi khi ghi siêu khối\n"
-#: misc/e2label.c:116 misc/tune2fs.c:541
+#: misc/e2label.c:116 misc/tune2fs.c:542
#, c-format
msgid "Usage: e2label device [newlabel]\n"
msgstr "SỠdụng: e2label thiết_bị [nhãn_mới]\n"
@@ -3575,17 +3552,17 @@ msgstr "Äã chạy lại giao dịch có kÃch cỡ %zd ở vị trà %ld\n"
msgid "Failed write %s\n"
msgstr "Lá»—i ghi %s\n"
-#: misc/fsck.c:347
+#: misc/fsck.c:343
#, c-format
msgid "WARNING: couldn't open %s: %s\n"
msgstr "CẢNH BÃO : không thể mở %s: %s\n"
-#: misc/fsck.c:357
+#: misc/fsck.c:353
#, c-format
msgid "WARNING: bad format on line %d of %s\n"
msgstr "CẢNH BÃO : gặp định dạng sai trên dòng %d trên %s\n"
-#: misc/fsck.c:372
+#: misc/fsck.c:368
msgid ""
"\a\a\aWARNING: Your /etc/fstab does not contain the fsck passno\n"
"\tfield. I will kludge around things for you, but you\n"
@@ -3597,37 +3574,37 @@ msgstr ""
"\tbạn nên sá»a chữa táºp tin « /etc/fstab » cà ng sá»›m cà ng có thể.\n"
"\n"
-#: misc/fsck.c:481
+#: misc/fsck.c:477
#, c-format
msgid "fsck: %s: not found\n"
msgstr "fsck: %s: không tìm thấy\n"
-#: misc/fsck.c:597
+#: misc/fsck.c:593
#, c-format
msgid "%s: wait: No more child process?!?\n"
msgstr "%s: đợi: không có tiến trình con nữa ?!?\n"
-#: misc/fsck.c:619
+#: misc/fsck.c:615
#, c-format
msgid "Warning... %s for device %s exited with signal %d.\n"
msgstr "Cảnh báo... %s cho thiết bị %s đã thoát vá»›i tÃn hiệu %d.\n"
-#: misc/fsck.c:625
+#: misc/fsck.c:621
#, c-format
msgid "%s %s: status is %x, should never happen.\n"
msgstr "%s %s: trạng thái là %x, không bao giỠnên xảy ra.\n"
-#: misc/fsck.c:664
+#: misc/fsck.c:660
#, c-format
msgid "Finished with %s (exit status %d)\n"
msgstr "%s hoà n tất (trạng thái thoát %d)\n"
-#: misc/fsck.c:724
+#: misc/fsck.c:720
#, c-format
msgid "%s: Error %d while executing fsck.%s for %s\n"
msgstr "%s: Gặp lỗi %d trong khi thực hiện fsck.%s cho %s\n"
-#: misc/fsck.c:745
+#: misc/fsck.c:741
msgid ""
"Either all or none of the filesystem types passed to -t must be prefixed\n"
"with 'no' or '!'.\n"
@@ -3635,47 +3612,42 @@ msgstr ""
"Hoặc tất cả hoặc không có kiểu hệ thống táºp tin được gá»i qua\n"
"cho tùy chá»n « -t » phải có tiá»n tố « no » hay « ! ».\n"
-#: misc/fsck.c:764
+#: misc/fsck.c:760
msgid "Couldn't allocate memory for filesystem types\n"
msgstr "Không thể cấp phát bá»™ nhá»› cho kiểu hế thống táºp tin\n"
-#: misc/fsck.c:887
+#: misc/fsck.c:883
#, c-format
-msgid ""
-"%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
-"number\n"
-msgstr ""
-"%s: Ä‘ang bá» qua dòng sai trong « /etc/fstab »: đóng kết lắp vá»›i số gá»i qua "
-"fsck khác số không\n"
+msgid "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number\n"
+msgstr "%s: Ä‘ang bá» qua dòng sai trong « /etc/fstab »: đóng kết lắp vá»›i số gá»i qua fsck khác số không\n"
-#: misc/fsck.c:914
+#: misc/fsck.c:910
#, c-format
msgid "fsck: cannot check %s: fsck.%s not found\n"
msgstr "fsck: không thể kiểm tra %s: fsck.%s không tìm thấy\n"
-#: misc/fsck.c:970
+#: misc/fsck.c:966
msgid "Checking all file systems.\n"
msgstr "Äang kiểm tra má»i hệ thống táºp tin.\n"
-#: misc/fsck.c:1061
+#: misc/fsck.c:1057
#, c-format
msgid "--waiting-- (pass %d)\n"
msgstr "--đang đợi-- (lần qua %d)\n"
-#: misc/fsck.c:1081
-msgid ""
-"Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
+#: misc/fsck.c:1077
+msgid "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
msgstr ""
"SỠdụng: fsck [-AMNPRTV] [ -C [ fd ] ] [-t kiểu_HTT] [fs-options] [HTT ...]\n"
"\n"
"HTT: hệ thống táºp tin\n"
-#: misc/fsck.c:1123
+#: misc/fsck.c:1119
#, c-format
msgid "%s: too many devices\n"
msgstr "%s: quá nhiá»u thiết bị\n"
-#: misc/fsck.c:1156 misc/fsck.c:1242
+#: misc/fsck.c:1152 misc/fsck.c:1238
#, c-format
msgid "%s: too many arguments\n"
msgstr "%s: quá nhiá»u đối số\n"
@@ -3696,7 +3668,7 @@ msgid "While reading version on %s"
msgstr "Trong khi Ä‘á»c phiên bản trên %s"
#: misc/mke2fs.c:104
-#, fuzzy, c-format
+#, c-format
msgid ""
"Usage: %s [-c|-l filename] [-b block-size] [-f fragment-size]\n"
"\t[-i bytes-per-inode] [-I inode-size] [-J journal-options]\n"
@@ -3711,7 +3683,8 @@ msgstr ""
"\t[-G cỡ_siêu_nhóm] [-N số_inode] [-m phần_trăm_khối_dà nh_riêng]\n"
"\t[-o HÄH_tạo] [-g khối_má»—i_nhóm] [-L nhãn_khối_tin]\n"
"\t[-M thÆ°_mục_lắp_cuối] [-O tÃnh_năng[,...]] [-r bản_sá»a_đổi_HTT]\n"
-"\t[-E tùy_chá»n_mở_rá»™ng] [-T kiểu_HTT] [-jnqvFSV] thiết_bị [số_đếm_khối]\n"
+"\t[-E tùy_chá»n_mở_rá»™ng] [-T kiểu_HTT] [-U UUID]\n"
+"\t[-jnqvFSV] thiết_bị [số_đếm_khối]\n"
"\n"
"[HÄH: hệ Ä‘iá»u hà nh\n"
"HTT: hệ thống táºp tin]\n"
@@ -3928,8 +3901,7 @@ msgstr "Tham số thay đổi kÃch cỡ không hợp lệ: %s\n"
#: misc/mke2fs.c:762
#, c-format
msgid "The resize maximum must be greater than the filesystem size.\n"
-msgstr ""
-"Số thay đổi kÃch cỡ tối Ä‘a phải lá»›n hÆ¡n kÃch cỡ của hệ thống táºp tin.\n"
+msgstr "Số thay đổi kÃch cỡ tối Ä‘a phải lá»›n hÆ¡n kÃch cỡ của hệ thống táºp tin.\n"
#: misc/mke2fs.c:786
#, c-format
@@ -3977,8 +3949,7 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Cảnh báo : chiá»u rá»™ng sá»c (stripe-width) RAID %u không phải là má»™t bá»™i số "
-"dương của %u.\n"
+"Cảnh báo : chiá»u rá»™ng sá»c (stripe-width) RAID %u không phải là má»™t bá»™i số dÆ°Æ¡ng của %u.\n"
"\n"
#: misc/mke2fs.c:856
@@ -3990,7 +3961,7 @@ msgstr ""
"Gặp lá»—i cú pháp trong táºp tin cấu hình mke2fs (%s, dòng số %d)\n"
"\t%s\n"
-#: misc/mke2fs.c:869 misc/tune2fs.c:353
+#: misc/mke2fs.c:869 misc/tune2fs.c:355
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr "Äặt tùy chá»n hệ thống táºp tin không hợp lệ: %s\n"
@@ -4002,8 +3973,7 @@ msgid ""
"Warning! Your mke2fs.conf file does not define the %s filesystem type.\n"
msgstr ""
"\n"
-"Cảnh báo ! Táºp tin « mke2fs.conf » của bạn không xác định kiểu hệ thống táºp "
-"tin %s.\n"
+"Cảnh báo ! Táºp tin « mke2fs.conf » của bạn không xác định kiểu hệ thống táºp tin %s.\n"
#: misc/mke2fs.c:982
#, c-format
@@ -4014,48 +3984,48 @@ msgstr ""
"Rất có thể là bạn cần phải cà i đặt má»™t táºp tin « mke2fs.conf » má»›i.\n"
"\n"
-#: misc/mke2fs.c:1177
+#: misc/mke2fs.c:1176
#, c-format
msgid "invalid block size - %s"
msgstr "cỡ khối không hợp lệ — %s"
-#: misc/mke2fs.c:1181
+#: misc/mke2fs.c:1180
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr "Cảnh báo : kÃch cỡ khối %d vô Ãch trên phần lá»›n hệ thống.\n"
-#: misc/mke2fs.c:1197
+#: misc/mke2fs.c:1196
#, c-format
msgid "invalid fragment size - %s"
msgstr "cỡ đoạn không hợp lệ — %s"
-#: misc/mke2fs.c:1203
+#: misc/mke2fs.c:1202
#, c-format
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr "Cảnh báo : không há»— trợ Ä‘oạn nên bá» qua tùy chá»n « -f »\n"
-#: misc/mke2fs.c:1210
+#: misc/mke2fs.c:1209
msgid "Illegal number for blocks per group"
msgstr "Số cấm cho số khối trên mỗi nhóm"
-#: misc/mke2fs.c:1215
+#: misc/mke2fs.c:1214
msgid "blocks per group must be multiple of 8"
msgstr "số khối trên mỗi nhóm phải là bội số cho 8"
-#: misc/mke2fs.c:1223
+#: misc/mke2fs.c:1222
msgid "Illegal number for flex_bg size"
msgstr "KÃch cỡ flex_bg có số không được phép"
-#: misc/mke2fs.c:1229
+#: misc/mke2fs.c:1228
msgid "flex_bg size must be a power of 2"
msgstr "KÃch cỡ flex_bg phải là lÅ©y thừa 2"
-#: misc/mke2fs.c:1239
+#: misc/mke2fs.c:1238
#, c-format
msgid "invalid inode ratio %s (min %d/max %d)"
msgstr "tỷ lệ nút thông tin không hợp lệ %s (thiểu %d/đa %d)"
-#: misc/mke2fs.c:1256
+#: misc/mke2fs.c:1255
msgid "in malloc for bad_blocks_filename"
msgstr ""
"trong hà m cấp phát bá»™ nhá»› malloc cho tên táºp tin khối sai\n"
@@ -4081,7 +4051,7 @@ msgstr "kÃch cỡ nút thông tin không hợp lệ — %s"
msgid "bad num inodes - %s"
msgstr "số (num) nút thông tin sai — %s"
-#: misc/mke2fs.c:1380 misc/mke2fs.c:2052
+#: misc/mke2fs.c:1380 misc/mke2fs.c:2068
#, c-format
msgid "while trying to open journal device %s\n"
msgstr "trong khi thá» mở thiết bị nháºt ký %s\n"
@@ -4103,8 +4073,7 @@ msgstr "Khối %d-byte quá lớn đối với hệ thống (tối đa %d)"
#: misc/mke2fs.c:1405
#, c-format
-msgid ""
-"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
+msgid "Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
msgstr ""
"Cảnh báo : khối %d-byte quá lớn đối với hệ thống (tối đa %d)\n"
"nên bị buộc tiếp tục\n"
@@ -4127,7 +4096,7 @@ msgstr ""
"%s: thiết bị %s có kÃch cỡ quá lá»›n để đại diện theo 32 bit\n"
"\tdùng kÃch cỡ khối %d.\n"
-#: misc/mke2fs.c:1468 resize/main.c:371
+#: misc/mke2fs.c:1468 resize/main.c:374
msgid "while trying to determine filesystem size"
msgstr "trong khi thá» quyết định kÃch cỡ của hệ thống táºp tin"
@@ -4162,75 +4131,74 @@ msgstr "Hệ thống táºp tin lá»›n hÆ¡n kÃch cỡ thiết bị biểu kiến.
msgid "Failed to parse fs types list\n"
msgstr "Lá»—i phân tÃch danh sách các kiểu hệ thống táºp tin\n"
-#: misc/mke2fs.c:1542
+#: misc/mke2fs.c:1540
msgid "fs_types for mke2fs.conf resolution: "
msgstr "fs_types để giải quyết mke2fs.conf: "
-#: misc/mke2fs.c:1549
+#: misc/mke2fs.c:1547
#, c-format
msgid "Filesystem features not supported with revision 0 filesystems\n"
msgstr ""
"TÃnh năng hệ thống táºp tin không được há»— trợ trên hệ thống táºp tin\n"
"bản sá»a đổi 0\n"
-#: misc/mke2fs.c:1556
+#: misc/mke2fs.c:1554
#, c-format
msgid "Sparse superblocks not supported with revision 0 filesystems\n"
msgstr ""
"TÃnh năng siêu khối thÆ°a thá»›t không được há»— trợ\n"
"trên hệ thống táºp tin bản sá»a đổi 0\n"
-#: misc/mke2fs.c:1568
+#: misc/mke2fs.c:1566
#, c-format
msgid "Journals not supported with revision 0 filesystems\n"
msgstr ""
"TÃnh năng nháºt ký không được há»— trợ trên hệ thống táºp tin\n"
"bản sá»a đổi 0\n"
-#: misc/mke2fs.c:1586
+#: misc/mke2fs.c:1584
#, c-format
msgid ""
"The resize_inode and meta_bg features are not compatible.\n"
"They can not be both enabled simultaneously.\n"
msgstr ""
-"Hai tÃnh năng thay đổi kÃch cỡ nút (resize_inode) và siêu ná»n (meta_bg) "
-"không tÆ°Æ¡ng thÃch vá»›i nhau.\n"
+"Hai tÃnh năng thay đổi kÃch cỡ nút (resize_inode) và siêu ná»n (meta_bg) không tÆ°Æ¡ng thÃch vá»›i nhau.\n"
"Do đó không thể hiệu lá»±c đồng thá»i cả hai.\n"
-#: misc/mke2fs.c:1603
+#: misc/mke2fs.c:1601
msgid "while trying to determine hardware sector size"
msgstr "trong khi thá» quyết định kÃch cỡ của rãnh ghi phần cứng"
-#: misc/mke2fs.c:1661
+#: misc/mke2fs.c:1658
msgid "reserved online resize blocks not supported on non-sparse filesystem"
msgstr ""
"khối thay đổi kÃch cỡ trá»±c tuyến được dà nh riêng không được há»— trợ\n"
"trên hệ thống táºp tin không thÆ°a thá»›t"
-#: misc/mke2fs.c:1670
+#: misc/mke2fs.c:1667
msgid "blocks per group count out of range"
msgstr "số khối trên mỗi nhóm ở ngoà i phạm vi"
-#: misc/mke2fs.c:1685
+#: misc/mke2fs.c:1682
msgid "Flex_bg feature not enabled, so flex_bg size may not be specified"
msgstr "ChÆ°a hiệu lá»±c tÃnh năng Flex_bg thì không thể ghi rõ kÃch cỡ Flex_bg"
-#: misc/mke2fs.c:1697
+#: misc/mke2fs.c:1694
#, c-format
msgid "invalid inode size %d (min %d/max %d)"
msgstr "kÃch cỡ nút thông tin không hợp lệ %d (thiểu %d/Ä‘a %d)"
-#: misc/mke2fs.c:1711
+#: misc/mke2fs.c:1708
#, c-format
msgid "too many inodes (%llu), raise inode ratio?"
msgstr "quá nhiá»u nút thông tin (%llu), tăng tá»· lệ nút thông tin không?"
-#: misc/mke2fs.c:1716
+#: misc/mke2fs.c:1713
#, c-format
msgid "too many inodes (%llu), specify < 2^32 inodes"
msgstr "quá nhiá»u nút thông tin (%llu), xác định <2³² nút thông tin"
-#: misc/mke2fs.c:1731
+#: misc/mke2fs.c:1728
#, c-format
msgid ""
"inode_size (%u) * inodes_count (%u) too big for a\n"
@@ -4242,12 +4210,16 @@ msgstr ""
"\ttỷ_lệ_nút_thông_tin (-i) cao hơn cho số đếm nút thông tin\n"
"(-N) thấp hơn\n"
-#: misc/mke2fs.c:1828 misc/tune2fs.c:1462
+#: misc/mke2fs.c:1821 misc/tune2fs.c:1453
+msgid "Couldn't allocate memory for tdb filename\n"
+msgstr "Không thể cấp phát bá»™ nhá»› cho tên táºp tin tdb\n"
+
+#: misc/mke2fs.c:1834 misc/tune2fs.c:1475
#, c-format
msgid "while trying to delete %s"
msgstr "trong khi thỠxoá %s"
-#: misc/mke2fs.c:1837
+#: misc/mke2fs.c:1844
#, c-format
msgid ""
"Overwriting existing filesystem; this can be undone using the command:\n"
@@ -4259,38 +4231,38 @@ msgstr ""
"\n"
# Item in the main menu to select this package
-#: misc/mke2fs.c:1885
+#: misc/mke2fs.c:1893
msgid "while setting up superblock"
msgstr "trong khi thiết láºp siêu khối"
-#: misc/mke2fs.c:1936
+#: misc/mke2fs.c:1952
#, c-format
msgid "unknown os - %s"
msgstr "hệ Ä‘iá»u hà nh lạ — %s"
-#: misc/mke2fs.c:1990
+#: misc/mke2fs.c:2006
msgid "while trying to allocate filesystem tables"
msgstr "trong khi thá» cấp phát các bảng hệ thống táºp tin"
-#: misc/mke2fs.c:2021
+#: misc/mke2fs.c:2037
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr "trong khi là m số không khối %u tại kết thúc của hệ thống táºp tin"
-#: misc/mke2fs.c:2034
+#: misc/mke2fs.c:2050
msgid "while reserving blocks for online resize"
msgstr "trong khi dà nh riêng các khối để thay đổi kÃch cỡ trá»±c tuyến"
-#: misc/mke2fs.c:2045 misc/tune2fs.c:477
+#: misc/mke2fs.c:2061 misc/tune2fs.c:479
msgid "journal"
msgstr "nháºt ký"
-#: misc/mke2fs.c:2057
+#: misc/mke2fs.c:2073
#, c-format
msgid "Adding journal to device %s: "
msgstr "Äang thêm nháºt ký và o thiết bị %s: "
-#: misc/mke2fs.c:2064
+#: misc/mke2fs.c:2080
#, c-format
msgid ""
"\n"
@@ -4299,22 +4271,27 @@ msgstr ""
"\n"
"trong khi thá» thêm nháºt ký và o thiết bị %s"
-#: misc/mke2fs.c:2069 misc/mke2fs.c:2095 misc/tune2fs.c:506 misc/tune2fs.c:520
+#: misc/mke2fs.c:2085 misc/mke2fs.c:2117 misc/tune2fs.c:508 misc/tune2fs.c:522
#, c-format
msgid "done\n"
msgstr "hoà n tất\n"
-#: misc/mke2fs.c:2083
+#: misc/mke2fs.c:2094
+#, c-format
+msgid "Skipping journal creation in super-only mode\n"
+msgstr "Äang bá» qua bÆ°á»›c tạo nháºt ký trong chế Ä‘á»™ chỉ siêu\n"
+
+#: misc/mke2fs.c:2105
#, c-format
msgid "Creating journal (%u blocks): "
msgstr "Äang tạo nháºt ký (%u khối): "
-#: misc/mke2fs.c:2100
+#: misc/mke2fs.c:2122
#, c-format
msgid "Writing superblocks and filesystem accounting information: "
msgstr "Äang ghi siêu khối và thông tin kế toán hệ thống táºp tin: "
-#: misc/mke2fs.c:2105
+#: misc/mke2fs.c:2127
#, c-format
msgid ""
"\n"
@@ -4323,7 +4300,7 @@ msgstr ""
"\n"
"Cảnh báo : gặp khó khăn trong việc ghi ra các siêu khối."
-#: misc/mke2fs.c:2108
+#: misc/mke2fs.c:2130
#, c-format
msgid ""
"done\n"
@@ -4376,7 +4353,7 @@ msgstr "%s: h=%3d s=%3d c=%4d đầu=%8d cỡ=%8lu cuối=%8d\n"
msgid "Please run e2fsck on the filesystem.\n"
msgstr "Hãy chạy tiến trình e2fsck trên hệ thống táºp tin.\n"
-#: misc/tune2fs.c:103
+#: misc/tune2fs.c:105
#, c-format
msgid ""
"Usage: %s [-c max_mounts_count] [-e errors_behavior] [-g group]\n"
@@ -4396,59 +4373,59 @@ msgstr ""
"\t[-E tùy_chá»n_đã_mở_rá»™ng[,...] [-T giá»_kiểm_tra_cuối]\n"
"\t[-U UUID] [-l cỡ_nút_mới] thiết_bị\n"
-#: misc/tune2fs.c:188
+#: misc/tune2fs.c:190
msgid "while trying to open external journal"
msgstr "trong khi thá» mở nháºt ký bên ngoà i"
-#: misc/tune2fs.c:192
+#: misc/tune2fs.c:194
#, c-format
msgid "%s is not a journal device.\n"
msgstr "%s không phải thiết bị nháºt ký.\n"
-#: misc/tune2fs.c:207
+#: misc/tune2fs.c:209
msgid "Journal superblock not found!\n"
msgstr "Không tìm thấy siêu khối nháºt ký !\n"
-#: misc/tune2fs.c:219
+#: misc/tune2fs.c:221
msgid "Filesystem's UUID not found on journal device.\n"
msgstr "Không tìm thấy UUID của hệ thống táºp tin trên thiết bị nháºt ký.\n"
-#: misc/tune2fs.c:240
+#: misc/tune2fs.c:242
msgid "Journal NOT removed\n"
msgstr "CHƯA gỡ bá» nháºt ký\n"
-#: misc/tune2fs.c:246
+#: misc/tune2fs.c:248
msgid "Journal removed\n"
msgstr "Nháºt ký đã gỡ bá»\n"
-#: misc/tune2fs.c:286
+#: misc/tune2fs.c:288
msgid "while reading bitmaps"
msgstr "trong khi Ä‘á»c các mảng ảnh"
-#: misc/tune2fs.c:294
+#: misc/tune2fs.c:296
msgid "while clearing journal inode"
msgstr "trong khi xoá sạch nút thông tin nháºt ký"
-#: misc/tune2fs.c:305
+#: misc/tune2fs.c:307
msgid "while writing journal inode"
msgstr "trong khi ghi nút thông tin nháºt ký"
-#: misc/tune2fs.c:320
+#: misc/tune2fs.c:322
#, c-format
msgid "Invalid mount option set: %s\n"
msgstr "Äặt tùy chá»n lắp không hợp lệ: %s\n"
-#: misc/tune2fs.c:356
+#: misc/tune2fs.c:358
#, c-format
msgid "Clearing filesystem feature '%s' not supported.\n"
msgstr "TÃnh năng xoá sạch hệ thống táºp tin « %s » không được há»— trợ.\n"
-#: misc/tune2fs.c:362
+#: misc/tune2fs.c:364
#, c-format
msgid "Setting filesystem feature '%s' not supported.\n"
msgstr "TÃnh năng đặt hệ thống táºp tin « %s » không được há»— trợ.\n"
-#: misc/tune2fs.c:371
+#: misc/tune2fs.c:373
msgid ""
"The has_journal feature may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
@@ -4457,7 +4434,7 @@ msgstr ""
"chỉ khi hệ thống táºp tin được tháo gắn kết\n"
"hay được gắn kết má»™t cách chỉ Ä‘á»c.\n"
-#: misc/tune2fs.c:379
+#: misc/tune2fs.c:381
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
@@ -4465,13 +4442,13 @@ msgstr ""
"Äặt cá» cần thiết phục hồi (needs_recovery).\n"
"Hãy chạy tiến trình e2fsck trÆ°á»›c khi xoá sạch cá» có nháºt ký (has_journal).\n"
-#: misc/tune2fs.c:412
+#: misc/tune2fs.c:414
msgid ""
"Clearing the flex_bg flag would cause the the filesystem to be\n"
"inconsistent.\n"
msgstr "Gỡ bá» cá» flex_bg thì gây ra hệ thống táºp tin không thống nhất.\n"
-#: misc/tune2fs.c:423
+#: misc/tune2fs.c:425
msgid ""
"The huge_file feature may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
@@ -4480,16 +4457,16 @@ msgstr ""
"chỉ khi hệ thống táºp tin được tháo gắn kết\n"
"hay được gắn kết má»™t cách chỉ Ä‘á»c.\n"
-#: misc/tune2fs.c:451
+#: misc/tune2fs.c:453
#, c-format
msgid "(and reboot afterwards!)\n"
msgstr "(và khởi động lại sau !)\n"
-#: misc/tune2fs.c:472
+#: misc/tune2fs.c:474
msgid "The filesystem already has a journal.\n"
msgstr "Hệ thống táºp tin đã có nháºt ký.\n"
-#: misc/tune2fs.c:490
+#: misc/tune2fs.c:492
#, c-format
msgid ""
"\n"
@@ -4498,21 +4475,21 @@ msgstr ""
"\n"
"trong khi thá» mở nháºt ký trên %s\n"
-#: misc/tune2fs.c:494
+#: misc/tune2fs.c:496
#, c-format
msgid "Creating journal on device %s: "
msgstr "Äang tạo nháºt ký trên thiết bị %s: "
-#: misc/tune2fs.c:502
+#: misc/tune2fs.c:504
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr "trong khi thêm hệ thống táºp tin và o nháºt ký trên %s"
-#: misc/tune2fs.c:508
+#: misc/tune2fs.c:510
msgid "Creating journal inode: "
msgstr "Äang tạo nút thông tin nháºt ký: "
-#: misc/tune2fs.c:517
+#: misc/tune2fs.c:519
msgid ""
"\n"
"\twhile trying to create journal file"
@@ -4520,85 +4497,85 @@ msgstr ""
"\n"
"trong khi thá» tạo táºp tin nháºt ký"
-#: misc/tune2fs.c:584
+#: misc/tune2fs.c:585
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr "Không thể phân tách toán tỠngà y/giỠ: %s"
-#: misc/tune2fs.c:608 misc/tune2fs.c:621
+#: misc/tune2fs.c:609 misc/tune2fs.c:622
#, c-format
msgid "bad mounts count - %s"
msgstr "số đếm lắp sai — %s"
-#: misc/tune2fs.c:637
+#: misc/tune2fs.c:638
#, c-format
msgid "bad error behavior - %s"
msgstr "ứng xỠlỗi sai — %s"
-#: misc/tune2fs.c:664
+#: misc/tune2fs.c:665
#, c-format
msgid "bad gid/group name - %s"
msgstr "GID/tên nhóm sai — %s"
-#: misc/tune2fs.c:697
+#: misc/tune2fs.c:698
#, c-format
msgid "bad interval - %s"
msgstr "khoảng sai - %s"
-#: misc/tune2fs.c:725
+#: misc/tune2fs.c:727
#, c-format
msgid "bad reserved block ratio - %s"
msgstr "tỷ lệ khối dà nh riêng sai — %s"
-#: misc/tune2fs.c:740
+#: misc/tune2fs.c:742
msgid "-o may only be specified once"
msgstr "có thể xác định tùy chá»n « -o » chỉ má»™t lần"
-#: misc/tune2fs.c:750
+#: misc/tune2fs.c:752
msgid "-O may only be specified once"
msgstr "có thể xác định tùy chá»n « -O » chỉ má»™t lần"
-#: misc/tune2fs.c:760
+#: misc/tune2fs.c:762
#, c-format
msgid "bad reserved blocks count - %s"
msgstr "số đếm khối dà nh riêng sai — %s"
-#: misc/tune2fs.c:789
+#: misc/tune2fs.c:791
#, c-format
msgid "bad uid/user name - %s"
msgstr "UID/tên ngÆ°á»i dùng sai — %s"
-#: misc/tune2fs.c:806
+#: misc/tune2fs.c:808
#, c-format
msgid "bad inode size - %s"
msgstr "kÃch cỡ nút sai — %s"
-#: misc/tune2fs.c:813
+#: misc/tune2fs.c:815
#, c-format
msgid "Inode size must be a power of two- %s"
msgstr "KÃch cỡ nút phải là lÅ©y thừa 2 — %s"
-#: misc/tune2fs.c:900
+#: misc/tune2fs.c:904
#, c-format
msgid "Invalid RAID stride: %s\n"
msgstr "Tham số stride RAID không hợp lệ: %s\n"
-#: misc/tune2fs.c:915
+#: misc/tune2fs.c:919
#, c-format
msgid "Invalid RAID stripe-width: %s\n"
msgstr "Tham số chiá»u rá»™ng sá»c (stripe-width) RAID không hợp lệ: %s\n"
-#: misc/tune2fs.c:930
+#: misc/tune2fs.c:934
#, c-format
msgid "Invalid hash algorithm: %s\n"
msgstr "Thuáºt toán tạo mẫu duy nhất vẫn không hợp lệ: %s\n"
-#: misc/tune2fs.c:936
+#: misc/tune2fs.c:940
#, c-format
msgid "Setting default hash algorithm to %s (%d)\n"
msgstr "Äang đặt thuáºt toán tạo mẫu duy nhất thà nh %s (%d)\n"
-#: misc/tune2fs.c:944
+#: misc/tune2fs.c:948
#, c-format
msgid ""
"\n"
@@ -4627,72 +4604,72 @@ msgstr ""
"\ttest_fs\n"
"\t^test_fs\n"
-#: misc/tune2fs.c:1384 misc/tune2fs.c:1389 resize/resize2fs.c:760
+#: misc/tune2fs.c:1388 misc/tune2fs.c:1393 resize/resize2fs.c:790
msgid "blocks to be moved"
msgstr "khối cần di chuyển"
-#: misc/tune2fs.c:1471
-#, fuzzy, c-format
+#: misc/tune2fs.c:1485
+#, c-format
msgid ""
"To undo the tune2fs operation please run the command\n"
" e2undo %s %s\n"
"\n"
msgstr ""
-"Äể hủy các bÆ°á»›c tune2fs, hãy chạy câu lệnh\n"
+"Äể hoà n lại thao tác tune2fs, hãy chạy câu lệnh\n"
" e2undo %s %s\n"
"\n"
-#: misc/tune2fs.c:1529
+#: misc/tune2fs.c:1546
#, c-format
-msgid "The inode size is already %d\n"
-msgstr "KÃch cỡ nút thông tin đã %d\n"
+msgid "The inode size is already %lu\n"
+msgstr "KÃch cỡ nút thông tin đã %lu\n"
-#: misc/tune2fs.c:1534
+#: misc/tune2fs.c:1551
#, c-format
msgid "Shrinking the inode size is not supported\n"
msgstr "Không há»— trợ tÃnh năng thu nhá» kÃch cỡ nút thông tin\n"
-#: misc/tune2fs.c:1577
+#: misc/tune2fs.c:1594
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr "Äang đặt số đếm lắp tối Ä‘a thà nh %d\n"
-#: misc/tune2fs.c:1583
+#: misc/tune2fs.c:1600
#, c-format
msgid "Setting current mount count to %d\n"
msgstr "Äang đặt số đếm lắp hiện thá»i thà nh %d\n"
-#: misc/tune2fs.c:1588
+#: misc/tune2fs.c:1605
#, c-format
msgid "Setting error behavior to %d\n"
msgstr "Äang đặt ứng xá» lá»—i thà nh %d\n"
-#: misc/tune2fs.c:1593
+#: misc/tune2fs.c:1610
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr "Äang đặt GID khối dà nh riêng thà nh %lu\n"
-#: misc/tune2fs.c:1598
+#: misc/tune2fs.c:1615
#, c-format
msgid "Setting interval between checks to %lu seconds\n"
msgstr "Äang đặt khoảng giữa hai lần kiểm tra thà nh %lu giây\n"
-#: misc/tune2fs.c:1605
+#: misc/tune2fs.c:1622
#, c-format
msgid "Setting reserved blocks percentage to %g%% (%u blocks)\n"
msgstr "Äang đặt phần trăm khối dà nh riêng thà nh %g%% (%u khối)\n"
-#: misc/tune2fs.c:1612
+#: misc/tune2fs.c:1629
#, c-format
msgid "reserved blocks count is too big (%lu)"
msgstr "số đếm khối dà nh riêng quá lớn (%lu)"
-#: misc/tune2fs.c:1618
+#: misc/tune2fs.c:1635
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr "Äang đặt số đếm khối dà nh riêng thà nh %lu\n"
-#: misc/tune2fs.c:1624
+#: misc/tune2fs.c:1641
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
@@ -4700,7 +4677,7 @@ msgstr ""
"\n"
"Hệ thống táºp tin đã có siêu khối thÆ°a thá»›t.\n"
-#: misc/tune2fs.c:1631
+#: misc/tune2fs.c:1648
#, c-format
msgid ""
"\n"
@@ -4709,7 +4686,7 @@ msgstr ""
"\n"
"Äặt cá» siêu khối thÆ°a thá»›t. %s"
-#: misc/tune2fs.c:1636
+#: misc/tune2fs.c:1653
msgid ""
"\n"
"Clearing the sparse superflag not supported.\n"
@@ -4717,32 +4694,31 @@ msgstr ""
"\n"
"TÃnh năng xoá sạch siêu cá» sparse không được há»— trợ.\n"
-#: misc/tune2fs.c:1643
+#: misc/tune2fs.c:1660
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr "Äang đặt giá» kiểm tra hệ thống táºp tin lần cuối cùng thà nh %s\n"
-#: misc/tune2fs.c:1649
+#: misc/tune2fs.c:1666
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr "Äang đặt UID khối dà nh riêng thà nh %lu\n"
-#: misc/tune2fs.c:1700
+#: misc/tune2fs.c:1717
msgid "Invalid UUID format\n"
msgstr "Äịnh dạng UUID không hợp lệ\n"
-#: misc/tune2fs.c:1712
+#: misc/tune2fs.c:1729
msgid "The inode size may only be changed when the filesystem is unmounted.\n"
-msgstr ""
-"KÃch cỡ nút chỉ có thể thay đổi khi hệ thống táºp tin không được gắn kết.\n"
+msgstr "KÃch cỡ nút chỉ có thể thay đổi khi hệ thống táºp tin không được gắn kết.\n"
-#: misc/tune2fs.c:1719
+#: misc/tune2fs.c:1736
msgid ""
"Changing the inode size not supported for filesystems with the flex_bg\n"
"feature enabled.\n"
-msgstr ""
+msgstr "Chức năng thay đổi kÃch cỡ nút thông tin không phải được há»— trợ đối vá»›i hệ thống táºp tin đã báºt tÃnh năng « flex_bg ».\n"
-#: misc/tune2fs.c:1731
+#: misc/tune2fs.c:1748
msgid ""
"Error in resizing the inode size.\n"
"Run e2undo to undo the file system changes. \n"
@@ -4750,17 +4726,17 @@ msgstr ""
"Gặp lá»—i khi thay đổi kÃch cỡ nút.\n"
"Hãy chạy lệnh « e2undo » để hủy các bÆ°á»›c thay đổi hệ thống táºp tin. \n"
-#: misc/tune2fs.c:1735
+#: misc/tune2fs.c:1752
#, c-format
msgid "Setting inode size %lu\n"
msgstr "Äang đặt kÃch cỡ nút %lu\n"
-#: misc/tune2fs.c:1745
+#: misc/tune2fs.c:1762
#, c-format
msgid "Setting stride size to %d\n"
msgstr "Äang đặt kÃch cỡ stride thà nh %d\n"
-#: misc/tune2fs.c:1750
+#: misc/tune2fs.c:1767
#, c-format
msgid "Setting stripe width to %d\n"
msgstr "Äang đặt chiá»u rá»™ng sá»c (stripe width) thà nh %d\n"
@@ -4933,17 +4909,17 @@ msgstr "Lần qua lạ ?!?"
msgid "Begin pass %d (max = %lu)\n"
msgstr "Khởi chạy lần qua %d (tối đa = %lu)\n"
-#: resize/main.c:264
+#: resize/main.c:265
#, c-format
msgid "while opening %s"
msgstr "trong khi mở %s"
-#: resize/main.c:276
+#: resize/main.c:277
#, c-format
msgid "while getting stat information for %s"
msgstr "trong khi lấy các thông tin vỠ%s"
-#: resize/main.c:337
+#: resize/main.c:338
#, c-format
msgid ""
"%s: The combination of flex_bg and\n"
@@ -4952,21 +4928,26 @@ msgstr ""
"%s: tổ hợp hai tÃnh năng flex_bg và !resize_inode\n"
"Ä‘á»u không được resize2fs há»— trợ.\n"
-#: resize/main.c:345
+#: resize/main.c:348
#, c-format
msgid "Estimated minimum size of the filesystem: %u\n"
msgstr "KÃch cỡ hệ thống táºp tin tối thiểu được Æ°á»›c tÃnh: %u\n"
-#: resize/main.c:381
-#, fuzzy, c-format
+#: resize/main.c:384
+#, c-format
msgid "Invalid new size: %s\n"
-msgstr "kÃch cỡ nút thông tin không hợp lệ — %s"
+msgstr "KÃch cỡ má»›i không hợp lệ: %s\n"
+
+#: resize/main.c:396
+#, c-format
+msgid "New size smaller than minimum (%u)\n"
+msgstr "KÃch cỡ má»›i vẫn nhá» hÆ¡n tối thiểu (%u)\n"
-#: resize/main.c:394
+#: resize/main.c:402
msgid "Invalid stride length"
msgstr "Äá»™ dà i stride không hợp lệ"
-#: resize/main.c:418
+#: resize/main.c:426
#, c-format
msgid ""
"The containing partition (or device) is only %u (%dk) blocks.\n"
@@ -4977,7 +4958,7 @@ msgstr ""
"Bạn đã yêu cầu kÃch cỡ má»›i %u khối.\n"
"\n"
-#: resize/main.c:425
+#: resize/main.c:433
#, c-format
msgid ""
"The filesystem is already %u blocks long. Nothing to do!\n"
@@ -4986,19 +4967,33 @@ msgstr ""
"Hệ thống táºp tin đã có Ä‘á»™ dà i %u khối. Không có gì cần là m !\n"
"\n"
-#: resize/main.c:436
+#: resize/main.c:444
#, c-format
msgid ""
"Please run 'e2fsck -f %s' first.\n"
"\n"
msgstr "Trước tiên hãy chạy tiến trình « e2fsck -f %s ».\n"
-#: resize/main.c:447
+#: resize/main.c:448
+#, c-format
+msgid "Resizing the filesystem on %s to %u (%dk) blocks.\n"
+msgstr "Äang thay đổi kÃch cỡ của hệ thống táºp tin trên %s thà nh %u (%dk) khối.\n"
+
+#: resize/main.c:457
#, c-format
msgid "while trying to resize %s"
msgstr "trong khi thá» thay đổi kÃch cỡ %s"
-#: resize/main.c:452
+#: resize/main.c:460
+#, c-format
+msgid ""
+"Please run 'e2fsck -fy %s' to fix the filesystem\n"
+"after the aborted resize operation.\n"
+msgstr ""
+"Hãy chạy câu lệnh « e2fsck -fy %s » để sá»a chữa hệ thống táºp tin\n"
+"đằng sau thao tác thay đổi kÃch cỡ bị hủy bá».\n"
+
+#: resize/main.c:466
#, c-format
msgid ""
"The filesystem on %s is now %u blocks long.\n"
@@ -5007,12 +5002,15 @@ msgstr ""
"Hệ thống táºp tin nằm trên %s giá» có Ä‘á»™ dà i %u khối.\n"
"\n"
+#: resize/main.c:481
+#, c-format
+msgid "while trying to truncate %s"
+msgstr "trong khi thỠcắt ngắn %s"
+
#: resize/online.c:37
#, c-format
msgid "Filesystem at %s is mounted on %s; on-line resizing required\n"
-msgstr ""
-"Hệ thống táºp tin ở %s được gắn kết và o %s; cần thiết thay đổi kÃch cỡ trá»±c "
-"tuyến\n"
+msgstr "Hệ thống táºp tin ở %s được gắn kết và o %s; cần thiết thay đổi kÃch cỡ trá»±c tuyến\n"
#: resize/online.c:41
#, c-format
@@ -5043,9 +5041,7 @@ msgstr "Trong khi kiểm tra có há»— trợ thay đổi kÃch cỡ trá»±c tuyế
#: resize/online.c:111
#, c-format
msgid "Performing an on-line resize of %s to %u (%dk) blocks.\n"
-msgstr ""
-"Äang thá»±c hiện má»™t công việc thay đổi kÃch cỡ %s trá»±c tuyến xuống %u (%dk) "
-"khối.\n"
+msgstr "Äang thá»±c hiện má»™t công việc thay đổi kÃch cỡ %s trá»±c tuyến xuống %u (%dk) khối.\n"
#: resize/online.c:121
msgid "While trying to extend the last group"
@@ -5058,36 +5054,23 @@ msgstr "Trong khi thỠthêm nhóm số %d"
#: resize/online.c:191
#, c-format
-msgid ""
-"Filesystem at %s is mounted on %s, and on-line resizing is not supported on "
-"this system.\n"
-msgstr ""
-"Hệ thống táºp tin ở %s được gắn kết và o %s, và tÃnh năng thay đổi kÃch cỡ "
-"trên dòng không được hỗ trợ trên hệ thống nà y.\n"
+msgid "Filesystem at %s is mounted on %s, and on-line resizing is not supported on this system.\n"
+msgstr "Hệ thống táºp tin ở %s được gắn kết và o %s, và tÃnh năng thay đổi kÃch cỡ trên dòng không được há»— trợ trên hệ thống nà y.\n"
-#: resize/resize2fs.c:322
+#: resize/resize2fs.c:350
#, c-format
msgid "inodes (%llu) must be less than %u"
msgstr "nút thông tin (%llu) phải nhỠhơn %u"
-#: resize/resize2fs.c:755
+#: resize/resize2fs.c:582
msgid "reserved blocks"
msgstr "khối dà nh riêng"
-#: resize/resize2fs.c:765
+#: resize/resize2fs.c:795
msgid "meta-data blocks"
msgstr "khối siêu dữ liệu"
-#: resize/resize2fs.c:1703
+#: resize/resize2fs.c:1752
#, c-format
msgid "Should never happen: resize inode corrupt!\n"
msgstr "Không bao giá» nên xảy ra: nút thông tin thay đổi kÃch cỡ bị há»ng !\n"
-
-#~ msgid "@S doesn't have has_ at j flag, but has ext3 @j %s.\n"
-#~ msgstr "@S không có cỠhas_ at j, còn có @j ext3 %s.\n"
-
-#~ msgid "Error while deleting extent: %m\n"
-#~ msgstr "Gặp lỗi khi xoá phạm vi: %m\n"
-
-#~ msgid "Recreate journal to make the filesystem ext3 again?\n"
-#~ msgstr "Tạo lại nháºt ký để là m hệ thống táºp tin trở thà nh lại ext3 không?\n"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 2be1c4c..357d49f 100644
Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 230ccab..230d05a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -64,15 +64,16 @@ msgid ""
msgstr ""
"Project-Id-Version: e2fsprogs-1.41.1\n"
"Report-Msgid-Bugs-To: tytso at alum.mit.edu\n"
-"POT-Creation-Date: 2008-08-29 23:13-0400\n"
+"POT-Creation-Date: 2009-06-29 01:27-0400\n"
"PO-Revision-Date: 2009-05-05 13:11+0800\n"
"Last-Translator: Dark Raven <drdarkraven at gmail.com>\n"
-"Language-Team: Chinese (simplified) <translation-team-zh-cn at lists.sourceforge.net>\n"
+"Language-Team: Chinese (simplified) <translation-team-zh-cn at lists."
+"sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: e2fsck/badblocks.c:22 misc/mke2fs.c:164
+#: e2fsck/badblocks.c:22 misc/mke2fs.c:165
#, c-format
msgid "Bad block %u out of range; ignored.\n"
msgstr "åå—%u超出范围;忽略.\n"
@@ -87,10 +88,10 @@ msgid "while reading the bad blocks inode"
msgstr "当读å–åå—inodeæ—¶"
#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:1020 e2fsck/unix.c:1103 misc/badblocks.c:1102
-#: misc/badblocks.c:1110 misc/badblocks.c:1124 misc/badblocks.c:1136
-#: misc/dumpe2fs.c:505 misc/e2image.c:573 misc/e2image.c:669
-#: misc/e2image.c:685 misc/mke2fs.c:180 misc/tune2fs.c:1449 resize/main.c:304
+#: e2fsck/unix.c:1057 e2fsck/unix.c:1140 misc/badblocks.c:1155
+#: misc/badblocks.c:1163 misc/badblocks.c:1177 misc/badblocks.c:1189
+#: misc/dumpe2fs.c:510 misc/e2image.c:583 misc/e2image.c:679
+#: misc/e2image.c:695 misc/mke2fs.c:181 misc/tune2fs.c:1532 resize/main.c:312
#, c-format
msgid "while trying to open %s"
msgstr "当å°è¯•æ‰“å¼€ %s æ—¶"
@@ -100,7 +101,7 @@ msgstr "当å°è¯•æ‰“å¼€ %s æ—¶"
msgid "while trying popen '%s'"
msgstr "当å°è¯•å¯¹ '%s' 进行popenæ—¶"
-#: e2fsck/badblocks.c:93 misc/mke2fs.c:187
+#: e2fsck/badblocks.c:93 misc/mke2fs.c:188
#, fuzzy
msgid "while reading in list of bad blocks from file"
msgstr "当从文件ä¸è¯»å–åå—表时"
@@ -115,30 +116,30 @@ msgstr "当更新åå—inodeæ—¶"
msgid "Warning: illegal block %u found in bad block inode. Cleared.\n"
msgstr "è¦å‘Š:在åå—inodeä¸å‘现éžæ³•çš„å—%u. 清除.\n"
-#: e2fsck/ehandler.c:53
+#: e2fsck/ehandler.c:54
#, fuzzy, c-format
msgid "Error reading block %lu (%s) while %s. "
msgstr "读å–å— %lu (%s) 错误 , %s. "
-#: e2fsck/ehandler.c:56
+#: e2fsck/ehandler.c:57
#, c-format
msgid "Error reading block %lu (%s). "
msgstr "读å–å— %lu (%s) 错误"
-#: e2fsck/ehandler.c:59 e2fsck/ehandler.c:106
+#: e2fsck/ehandler.c:60 e2fsck/ehandler.c:109
msgid "Ignore error"
msgstr "忽略错误"
-#: e2fsck/ehandler.c:60
+#: e2fsck/ehandler.c:61
msgid "Force rewrite"
msgstr "强制覆盖"
-#: e2fsck/ehandler.c:100
+#: e2fsck/ehandler.c:103
#, fuzzy, c-format
msgid "Error writing block %lu (%s) while %s. "
msgstr "å†™å— %lu (%s) 出错 , %s. "
-#: e2fsck/ehandler.c:103
+#: e2fsck/ehandler.c:106
#, c-format
msgid "Error writing block %lu (%s). "
msgstr "å†™å— %lu (%s) 出错. "
@@ -187,21 +188,21 @@ msgstr "ä¸æ”¯æŒå¯¹BLKFLSBUF进行 ioctl 调用! æ— æ³•åˆ·æ–°ç¼“å˜.\n"
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr "用法: %s [-F] [-I inode_buffer_blocks] device\n"
-#: e2fsck/iscan.c:83 e2fsck/unix.c:804
+#: e2fsck/iscan.c:83 e2fsck/unix.c:817
#, fuzzy, c-format
msgid "while opening %s for flushing"
msgstr "当为刷新打开“%sâ€æ—¶"
-#: e2fsck/iscan.c:88 e2fsck/unix.c:810 resize/main.c:282
+#: e2fsck/iscan.c:88 e2fsck/unix.c:823 resize/main.c:288
#, fuzzy, c-format
msgid "while trying to flush %s"
msgstr "当å°è¯•åˆ·æ–° %s æ—¶"
-#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:480
+#: e2fsck/iscan.c:121 e2fsck/scantest.c:116 misc/e2image.c:489
msgid "while opening inode scan"
msgstr ""
-#: e2fsck/iscan.c:129 misc/e2image.c:498
+#: e2fsck/iscan.c:129 misc/e2image.c:507
#, fuzzy
msgid "while getting next inode"
msgstr "当获å–下一个inodeæ—¶"
@@ -211,31 +212,31 @@ msgstr "当获å–下一个inodeæ—¶"
msgid "%u inodes scanned.\n"
msgstr "%u 个 inode 被扫æ.\n"
-#: e2fsck/journal.c:505
+#: e2fsck/journal.c:507
msgid "reading journal superblock\n"
msgstr "读å–日志超级å—\n"
-#: e2fsck/journal.c:562
+#: e2fsck/journal.c:564
#, c-format
msgid "%s: no valid journal superblock found\n"
msgstr "%s: 没有å‘现日志超级å—\n"
-#: e2fsck/journal.c:571
+#: e2fsck/journal.c:573
#, fuzzy, c-format
msgid "%s: journal too short\n"
msgstr "%s: 日志过çŸ\n"
-#: e2fsck/journal.c:856
+#: e2fsck/journal.c:860
#, c-format
msgid "%s: recovering journal\n"
msgstr "%s: æ£åœ¨ä¿®å¤æ—¥å¿—\n"
-#: e2fsck/journal.c:858
+#: e2fsck/journal.c:862
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
msgstr "%s: 使用åªè¯»æ¨¡å¼æ—¶ä¸ä¼šè¿›è¡Œæ—¥å¿—ä¿®å¤\n"
-#: e2fsck/journal.c:879
+#: e2fsck/journal.c:887
#, c-format
msgid "while trying to re-open %s"
msgstr ""
@@ -407,70 +408,70 @@ msgstr "<ä¿ç•™çš„ inode 9>"
msgid "<Reserved inode 10>"
msgstr "<ä¿ç•™çš„ inode 10>"
-#: e2fsck/message.c:321
+#: e2fsck/message.c:323
#, c-format
msgid "regular file"
msgstr "一般文件"
-#: e2fsck/message.c:323
+#: e2fsck/message.c:325
#, c-format
msgid "directory"
msgstr "文件夹"
-#: e2fsck/message.c:325
+#: e2fsck/message.c:327
#, c-format
msgid "character device"
msgstr "å—符设备"
-#: e2fsck/message.c:327
+#: e2fsck/message.c:329
#, c-format
msgid "block device"
msgstr "å—设备"
-#: e2fsck/message.c:329
+#: e2fsck/message.c:331
#, c-format
msgid "named pipe"
msgstr "命å管é“"
-#: e2fsck/message.c:331
+#: e2fsck/message.c:333
#, c-format
msgid "symbolic link"
msgstr "符å·é“¾æŽ¥"
-#: e2fsck/message.c:333
+#: e2fsck/message.c:335
#, c-format
msgid "socket"
msgstr "套接å—"
-#: e2fsck/message.c:335
+#: e2fsck/message.c:337
#, fuzzy, c-format
msgid "unknown file type with mode 0%o"
msgstr "模å¼ä¸º 0%o 的未知文件类型"
-#: e2fsck/pass1b.c:215
+#: e2fsck/pass1b.c:220
msgid "multiply claimed inode map"
msgstr ""
-#: e2fsck/pass1b.c:567 e2fsck/pass1b.c:700
+#: e2fsck/pass1b.c:581 e2fsck/pass1b.c:714
#, c-format
msgid "internal error: can't find dup_blk for %u\n"
msgstr ""
-#: e2fsck/pass1b.c:743
+#: e2fsck/pass1b.c:757
msgid "returned from clone_file_block"
msgstr ""
-#: e2fsck/pass1b.c:762
+#: e2fsck/pass1b.c:776
#, c-format
msgid "internal error: couldn't lookup EA block record for %u"
msgstr ""
-#: e2fsck/pass1b.c:774
+#: e2fsck/pass1b.c:788
#, c-format
msgid "internal error: couldn't lookup EA inode record for %u"
msgstr ""
-#: e2fsck/pass1.c:430 e2fsck/pass2.c:780
+#: e2fsck/pass1.c:430 e2fsck/pass2.c:784
#, fuzzy
msgid "reading directory block"
msgstr "æ£åœ¨è¯»å–目录å—"
@@ -502,85 +503,85 @@ msgstr ""
msgid "getting next inode from scan"
msgstr ""
-#: e2fsck/pass1.c:1122
+#: e2fsck/pass1.c:1123
msgid "Pass 1"
msgstr "第1æ¥"
-#: e2fsck/pass1.c:1181
+#: e2fsck/pass1.c:1180
#, fuzzy, c-format
msgid "reading indirect blocks of inode %u"
msgstr "当读å–åå—inodeæ—¶"
-#: e2fsck/pass1.c:1223
+#: e2fsck/pass1.c:1224
#, fuzzy
msgid "bad inode map"
msgstr "<åå— inode>"
-#: e2fsck/pass1.c:1245
+#: e2fsck/pass1.c:1246
#, fuzzy
msgid "inode in bad block map"
msgstr "当更新åå—inodeæ—¶"
-#: e2fsck/pass1.c:1265
+#: e2fsck/pass1.c:1266
#, fuzzy
msgid "imagic inode map"
msgstr "ä¸èƒ½è¯» inode map"
-#: e2fsck/pass1.c:1292
+#: e2fsck/pass1.c:1293
msgid "multiply claimed block map"
msgstr ""
-#: e2fsck/pass1.c:1391
+#: e2fsck/pass1.c:1392
msgid "ext attr block map"
msgstr ""
-#: e2fsck/pass1.c:2107
+#: e2fsck/pass1.c:2134
#, c-format
-msgid "%6lu: expecting %6lu got phys %6lu (blkcnt %lld)\n"
+msgid "%6lu(%c): expecting %6lu got phys %6lu (blkcnt %lld)\n"
msgstr ""
-#: e2fsck/pass1.c:2420
+#: e2fsck/pass1.c:2449
msgid "block bitmap"
msgstr "å—ä½å›¾"
-#: e2fsck/pass1.c:2424
+#: e2fsck/pass1.c:2453
msgid "inode bitmap"
msgstr "inode ä½å›¾"
-#: e2fsck/pass1.c:2428
+#: e2fsck/pass1.c:2457
msgid "inode table"
msgstr "inode表"
-#: e2fsck/pass2.c:284
+#: e2fsck/pass2.c:285
msgid "Pass 2"
msgstr "第2æ¥"
-#: e2fsck/pass2.c:803
+#: e2fsck/pass2.c:807
msgid "Can not continue."
msgstr "æ— æ³•ç»§ç»."
-#: e2fsck/pass3.c:79
+#: e2fsck/pass3.c:76
msgid "inode done bitmap"
msgstr ""
-#: e2fsck/pass3.c:90
+#: e2fsck/pass3.c:84
#, fuzzy
msgid "Peak memory"
msgstr "内å˜è€—å°½"
-#: e2fsck/pass3.c:146
+#: e2fsck/pass3.c:134
msgid "Pass 3"
msgstr "第3æ¥"
-#: e2fsck/pass3.c:334
+#: e2fsck/pass3.c:320
msgid "inode loop detection bitmap"
msgstr ""
-#: e2fsck/pass4.c:196
+#: e2fsck/pass4.c:191
msgid "Pass 4"
msgstr "第4æ¥"
-#: e2fsck/pass5.c:70
+#: e2fsck/pass5.c:64
msgid "Pass 5"
msgstr "第5æ¥"
@@ -861,10 +862,10 @@ msgstr "@Sä¸çš„@i计数为 %i, at s %j.\n"
msgid "The Hurd does not support the filetype feature.\n"
msgstr ""
-#. @-expanded: superblock has an invalid ext3 journal (inode %i).\n
+#. @-expanded: superblock has an invalid journal (inode %i).\n
#: e2fsck/problem.c:187
-#, c-format
-msgid "@S has an @n ext3 @j (@i %i).\n"
+#, fuzzy, c-format
+msgid "@S has an @n @j (@i %i).\n"
msgstr "@S包å«@n ext3 @j(@i %i).\n"
#. @-expanded: External journal has multiple filesystem users (unsupported).\n
@@ -887,36 +888,38 @@ msgstr ""
msgid "External @j does not support this @f\n"
msgstr ""
-#. @-expanded: Ext3 journal superblock is unknown type %N (unsupported).\n
+#. @-expanded: filesystem journal superblock is unknown type %N (unsupported).\n
#. @-expanded: It is likely that your copy of e2fsck is old and/or doesn't support this journal
#. @-expanded: format.\n
#. @-expanded: It is also possible the journal superblock is corrupt.\n
#: e2fsck/problem.c:212
msgid ""
-"Ext3 @j @S is unknown type %N (unsupported).\n"
-"It is likely that your copy of e2fsck is old and/or doesn't support this @j format.\n"
+"@f @j @S is unknown type %N (unsupported).\n"
+"It is likely that your copy of e2fsck is old and/or doesn't support this @j "
+"format.\n"
"It is also possible the @j @S is corrupt.\n"
msgstr ""
-#. @-expanded: Ext3 journal superblock is corrupt.\n
+#. @-expanded: journal superblock is corrupt.\n
#: e2fsck/problem.c:220
-msgid "Ext3 @j @S is corrupt.\n"
+#, fuzzy
+msgid "@j @S is corrupt.\n"
msgstr "Ext3日志@j at S被æŸå.\n"
-#. @-expanded: superblock doesn't have has_journal flag, but has ext3 journal %s.\n
+#. @-expanded: superblock has_journal flag is clear, but a journal %s is present.\n
#: e2fsck/problem.c:225
#, c-format
-msgid "@S doesn't have has_ at j flag, but has ext3 @j %s.\n"
+msgid "@S has_ at j flag is clear, but a @j %s is present.\n"
msgstr ""
-#. @-expanded: superblock has ext3 needs_recovery flag set, but no journal.\n
+#. @-expanded: superblock needs_recovery flag is set, but no journal is present.\n
#: e2fsck/problem.c:230
-msgid "@S has ext3 needs_recovery flag set, but no @j.\n"
+msgid "@S needs_recovery flag is set, but no @j is present.\n"
msgstr ""
-#. @-expanded: ext3 recovery flag is clear, but journal has data.\n
+#. @-expanded: superblock needs_recovery flag is clear, but journal has data.\n
#: e2fsck/problem.c:235
-msgid "ext3 recovery flag is clear, but @j has data.\n"
+msgid "@S needs_recovery flag is clear, but @j has data.\n"
msgstr ""
#. @-expanded: Clear journal
@@ -925,67 +928,56 @@ msgstr ""
msgid "Clear @j"
msgstr "清除@j"
-#. @-expanded: Run journal anyway
-#: e2fsck/problem.c:245
-#, fuzzy
-msgid "Run @j anyway"
-msgstr "强制@j"
-
-#. @-expanded: Recovery flag not set in backup superblock, so running journal anyway.\n
-#: e2fsck/problem.c:250
-msgid "Recovery flag not set in backup @S, so running @j anyway.\n"
+#. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem.
+#: e2fsck/problem.c:245 e2fsck/problem.c:647
+msgid "@f has feature flag(s) set, but is a revision 0 @f. "
msgstr ""
#. @-expanded: %s orphaned inode %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n
-#: e2fsck/problem.c:255
+#: e2fsck/problem.c:250
msgid "%s @o @i %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n"
msgstr ""
#. @-expanded: illegal block #%B (%b) found in orphaned inode %i.\n
-#: e2fsck/problem.c:260
+#: e2fsck/problem.c:255
msgid "@I @b #%B (%b) found in @o @i %i.\n"
msgstr ""
#. @-expanded: Already cleared block #%B (%b) found in orphaned inode %i.\n
-#: e2fsck/problem.c:265
+#: e2fsck/problem.c:260
msgid "Already cleared @b #%B (%b) found in @o @i %i.\n"
msgstr ""
#. @-expanded: illegal orphaned inode %i in superblock.\n
-#: e2fsck/problem.c:270
+#: e2fsck/problem.c:265
#, c-format
msgid "@I @o @i %i in @S.\n"
msgstr "@Sä¸æœ‰@I at o@i %i.\n"
#. @-expanded: illegal inode %i in orphaned inode list.\n
-#: e2fsck/problem.c:275
+#: e2fsck/problem.c:270
#, c-format
msgid "@I @i %i in @o @i list.\n"
msgstr ""
-#. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem.
-#: e2fsck/problem.c:280 e2fsck/problem.c:643
-msgid "@f has feature flag(s) set, but is a revision 0 @f. "
-msgstr ""
-
-#. @-expanded: Ext3 journal superblock has an unknown read-only feature flag set.\n
-#: e2fsck/problem.c:285
-msgid "Ext3 @j @S has an unknown read-only feature flag set.\n"
+#. @-expanded: journal superblock has an unknown read-only feature flag set.\n
+#: e2fsck/problem.c:275
+msgid "@j @S has an unknown read-only feature flag set.\n"
msgstr ""
-#. @-expanded: Ext3 journal superblock has an unknown incompatible feature flag set.\n
-#: e2fsck/problem.c:290
-msgid "Ext3 @j @S has an unknown incompatible feature flag set.\n"
+#. @-expanded: journal superblock has an unknown incompatible feature flag set.\n
+#: e2fsck/problem.c:280
+msgid "@j @S has an unknown incompatible feature flag set.\n"
msgstr ""
#. @-expanded: journal version not supported by this e2fsck.\n
-#: e2fsck/problem.c:295
+#: e2fsck/problem.c:285
msgid "@j version not supported by this e2fsck.\n"
msgstr "e2fsckä¸æ”¯æŒæ¤@j版本.\n"
#. @-expanded: Moving journal from /%s to hidden inode.\n
#. @-expanded: \n
-#: e2fsck/problem.c:300
+#: e2fsck/problem.c:290
#, c-format
msgid ""
"Moving @j from /%s to hidden @i.\n"
@@ -994,7 +986,7 @@ msgstr ""
#. @-expanded: Error moving journal: %m\n
#. @-expanded: \n
-#: e2fsck/problem.c:305
+#: e2fsck/problem.c:295
#, fuzzy, c-format
msgid ""
"Error moving @j: %m\n"
@@ -1006,13 +998,24 @@ msgstr ""
#. @-expanded: Found invalid V2 journal superblock fields (from V1 journal).\n
#. @-expanded: Clearing fields beyond the V1 journal superblock...\n
#. @-expanded: \n
-#: e2fsck/problem.c:310
+#: e2fsck/problem.c:300
msgid ""
"Found @n V2 @j @S fields (from V1 @j).\n"
"Clearing fields beyond the V1 @j @S...\n"
"\n"
msgstr ""
+#. @-expanded: Run journal anyway
+#: e2fsck/problem.c:306
+#, fuzzy
+msgid "Run @j anyway"
+msgstr "强制@j"
+
+#. @-expanded: Recovery flag not set in backup superblock, so running journal anyway.\n
+#: e2fsck/problem.c:311
+msgid "Recovery flag not set in backup @S, so running @j anyway.\n"
+msgstr ""
+
#. @-expanded: Backing up journal inode block information.\n
#. @-expanded: \n
#: e2fsck/problem.c:316
@@ -1097,119 +1100,123 @@ msgstr "最åŽä¸€ä¸ª@gçš„@b at B未åˆå§‹åŒ–. "
msgid "Journal transaction %i was corrupt, replay was aborted.\n"
msgstr ""
+#: e2fsck/problem.c:385
+msgid "The test_fs flag is set (and ext4 is available). "
+msgstr ""
+
#. @-expanded: Pass 1: Checking inodes, blocks, and sizes\n
-#: e2fsck/problem.c:388
+#: e2fsck/problem.c:392
msgid "Pass 1: Checking @is, @bs, and sizes\n"
msgstr "第一æ¥: 检查@i, at b,和大å°\n"
#. @-expanded: root inode is not a directory.
-#: e2fsck/problem.c:392
+#: e2fsck/problem.c:396
#, fuzzy
msgid "@r is not a @d. "
msgstr "@rä¸æ˜¯ä¸€ä¸ª@d. "
#. @-expanded: root inode has dtime set (probably due to old mke2fs).
-#: e2fsck/problem.c:397
+#: e2fsck/problem.c:401
msgid "@r has dtime set (probably due to old mke2fs). "
msgstr ""
#. @-expanded: Reserved inode %i (%Q) has invalid mode.
-#: e2fsck/problem.c:402
+#: e2fsck/problem.c:406
msgid "Reserved @i %i (%Q) has @n mode. "
msgstr "ä¿ç•™çš„@i %i (%Q) 的模å¼æ— 效. "
#. @-expanded: deleted inode %i has zero dtime.
-#: e2fsck/problem.c:407
+#: e2fsck/problem.c:411
#, c-format
msgid "@D @i %i has zero dtime. "
msgstr ""
#. @-expanded: inode %i is in use, but has dtime set.
-#: e2fsck/problem.c:412
+#: e2fsck/problem.c:416
#, c-format
msgid "@i %i is in use, but has dtime set. "
msgstr ""
#. @-expanded: inode %i is a zero-length directory.
-#: e2fsck/problem.c:417
+#: e2fsck/problem.c:421
#, c-format
msgid "@i %i is a @z @d. "
msgstr ""
#. @-expanded: group %g's block bitmap at %b conflicts with some other fs block.\n
-#: e2fsck/problem.c:422
+#: e2fsck/problem.c:426
msgid "@g %g's @b @B at %b @C.\n"
msgstr ""
#. @-expanded: group %g's inode bitmap at %b conflicts with some other fs block.\n
-#: e2fsck/problem.c:427
+#: e2fsck/problem.c:431
msgid "@g %g's @i @B at %b @C.\n"
msgstr ""
#. @-expanded: group %g's inode table at %b conflicts with some other fs block.\n
-#: e2fsck/problem.c:432
+#: e2fsck/problem.c:436
msgid "@g %g's @i table at %b @C.\n"
msgstr ""
#. @-expanded: group %g's block bitmap (%b) is bad.
-#: e2fsck/problem.c:437
+#: e2fsck/problem.c:441
msgid "@g %g's @b @B (%b) is bad. "
msgstr ""
#. @-expanded: group %g's inode bitmap (%b) is bad.
-#: e2fsck/problem.c:442
+#: e2fsck/problem.c:446
msgid "@g %g's @i @B (%b) is bad. "
msgstr ""
#. @-expanded: inode %i, i_size is %Is, should be %N.
-#: e2fsck/problem.c:447
+#: e2fsck/problem.c:451
msgid "@i %i, i_size is %Is, @s %N. "
msgstr ""
#. @-expanded: inode %i, i_blocks is %Ib, should be %N.
-#: e2fsck/problem.c:452
+#: e2fsck/problem.c:456
msgid "@i %i, i_ at bs is %Ib, @s %N. "
msgstr ""
#. @-expanded: illegal block #%B (%b) in inode %i.
-#: e2fsck/problem.c:457
+#: e2fsck/problem.c:461
msgid "@I @b #%B (%b) in @i %i. "
msgstr ""
#. @-expanded: block #%B (%b) overlaps filesystem metadata in inode %i.
-#: e2fsck/problem.c:462
+#: e2fsck/problem.c:466
msgid "@b #%B (%b) overlaps @f metadata in @i %i. "
msgstr ""
#. @-expanded: inode %i has illegal block(s).
-#: e2fsck/problem.c:467
+#: e2fsck/problem.c:471
#, c-format
msgid "@i %i has illegal @b(s). "
msgstr "@i %i ä¸åŒ…å«éžæ³•@b. "
#. @-expanded: Too many illegal blocks in inode %i.\n
-#: e2fsck/problem.c:472
+#: e2fsck/problem.c:476
#, fuzzy, c-format
msgid "Too many illegal @bs in @i %i.\n"
msgstr "@i %i ä¸åŒ…å«äº†è¿‡å¤šçš„éžæ³•@b.\n"
#. @-expanded: illegal block #%B (%b) in bad block inode.
-#: e2fsck/problem.c:477
+#: e2fsck/problem.c:481
msgid "@I @b #%B (%b) in bad @b @i. "
msgstr ""
#. @-expanded: Bad block inode has illegal block(s).
-#: e2fsck/problem.c:482
+#: e2fsck/problem.c:486
msgid "Bad @b @i has illegal @b(s). "
msgstr ""
#. @-expanded: Duplicate or bad block in use!\n
-#: e2fsck/problem.c:487
+#: e2fsck/problem.c:491
msgid "Duplicate or bad @b in use!\n"
msgstr ""
#. @-expanded: Bad block %b used as bad block inode indirect block.
-#: e2fsck/problem.c:492
+#: e2fsck/problem.c:496
msgid "Bad @b %b used as bad @b @i indirect @b. "
msgstr ""
@@ -1217,7 +1224,7 @@ msgstr ""
#. @-expanded: The bad block inode has probably been corrupted. You probably\n
#. @-expanded: should stop now and run e2fsck -c to scan for bad blocks\n
#. @-expanded: in the filesystem.\n
-#: e2fsck/problem.c:497
+#: e2fsck/problem.c:501
msgid ""
"\n"
"The bad @b @i has probably been corrupted. You probably\n"
@@ -1227,7 +1234,7 @@ msgstr ""
#. @-expanded: \n
#. @-expanded: If the block is really bad, the filesystem can not be fixed.\n
-#: e2fsck/problem.c:504
+#: e2fsck/problem.c:508
msgid ""
"\n"
"If the @b is really bad, the @f can not be fixed.\n"
@@ -1236,7 +1243,7 @@ msgstr ""
#. @-expanded: You can remove this block from the bad block list and hope\n
#. @-expanded: that the block is really OK. But there are no guarantees.\n
#. @-expanded: \n
-#: e2fsck/problem.c:509
+#: e2fsck/problem.c:513
msgid ""
"You can remove this @b from the bad @b list and hope\n"
"that the @b is really OK. But there are no guarantees.\n"
@@ -1244,121 +1251,121 @@ msgid ""
msgstr ""
#. @-expanded: The primary superblock (%b) is on the bad block list.\n
-#: e2fsck/problem.c:515
+#: e2fsck/problem.c:519
msgid "The primary @S (%b) is on the bad @b list.\n"
msgstr ""
#. @-expanded: Block %b in the primary group descriptors is on the bad block list\n
-#: e2fsck/problem.c:520
+#: e2fsck/problem.c:524
msgid "Block %b in the primary @g descriptors is on the bad @b list\n"
msgstr ""
#. @-expanded: Warning: Group %g's superblock (%b) is bad.\n
-#: e2fsck/problem.c:526
+#: e2fsck/problem.c:530
msgid "Warning: Group %g's @S (%b) is bad.\n"
msgstr ""
#. @-expanded: Warning: Group %g's copy of the group descriptors has a bad block (%b).\n
-#: e2fsck/problem.c:531
+#: e2fsck/problem.c:535
msgid "Warning: Group %g's copy of the @g descriptors has a bad @b (%b).\n"
msgstr ""
#. @-expanded: Programming error? block #%b claimed for no reason in process_bad_block.\n
-#: e2fsck/problem.c:537
+#: e2fsck/problem.c:541
msgid "Programming error? @b #%b claimed for no reason in process_bad_ at b.\n"
msgstr ""
#. @-expanded: error allocating %N contiguous block(s) in block group %g for %s: %m\n
-#: e2fsck/problem.c:543
+#: e2fsck/problem.c:547
msgid "@A %N contiguous @b(s) in @b @g %g for %s: %m\n"
msgstr ""
#. @-expanded: error allocating block buffer for relocating %s\n
-#: e2fsck/problem.c:548
+#: e2fsck/problem.c:552
#, c-format
msgid "@A @b buffer for relocating %s\n"
msgstr ""
#. @-expanded: Relocating group %g's %s from %b to %c...\n
-#: e2fsck/problem.c:553
+#: e2fsck/problem.c:557
msgid "Relocating @g %g's %s from %b to %c...\n"
msgstr ""
#. @-expanded: Relocating group %g's %s to %c...\n
-#: e2fsck/problem.c:558
+#: e2fsck/problem.c:562
#, c-format
msgid "Relocating @g %g's %s to %c...\n"
msgstr ""
#. @-expanded: Warning: could not read block %b of %s: %m\n
-#: e2fsck/problem.c:563
+#: e2fsck/problem.c:567
msgid "Warning: could not read @b %b of %s: %m\n"
msgstr "è¦å‘Š: æ— æ³•ä»Ž%sä¸è¯»å–@b %b: %m\n"
#. @-expanded: Warning: could not write block %b for %s: %m\n
-#: e2fsck/problem.c:568
+#: e2fsck/problem.c:572
msgid "Warning: could not write @b %b for %s: %m\n"
msgstr "è¦å‘Š: æ— æ³•å‘%sä¸å†™å…¥@b %b: %m\n"
#. @-expanded: error allocating inode bitmap (%N): %m\n
-#: e2fsck/problem.c:573 e2fsck/problem.c:1369
+#: e2fsck/problem.c:577 e2fsck/problem.c:1383
msgid "@A @i @B (%N): %m\n"
msgstr ""
#. @-expanded: error allocating block bitmap (%N): %m\n
-#: e2fsck/problem.c:578
+#: e2fsck/problem.c:582
msgid "@A @b @B (%N): %m\n"
msgstr ""
#. @-expanded: error allocating icount link information: %m\n
-#: e2fsck/problem.c:583
+#: e2fsck/problem.c:587
#, c-format
msgid "@A icount link information: %m\n"
msgstr ""
#. @-expanded: error allocating directory block array: %m\n
-#: e2fsck/problem.c:588
+#: e2fsck/problem.c:592
#, c-format
msgid "@A @d @b array: %m\n"
msgstr "分é…@d at b数组时出错: %m\n"
#. @-expanded: Error while scanning inodes (%i): %m\n
-#: e2fsck/problem.c:593
+#: e2fsck/problem.c:597
#, c-format
msgid "Error while scanning @is (%i): %m\n"
msgstr ""
#. @-expanded: Error while iterating over blocks in inode %i: %m\n
-#: e2fsck/problem.c:598
+#: e2fsck/problem.c:602
#, c-format
msgid "Error while iterating over @bs in @i %i: %m\n"
msgstr ""
#. @-expanded: Error storing inode count information (inode=%i, count=%N): %m\n
-#: e2fsck/problem.c:603
+#: e2fsck/problem.c:607
msgid "Error storing @i count information (@i=%i, count=%N): %m\n"
msgstr ""
#. @-expanded: Error storing directory block information (inode=%i, block=%b, num=%N): %m\n
-#: e2fsck/problem.c:608
+#: e2fsck/problem.c:612
msgid "Error storing @d @b information (@i=%i, @b=%b, num=%N): %m\n"
msgstr ""
#. @-expanded: Error reading inode %i: %m\n
-#: e2fsck/problem.c:614
+#: e2fsck/problem.c:618
#, c-format
msgid "Error reading @i %i: %m\n"
msgstr "读å–@i %i出错: %m\n"
#. @-expanded: inode %i has imagic flag set.
-#: e2fsck/problem.c:622
+#: e2fsck/problem.c:626
#, c-format
msgid "@i %i has imagic flag set. "
msgstr ""
#. @-expanded: Special (device/socket/fifo/symlink) file (inode %i) has immutable\n
#. @-expanded: or append-only flag set.
-#: e2fsck/problem.c:627
+#: e2fsck/problem.c:631
#, c-format
msgid ""
"Special (@v/socket/fifo/symlink) file (@i %i) has immutable\n"
@@ -1366,211 +1373,214 @@ msgid ""
msgstr ""
#. @-expanded: inode %i has compression flag set on filesystem without compression support.
-#: e2fsck/problem.c:633
+#: e2fsck/problem.c:637
#, c-format
msgid "@i %i has @cion flag set on @f without @cion support. "
msgstr ""
#. @-expanded: Special (device/socket/fifo) inode %i has non-zero size.
-#: e2fsck/problem.c:638
+#: e2fsck/problem.c:642
#, c-format
msgid "Special (@v/socket/fifo) @i %i has non-zero size. "
msgstr ""
#. @-expanded: journal inode is not in use, but contains data.
-#: e2fsck/problem.c:648
+#: e2fsck/problem.c:652
msgid "@j @i is not in use, but contains data. "
msgstr ""
#. @-expanded: journal is not regular file.
-#: e2fsck/problem.c:653
+#: e2fsck/problem.c:657
msgid "@j is not regular file. "
msgstr "@jä¸æ˜¯æ™®é€šæ–‡ä»¶. "
#. @-expanded: inode %i was part of the orphaned inode list.
-#: e2fsck/problem.c:658
+#: e2fsck/problem.c:662
#, c-format
msgid "@i %i was part of the @o @i list. "
msgstr ""
#. @-expanded: inodes that were part of a corrupted orphan linked list found.
-#: e2fsck/problem.c:664
+#: e2fsck/problem.c:668
msgid "@is that were part of a corrupted orphan linked list found. "
msgstr ""
#. @-expanded: error allocating refcount structure (%N): %m\n
-#: e2fsck/problem.c:669
+#: e2fsck/problem.c:673
msgid "@A refcount structure (%N): %m\n"
msgstr ""
#. @-expanded: Error reading extended attribute block %b for inode %i.
-#: e2fsck/problem.c:674
+#: e2fsck/problem.c:678
msgid "Error reading @a @b %b for @i %i. "
msgstr ""
#. @-expanded: inode %i has a bad extended attribute block %b.
-#: e2fsck/problem.c:679
+#: e2fsck/problem.c:683
msgid "@i %i has a bad @a @b %b. "
msgstr ""
#. @-expanded: Error reading extended attribute block %b (%m).
-#: e2fsck/problem.c:684
+#: e2fsck/problem.c:688
msgid "Error reading @a @b %b (%m). "
msgstr ""
#. @-expanded: extended attribute block %b has reference count %B, should be %N.
-#: e2fsck/problem.c:689
+#: e2fsck/problem.c:693
msgid "@a @b %b has reference count %B, @s %N. "
msgstr ""
#. @-expanded: Error writing extended attribute block %b (%m).
-#: e2fsck/problem.c:694
+#: e2fsck/problem.c:698
msgid "Error writing @a @b %b (%m). "
msgstr ""
#. @-expanded: extended attribute block %b has h_blocks > 1.
-#: e2fsck/problem.c:699
+#: e2fsck/problem.c:703
msgid "@a @b %b has h_ at bs > 1. "
msgstr ""
#. @-expanded: error allocating extended attribute block %b.
-#: e2fsck/problem.c:704
+#: e2fsck/problem.c:708
msgid "@A @a @b %b. "
msgstr ""
#. @-expanded: extended attribute block %b is corrupt (allocation collision).
-#: e2fsck/problem.c:709
+#: e2fsck/problem.c:713
msgid "@a @b %b is corrupt (allocation collision). "
msgstr ""
#. @-expanded: extended attribute block %b is corrupt (invalid name).
-#: e2fsck/problem.c:714
+#: e2fsck/problem.c:718
msgid "@a @b %b is corrupt (@n name). "
msgstr ""
#. @-expanded: extended attribute block %b is corrupt (invalid value).
-#: e2fsck/problem.c:719
+#: e2fsck/problem.c:723
msgid "@a @b %b is corrupt (@n value). "
msgstr ""
#. @-expanded: inode %i is too big.
-#: e2fsck/problem.c:724
+#: e2fsck/problem.c:728
#, c-format
msgid "@i %i is too big. "
msgstr "@i %i 过大. "
#. @-expanded: block #%B (%b) causes directory to be too big.
-#: e2fsck/problem.c:728
+#: e2fsck/problem.c:732
msgid "@b #%B (%b) causes @d to be too big. "
msgstr ""
#. @-expanded: block #%B (%b) causes file to be too big.
-#: e2fsck/problem.c:733
+#: e2fsck/problem.c:737
msgid "@b #%B (%b) causes file to be too big. "
msgstr ""
#. @-expanded: block #%B (%b) causes symlink to be too big.
-#: e2fsck/problem.c:738
+#: e2fsck/problem.c:742
msgid "@b #%B (%b) causes symlink to be too big. "
msgstr ""
#. @-expanded: inode %i has INDEX_FL flag set on filesystem without htree support.\n
-#: e2fsck/problem.c:743
+#: e2fsck/problem.c:747
#, c-format
msgid "@i %i has INDEX_FL flag set on @f without htree support.\n"
msgstr ""
#. @-expanded: inode %i has INDEX_FL flag set but is not a directory.\n
-#: e2fsck/problem.c:748
+#: e2fsck/problem.c:752
#, c-format
msgid "@i %i has INDEX_FL flag set but is not a @d.\n"
msgstr ""
#. @-expanded: HTREE directory inode %i has an invalid root node.\n
-#: e2fsck/problem.c:753
+#: e2fsck/problem.c:757
#, c-format
msgid "@h %i has an @n root node.\n"
msgstr ""
#. @-expanded: HTREE directory inode %i has an unsupported hash version (%N)\n
-#: e2fsck/problem.c:758
+#: e2fsck/problem.c:762
msgid "@h %i has an unsupported hash version (%N)\n"
msgstr ""
#. @-expanded: HTREE directory inode %i uses an incompatible htree root node flag.\n
-#: e2fsck/problem.c:763
+#: e2fsck/problem.c:767
#, c-format
msgid "@h %i uses an incompatible htree root node flag.\n"
msgstr ""
#. @-expanded: HTREE directory inode %i has a tree depth (%N) which is too big\n
-#: e2fsck/problem.c:768
+#: e2fsck/problem.c:772
msgid "@h %i has a tree depth (%N) which is too big\n"
msgstr ""
#. @-expanded: Bad block inode has an indirect block (%b) that conflicts with\n
#. @-expanded: filesystem metadata.
-#: e2fsck/problem.c:773
+#: e2fsck/problem.c:777
msgid ""
"Bad @b @i has an indirect @b (%b) that conflicts with\n"
"@f metadata. "
msgstr ""
#. @-expanded: Resize inode (re)creation failed: %m.
-#: e2fsck/problem.c:779
+#: e2fsck/problem.c:783
#, c-format
msgid "Resize @i (re)creation failed: %m."
msgstr ""
#. @-expanded: inode %i has a extra size (%IS) which is invalid\n
-#: e2fsck/problem.c:784
+#: e2fsck/problem.c:788
msgid "@i %i has a extra size (%IS) which is @n\n"
msgstr ""
#. @-expanded: extended attribute in inode %i has a namelen (%N) which is invalid\n
-#: e2fsck/problem.c:789
+#: e2fsck/problem.c:793
msgid "@a in @i %i has a namelen (%N) which is @n\n"
msgstr ""
-#. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n
-#: e2fsck/problem.c:794
-msgid "@a in @i %i has a value size (%N) which is @n\n"
-msgstr ""
-
#. @-expanded: extended attribute in inode %i has a value offset (%N) which is invalid\n
-#: e2fsck/problem.c:799
+#: e2fsck/problem.c:798
msgid "@a in @i %i has a value offset (%N) which is @n\n"
msgstr ""
#. @-expanded: extended attribute in inode %i has a value block (%N) which is invalid (must be 0)\n
-#: e2fsck/problem.c:804
+#: e2fsck/problem.c:803
msgid "@a in @i %i has a value @b (%N) which is @n (must be 0)\n"
msgstr ""
+#. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n
+#: e2fsck/problem.c:808
+msgid "@a in @i %i has a value size (%N) which is @n\n"
+msgstr ""
+
#. @-expanded: extended attribute in inode %i has a hash (%N) which is invalid\n
-#: e2fsck/problem.c:809
+#: e2fsck/problem.c:813
msgid "@a in @i %i has a hash (%N) which is @n\n"
msgstr ""
#. @-expanded: inode %i is a %It but it looks like it is really a directory.\n
-#: e2fsck/problem.c:814
+#: e2fsck/problem.c:818
msgid "@i %i is a %It but it looks like it is really a directory.\n"
msgstr ""
#. @-expanded: Error while reading over extent tree in inode %i: %m\n
-#: e2fsck/problem.c:819
+#: e2fsck/problem.c:823
#, c-format
msgid "Error while reading over @x tree in @i %i: %m\n"
msgstr ""
-#: e2fsck/problem.c:824
-#, c-format
-msgid "Error while deleting extent: %m\n"
+#. @-expanded: Failed to iterate extents in inode %i\n
+#. @-expanded: \t(op %s, blk %b, lblk %c): %m\n
+#: e2fsck/problem.c:828
+msgid ""
+"Failed to iterate extents in @i %i\n"
+"\t(op %s, blk %b, lblk %c): %m\n"
msgstr ""
#. @-expanded: inode %i has an invalid extent\n
#. @-expanded: \t(logical block %c, invalid physical block %b, len %N)\n
-#: e2fsck/problem.c:829
+#: e2fsck/problem.c:834
msgid ""
"@i %i has an @n extent\n"
"\t(logical @b %c, @n physical @b %b, len %N)\n"
@@ -1578,47 +1588,52 @@ msgstr ""
#. @-expanded: inode %i has an invalid extent\n
#. @-expanded: \t(logical block %c, physical block %b, invalid len %N)\n
-#: e2fsck/problem.c:834
+#: e2fsck/problem.c:839
msgid ""
"@i %i has an @n extent\n"
"\t(logical @b %c, physical @b %b, @n len %N)\n"
msgstr ""
#. @-expanded: inode %i has EXTENTS_FL flag set on filesystem without extents support.\n
-#: e2fsck/problem.c:839
+#: e2fsck/problem.c:844
#, c-format
msgid "@i %i has EXTENTS_FL flag set on @f without extents support.\n"
msgstr ""
#. @-expanded: inode %i is in extent format, but superblock is missing EXTENTS feature\n
-#: e2fsck/problem.c:844
+#: e2fsck/problem.c:849
#, c-format
msgid "@i %i is in extent format, but @S is missing EXTENTS feature\n"
msgstr ""
#. @-expanded: inode %i missing EXTENT_FL, but is in extents format\n
-#: e2fsck/problem.c:849
+#: e2fsck/problem.c:854
#, c-format
msgid "@i %i missing EXTENT_FL, but is in extents format\n"
msgstr ""
-#: e2fsck/problem.c:854
+#: e2fsck/problem.c:859
#, c-format
msgid "Fast symlink %i has EXTENT_FL set. "
msgstr ""
#. @-expanded: inode %i has out of order extents\n
#. @-expanded: \t(invalid logical block %c, physical block %b, len %N)\n
-#: e2fsck/problem.c:859
+#: e2fsck/problem.c:864
msgid ""
"@i %i has out of order extents\n"
"\t(@n logical @b %c, physical @b %b, len %N)\n"
msgstr ""
+#. @-expanded: inode %i has an invalid extent node (blk %b, lblk %c)\n
+#: e2fsck/problem.c:868
+msgid "@i %i has an invalid extent node (blk %b, lblk %c)\n"
+msgstr ""
+
#. @-expanded: \n
#. @-expanded: Running additional passes to resolve blocks claimed by more than one inode...\n
#. @-expanded: Pass 1B: Rescanning for multiply-claimed blocks\n
-#: e2fsck/problem.c:866
+#: e2fsck/problem.c:875
msgid ""
"\n"
"Running additional passes to resolve @bs claimed by more than one @i...\n"
@@ -1626,64 +1641,64 @@ msgid ""
msgstr ""
#. @-expanded: multiply-claimed block(s) in inode %i:
-#: e2fsck/problem.c:872
+#: e2fsck/problem.c:881
#, c-format
msgid "@m @b(s) in @i %i:"
msgstr ""
-#: e2fsck/problem.c:887
+#: e2fsck/problem.c:896
#, c-format
msgid "Error while scanning inodes (%i): %m\n"
msgstr ""
#. @-expanded: error allocating inode bitmap (inode_dup_map): %m\n
-#: e2fsck/problem.c:892
+#: e2fsck/problem.c:901
#, c-format
msgid "@A @i @B (@i_dup_map): %m\n"
msgstr ""
#. @-expanded: Error while iterating over blocks in inode %i (%s): %m\n
-#: e2fsck/problem.c:897
+#: e2fsck/problem.c:906
#, c-format
msgid "Error while iterating over @bs in @i %i (%s): %m\n"
msgstr ""
#. @-expanded: Error adjusting refcount for extended attribute block %b (inode %i): %m\n
-#: e2fsck/problem.c:902 e2fsck/problem.c:1218
+#: e2fsck/problem.c:911 e2fsck/problem.c:1227
msgid "Error adjusting refcount for @a @b %b (@i %i): %m\n"
msgstr ""
#. @-expanded: Pass 1C: Scanning directories for inodes with multiply-claimed blocks\n
-#: e2fsck/problem.c:908
+#: e2fsck/problem.c:917
msgid "Pass 1C: Scanning directories for @is with @m @bs\n"
msgstr ""
#. @-expanded: Pass 1D: Reconciling multiply-claimed blocks\n
-#: e2fsck/problem.c:914
+#: e2fsck/problem.c:923
msgid "Pass 1D: Reconciling @m @bs\n"
msgstr ""
#. @-expanded: File %Q (inode #%i, mod time %IM) \n
#. @-expanded: has %B multiply-claimed block(s), shared with %N file(s):\n
-#: e2fsck/problem.c:919
+#: e2fsck/problem.c:928
msgid ""
"File %Q (@i #%i, mod time %IM) \n"
" has %B @m @b(s), shared with %N file(s):\n"
msgstr ""
#. @-expanded: \t%Q (inode #%i, mod time %IM)\n
-#: e2fsck/problem.c:925
+#: e2fsck/problem.c:934
msgid "\t%Q (@i #%i, mod time %IM)\n"
msgstr ""
#. @-expanded: \t<filesystem metadata>\n
-#: e2fsck/problem.c:930
+#: e2fsck/problem.c:939
msgid "\t<@f metadata>\n"
msgstr "\t<@f元数æ®>\n"
#. @-expanded: (There are %N inodes containing multiply-claimed blocks.)\n
#. @-expanded: \n
-#: e2fsck/problem.c:935
+#: e2fsck/problem.c:944
msgid ""
"(There are %N @is containing @m @bs.)\n"
"\n"
@@ -1691,322 +1706,322 @@ msgstr ""
#. @-expanded: multiply-claimed blocks already reassigned or cloned.\n
#. @-expanded: \n
-#: e2fsck/problem.c:940
+#: e2fsck/problem.c:949
msgid ""
"@m @bs already reassigned or cloned.\n"
"\n"
msgstr ""
-#: e2fsck/problem.c:953
+#: e2fsck/problem.c:962
#, c-format
msgid "Couldn't clone file: %m\n"
msgstr ""
#. @-expanded: Pass 2: Checking directory structure\n
-#: e2fsck/problem.c:959
+#: e2fsck/problem.c:968
msgid "Pass 2: Checking @d structure\n"
msgstr "第二æ¥: 检查目录结构\n"
#. @-expanded: invalid inode number for '.' in directory inode %i.\n
-#: e2fsck/problem.c:964
+#: e2fsck/problem.c:973
#, c-format
msgid "@n @i number for '.' in @d @i %i.\n"
msgstr ""
#. @-expanded: entry '%Dn' in %p (%i) has invalid inode #: %Di.\n
-#: e2fsck/problem.c:969
+#: e2fsck/problem.c:978
msgid "@E has @n @i #: %Di.\n"
msgstr ""
#. @-expanded: entry '%Dn' in %p (%i) has deleted/unused inode %Di.
-#: e2fsck/problem.c:974
+#: e2fsck/problem.c:983
msgid "@E has @D/unused @i %Di. "
msgstr ""
#. @-expanded: entry '%Dn' in %p (%i) is a link to '.'
-#: e2fsck/problem.c:979
+#: e2fsck/problem.c:988
msgid "@E @L to '.' "
msgstr ""
#. @-expanded: entry '%Dn' in %p (%i) points to inode (%Di) located in a bad block.\n
-#: e2fsck/problem.c:984
+#: e2fsck/problem.c:993
msgid "@E points to @i (%Di) located in a bad @b.\n"
msgstr ""
#. @-expanded: entry '%Dn' in %p (%i) is a link to directory %P (%Di).\n
-#: e2fsck/problem.c:989
+#: e2fsck/problem.c:998
msgid "@E @L to @d %P (%Di).\n"
msgstr ""
#. @-expanded: entry '%Dn' in %p (%i) is a link to the root inode.\n
-#: e2fsck/problem.c:994
+#: e2fsck/problem.c:1003
msgid "@E @L to the @r.\n"
msgstr ""
#. @-expanded: entry '%Dn' in %p (%i) has illegal characters in its name.\n
-#: e2fsck/problem.c:999
+#: e2fsck/problem.c:1008
msgid "@E has illegal characters in its name.\n"
msgstr ""
#. @-expanded: Missing '.' in directory inode %i.\n
-#: e2fsck/problem.c:1004
+#: e2fsck/problem.c:1013
#, c-format
msgid "Missing '.' in @d @i %i.\n"
msgstr "@d at i %i ä¸ç¼ºå°‘ '.'.\n"
#. @-expanded: Missing '..' in directory inode %i.\n
-#: e2fsck/problem.c:1009
+#: e2fsck/problem.c:1018
#, c-format
msgid "Missing '..' in @d @i %i.\n"
msgstr "@d at i %i ä¸ç¼ºå°‘ '..'.\n"
#. @-expanded: First entry '%Dn' (inode=%Di) in directory inode %i (%p) should be '.'\n
-#: e2fsck/problem.c:1014
+#: e2fsck/problem.c:1023
msgid "First @e '%Dn' (@i=%Di) in @d @i %i (%p) @s '.'\n"
msgstr ""
#. @-expanded: Second entry '%Dn' (inode=%Di) in directory inode %i should be '..'\n
-#: e2fsck/problem.c:1019
+#: e2fsck/problem.c:1028
msgid "Second @e '%Dn' (@i=%Di) in @d @i %i @s '..'\n"
msgstr ""
#. @-expanded: i_faddr for inode %i (%Q) is %IF, should be zero.\n
-#: e2fsck/problem.c:1024
+#: e2fsck/problem.c:1033
msgid "i_faddr @F %IF, @s zero.\n"
msgstr ""
#. @-expanded: i_file_acl for inode %i (%Q) is %If, should be zero.\n
-#: e2fsck/problem.c:1029
+#: e2fsck/problem.c:1038
msgid "i_file_acl @F %If, @s zero.\n"
msgstr ""
#. @-expanded: i_dir_acl for inode %i (%Q) is %Id, should be zero.\n
-#: e2fsck/problem.c:1034
+#: e2fsck/problem.c:1043
msgid "i_dir_acl @F %Id, @s zero.\n"
msgstr ""
#. @-expanded: i_frag for inode %i (%Q) is %N, should be zero.\n
-#: e2fsck/problem.c:1039
+#: e2fsck/problem.c:1048
msgid "i_frag @F %N, @s zero.\n"
msgstr ""
#. @-expanded: i_fsize for inode %i (%Q) is %N, should be zero.\n
-#: e2fsck/problem.c:1044
+#: e2fsck/problem.c:1053
msgid "i_fsize @F %N, @s zero.\n"
msgstr ""
#. @-expanded: inode %i (%Q) has invalid mode (%Im).\n
-#: e2fsck/problem.c:1049
+#: e2fsck/problem.c:1058
#, fuzzy
msgid "@i %i (%Q) has @n mode (%Im).\n"
msgstr "@i %i (%Q) 有@næ¨¡å¼ (%Im).\n"
#. @-expanded: directory inode %i, block %B, offset %N: directory corrupted\n
-#: e2fsck/problem.c:1054
+#: e2fsck/problem.c:1063
msgid "@d @i %i, @b %B, offset %N: @d corrupted\n"
msgstr "@d at i %i, 第 %B @b, åç§»é‡ %N: @dæŸå\n"
#. @-expanded: directory inode %i, block %B, offset %N: filename too long\n
-#: e2fsck/problem.c:1059
+#: e2fsck/problem.c:1068
msgid "@d @i %i, @b %B, offset %N: filename too long\n"
msgstr "@d at i %i, 第 %B @b, åç§»é‡ %N: 文件å过长\n"
#. @-expanded: directory inode %i has an unallocated block #%B.
-#: e2fsck/problem.c:1064
+#: e2fsck/problem.c:1073
msgid "@d @i %i has an unallocated @b #%B. "
msgstr "@d at i %i å«æœ‰æœªåˆ†é…@b #%B. "
#. @-expanded: '.' directory entry in directory inode %i is not NULL terminated\n
-#: e2fsck/problem.c:1069
+#: e2fsck/problem.c:1078
#, c-format
msgid "'.' @d @e in @d @i %i is not NULL terminated\n"
msgstr "@d at i %i ä¸çš„ '.' @d at e 没有以NULL终æ¢\n"
#. @-expanded: '..' directory entry in directory inode %i is not NULL terminated\n
-#: e2fsck/problem.c:1074
+#: e2fsck/problem.c:1083
#, c-format
msgid "'..' @d @e in @d @i %i is not NULL terminated\n"
msgstr "@d at i %i ä¸çš„ '..' @d at e 没有以NULL终æ¢\n"
#. @-expanded: inode %i (%Q) is an illegal character device.\n
-#: e2fsck/problem.c:1079
+#: e2fsck/problem.c:1088
msgid "@i %i (%Q) is an @I character @v.\n"
msgstr ""
#. @-expanded: inode %i (%Q) is an illegal block device.\n
-#: e2fsck/problem.c:1084
+#: e2fsck/problem.c:1093
msgid "@i %i (%Q) is an @I @b @v.\n"
msgstr ""
#. @-expanded: entry '%Dn' in %p (%i) is duplicate '.' entry.\n
-#: e2fsck/problem.c:1089
+#: e2fsck/problem.c:1098
msgid "@E is duplicate '.' @e.\n"
msgstr ""
#. @-expanded: entry '%Dn' in %p (%i) is duplicate '..' entry.\n
-#: e2fsck/problem.c:1094
+#: e2fsck/problem.c:1103
msgid "@E is duplicate '..' @e.\n"
msgstr ""
-#: e2fsck/problem.c:1099 e2fsck/problem.c:1394
+#: e2fsck/problem.c:1108 e2fsck/problem.c:1408
#, c-format
msgid "Internal error: couldn't find dir_info for %i.\n"
msgstr ""
#. @-expanded: entry '%Dn' in %p (%i) has rec_len of %Dr, should be %N.\n
-#: e2fsck/problem.c:1104
+#: e2fsck/problem.c:1113
msgid "@E has rec_len of %Dr, @s %N.\n"
msgstr ""
#. @-expanded: error allocating icount structure: %m\n
-#: e2fsck/problem.c:1109
+#: e2fsck/problem.c:1118
#, c-format
msgid "@A icount structure: %m\n"
msgstr ""
#. @-expanded: Error iterating over directory blocks: %m\n
-#: e2fsck/problem.c:1114
+#: e2fsck/problem.c:1123
#, c-format
msgid "Error iterating over @d @bs: %m\n"
msgstr ""
#. @-expanded: Error reading directory block %b (inode %i): %m\n
-#: e2fsck/problem.c:1119
+#: e2fsck/problem.c:1128
msgid "Error reading @d @b %b (@i %i): %m\n"
msgstr ""
#. @-expanded: Error writing directory block %b (inode %i): %m\n
-#: e2fsck/problem.c:1124
+#: e2fsck/problem.c:1133
msgid "Error writing @d @b %b (@i %i): %m\n"
msgstr ""
#. @-expanded: error allocating new directory block for inode %i (%s): %m\n
-#: e2fsck/problem.c:1129
+#: e2fsck/problem.c:1138
#, c-format
msgid "@A new @d @b for @i %i (%s): %m\n"
msgstr ""
#. @-expanded: Error deallocating inode %i: %m\n
-#: e2fsck/problem.c:1134
+#: e2fsck/problem.c:1143
#, c-format
msgid "Error deallocating @i %i: %m\n"
msgstr ""
#. @-expanded: directory entry for '.' in %p (%i) is big.\n
-#: e2fsck/problem.c:1139
+#: e2fsck/problem.c:1148
#, c-format
msgid "@d @e for '.' in %p (%i) is big.\n"
msgstr ""
#. @-expanded: inode %i (%Q) is an illegal FIFO.\n
-#: e2fsck/problem.c:1144
+#: e2fsck/problem.c:1153
msgid "@i %i (%Q) is an @I FIFO.\n"
msgstr ""
#. @-expanded: inode %i (%Q) is an illegal socket.\n
-#: e2fsck/problem.c:1149
+#: e2fsck/problem.c:1158
msgid "@i %i (%Q) is an @I socket.\n"
msgstr ""
#. @-expanded: Setting filetype for entry '%Dn' in %p (%i) to %N.\n
-#: e2fsck/problem.c:1154
+#: e2fsck/problem.c:1163
msgid "Setting filetype for @E to %N.\n"
msgstr ""
#. @-expanded: entry '%Dn' in %p (%i) has an incorrect filetype (was %Dt, should be %N).\n
-#: e2fsck/problem.c:1159
+#: e2fsck/problem.c:1168
msgid "@E has an incorrect filetype (was %Dt, @s %N).\n"
msgstr ""
#. @-expanded: entry '%Dn' in %p (%i) has filetype set.\n
-#: e2fsck/problem.c:1164
+#: e2fsck/problem.c:1173
msgid "@E has filetype set.\n"
msgstr ""
#. @-expanded: entry '%Dn' in %p (%i) has a zero-length name.\n
-#: e2fsck/problem.c:1169
+#: e2fsck/problem.c:1178
msgid "@E has a @z name.\n"
msgstr ""
#. @-expanded: Symlink %Q (inode #%i) is invalid.\n
-#: e2fsck/problem.c:1174
+#: e2fsck/problem.c:1183
msgid "Symlink %Q (@i #%i) is @n.\n"
msgstr ""
#. @-expanded: extended attribute block for inode %i (%Q) is invalid (%If).\n
-#: e2fsck/problem.c:1179
+#: e2fsck/problem.c:1188
msgid "@a @b @F @n (%If).\n"
msgstr ""
#. @-expanded: filesystem contains large files, but lacks LARGE_FILE flag in superblock.\n
-#: e2fsck/problem.c:1184
+#: e2fsck/problem.c:1193
msgid "@f contains large files, but lacks LARGE_FILE flag in @S.\n"
msgstr ""
#. @-expanded: problem in HTREE directory inode %d: node (%B) not referenced\n
-#: e2fsck/problem.c:1189
+#: e2fsck/problem.c:1198
msgid "@p @h %d: node (%B) not referenced\n"
msgstr ""
#. @-expanded: problem in HTREE directory inode %d: node (%B) referenced twice\n
-#: e2fsck/problem.c:1194
+#: e2fsck/problem.c:1203
msgid "@p @h %d: node (%B) referenced twice\n"
msgstr ""
#. @-expanded: problem in HTREE directory inode %d: node (%B) has bad min hash\n
-#: e2fsck/problem.c:1199
+#: e2fsck/problem.c:1208
msgid "@p @h %d: node (%B) has bad min hash\n"
msgstr ""
#. @-expanded: problem in HTREE directory inode %d: node (%B) has bad max hash\n
-#: e2fsck/problem.c:1204
+#: e2fsck/problem.c:1213
msgid "@p @h %d: node (%B) has bad max hash\n"
msgstr ""
#. @-expanded: invalid HTREE directory inode %d (%q).
-#: e2fsck/problem.c:1209
+#: e2fsck/problem.c:1218
msgid "@n @h %d (%q). "
msgstr ""
#. @-expanded: problem in HTREE directory inode %d (%q): bad block number %b.\n
-#: e2fsck/problem.c:1213
+#: e2fsck/problem.c:1222
msgid "@p @h %d (%q): bad @b number %b.\n"
msgstr ""
#. @-expanded: problem in HTREE directory inode %d: root node is invalid\n
-#: e2fsck/problem.c:1223
+#: e2fsck/problem.c:1232
#, c-format
msgid "@p @h %d: root node is @n\n"
msgstr "@p at h %d:æ ¹ç»“ç‚¹@n\n"
#. @-expanded: problem in HTREE directory inode %d: node (%B) has invalid limit (%N)\n
-#: e2fsck/problem.c:1228
+#: e2fsck/problem.c:1237
msgid "@p @h %d: node (%B) has @n limit (%N)\n"
msgstr ""
#. @-expanded: problem in HTREE directory inode %d: node (%B) has invalid count (%N)\n
-#: e2fsck/problem.c:1233
+#: e2fsck/problem.c:1242
msgid "@p @h %d: node (%B) has @n count (%N)\n"
msgstr ""
#. @-expanded: problem in HTREE directory inode %d: node (%B) has an unordered hash table\n
-#: e2fsck/problem.c:1238
+#: e2fsck/problem.c:1247
msgid "@p @h %d: node (%B) has an unordered hash table\n"
msgstr ""
#. @-expanded: problem in HTREE directory inode %d: node (%B) has invalid depth (%N)\n
-#: e2fsck/problem.c:1243
+#: e2fsck/problem.c:1252
msgid "@p @h %d: node (%B) has @n depth (%N)\n"
msgstr ""
#. @-expanded: Duplicate entry '%Dn' in %p (%i) found.
-#: e2fsck/problem.c:1248
+#: e2fsck/problem.c:1257
msgid "Duplicate @E found. "
msgstr ""
#. @-expanded: entry '%Dn' in %p (%i) has a non-unique filename.\n
#. @-expanded: Rename to %s
-#: e2fsck/problem.c:1253
+#: e2fsck/problem.c:1262
#, no-c-format
msgid ""
"@E has a non-unique filename.\n"
@@ -2016,7 +2031,7 @@ msgstr ""
#. @-expanded: Duplicate entry '%Dn' found.\n
#. @-expanded: \tMarking %p (%i) to be rebuilt.\n
#. @-expanded: \n
-#: e2fsck/problem.c:1258
+#: e2fsck/problem.c:1267
msgid ""
"Duplicate @e '%Dn' found.\n"
"\tMarking %p (%i) to be rebuilt.\n"
@@ -2024,113 +2039,116 @@ msgid ""
msgstr ""
#. @-expanded: i_blocks_hi for inode %i (%Q) is %N, should be zero.\n
-#: e2fsck/problem.c:1263
+#: e2fsck/problem.c:1272
msgid "i_blocks_hi @F %N, @s zero.\n"
msgstr ""
#. @-expanded: Unexpected block in HTREE directory inode %d (%q).\n
-#: e2fsck/problem.c:1268
+#: e2fsck/problem.c:1277
msgid "Unexpected @b in @h %d (%q).\n"
msgstr ""
-#. @-expanded: inode %i found in group %g where _INODE_UNINIT is set.
-#: e2fsck/problem.c:1272
-#, c-format
-msgid "@i %i found in @g %g where _INODE_UNINIT is set. "
+#. @-expanded: entry '%Dn' in %p (%i) references inode %Di in group %g where _INODE_UNINIT is set.\n
+#: e2fsck/problem.c:1281
+msgid "@E references @i %Di in @g %g where _INODE_UNINIT is set.\n"
msgstr ""
-#. @-expanded: inode %i found in group %g unused inodes area.
-#: e2fsck/problem.c:1277
-#, c-format
-msgid "@i %i found in @g %g unused inodes area. "
+#. @-expanded: entry '%Dn' in %p (%i) references inode %Di found in group %g's unused inodes area.\n
+#: e2fsck/problem.c:1286
+msgid "@E references @i %Di found in @g %g's unused inodes area.\n"
+msgstr ""
+
+#. @-expanded: i_file_acl_hi for inode %i (%Q) is %N, should be zero.\n
+#: e2fsck/problem.c:1291
+msgid "i_file_acl_hi @F %N, @s zero.\n"
msgstr ""
#. @-expanded: Pass 3: Checking directory connectivity\n
-#: e2fsck/problem.c:1284
+#: e2fsck/problem.c:1298
msgid "Pass 3: Checking @d connectivity\n"
msgstr "第3æ¥: 检查目录连接性\n"
#. @-expanded: root inode not allocated.
-#: e2fsck/problem.c:1289
+#: e2fsck/problem.c:1303
msgid "@r not allocated. "
msgstr ""
#. @-expanded: No room in lost+found directory.
-#: e2fsck/problem.c:1294
+#: e2fsck/problem.c:1308
msgid "No room in @l @d. "
msgstr "@l at dä¸æ²¡æœ‰ç©ºé—´. "
#. @-expanded: Unconnected directory inode %i (%p)\n
-#: e2fsck/problem.c:1299
+#: e2fsck/problem.c:1313
#, c-format
msgid "Unconnected @d @i %i (%p)\n"
msgstr ""
#. @-expanded: /lost+found not found.
-#: e2fsck/problem.c:1304
+#: e2fsck/problem.c:1318
msgid "/@l not found. "
msgstr "/@l未找到."
#. @-expanded: '..' in %Q (%i) is %P (%j), should be %q (%d).\n
-#: e2fsck/problem.c:1309
+#: e2fsck/problem.c:1323
msgid "'..' in %Q (%i) is %P (%j), @s %q (%d).\n"
msgstr ""
#. @-expanded: Bad or non-existent /lost+found. Cannot reconnect.\n
-#: e2fsck/problem.c:1314
+#: e2fsck/problem.c:1328
msgid "Bad or non-existent /@l. Cannot reconnect.\n"
msgstr ""
#. @-expanded: Could not expand /lost+found: %m\n
-#: e2fsck/problem.c:1319
+#: e2fsck/problem.c:1333
#, c-format
msgid "Could not expand /@l: %m\n"
msgstr ""
-#: e2fsck/problem.c:1324
+#: e2fsck/problem.c:1338
#, c-format
msgid "Could not reconnect %i: %m\n"
msgstr ""
#. @-expanded: Error while trying to find /lost+found: %m\n
-#: e2fsck/problem.c:1329
+#: e2fsck/problem.c:1343
#, c-format
msgid "Error while trying to find /@l: %m\n"
msgstr "å°è¯•æ‰¾åˆ°/@l时出错: %m\n"
#. @-expanded: ext2fs_new_block: %m while trying to create /lost+found directory\n
-#: e2fsck/problem.c:1334
+#: e2fsck/problem.c:1348
#, c-format
msgid "ext2fs_new_ at b: %m while trying to create /@l @d\n"
msgstr ""
#. @-expanded: ext2fs_new_inode: %m while trying to create /lost+found directory\n
-#: e2fsck/problem.c:1339
+#: e2fsck/problem.c:1353
#, c-format
msgid "ext2fs_new_ at i: %m while trying to create /@l @d\n"
msgstr ""
#. @-expanded: ext2fs_new_dir_block: %m while creating new directory block\n
-#: e2fsck/problem.c:1344
+#: e2fsck/problem.c:1358
#, c-format
msgid "ext2fs_new_dir_ at b: %m while creating new @d @b\n"
msgstr ""
#. @-expanded: ext2fs_write_dir_block: %m while writing the directory block for /lost+found\n
-#: e2fsck/problem.c:1349
+#: e2fsck/problem.c:1363
#, c-format
msgid "ext2fs_write_dir_ at b: %m while writing the @d @b for /@l\n"
msgstr ""
#. @-expanded: Error while adjusting inode count on inode %i\n
-#: e2fsck/problem.c:1354
+#: e2fsck/problem.c:1368
#, c-format
msgid "Error while adjusting @i count on @i %i\n"
msgstr ""
#. @-expanded: Couldn't fix parent of inode %i: %m\n
#. @-expanded: \n
-#: e2fsck/problem.c:1359
+#: e2fsck/problem.c:1373
#, c-format
msgid ""
"Couldn't fix parent of @i %i: %m\n"
@@ -2139,7 +2157,7 @@ msgstr ""
#. @-expanded: Couldn't fix parent of inode %i: Couldn't find parent directory entry\n
#. @-expanded: \n
-#: e2fsck/problem.c:1364
+#: e2fsck/problem.c:1378
#, c-format
msgid ""
"Couldn't fix parent of @i %i: Couldn't find parent @d @e\n"
@@ -2147,76 +2165,76 @@ msgid ""
msgstr ""
#. @-expanded: Error creating root directory (%s): %m\n
-#: e2fsck/problem.c:1374
+#: e2fsck/problem.c:1388
#, c-format
msgid "Error creating root @d (%s): %m\n"
msgstr "åˆ›å»ºæ ¹@d (%s) 时出错: %m\n"
#. @-expanded: Error creating /lost+found directory (%s): %m\n
-#: e2fsck/problem.c:1379
+#: e2fsck/problem.c:1393
#, c-format
msgid "Error creating /@l @d (%s): %m\n"
msgstr ""
#. @-expanded: root inode is not a directory; aborting.\n
-#: e2fsck/problem.c:1384
+#: e2fsck/problem.c:1398
msgid "@r is not a @d; aborting.\n"
msgstr "@rä¸æ˜¯ä¸€ä¸ª@d; ä¸æ¢.\n"
#. @-expanded: Cannot proceed without a root inode.\n
-#: e2fsck/problem.c:1389
+#: e2fsck/problem.c:1403
msgid "Cannot proceed without a @r.\n"
msgstr ""
#. @-expanded: /lost+found is not a directory (ino=%i)\n
-#: e2fsck/problem.c:1399
+#: e2fsck/problem.c:1413
#, c-format
msgid "/@l is not a @d (ino=%i)\n"
msgstr ""
-#: e2fsck/problem.c:1406
+#: e2fsck/problem.c:1420
msgid "Pass 3A: Optimizing directories\n"
msgstr ""
-#: e2fsck/problem.c:1411
+#: e2fsck/problem.c:1425
#, c-format
-msgid "Failed to create dirs_to_hash iterator: %m"
+msgid "Failed to create dirs_to_hash iterator: %m\n"
msgstr ""
-#: e2fsck/problem.c:1416
-msgid "Failed to optimize directory %q (%d): %m"
+#: e2fsck/problem.c:1430
+msgid "Failed to optimize directory %q (%d): %m\n"
msgstr ""
-#: e2fsck/problem.c:1421
+#: e2fsck/problem.c:1435
#, fuzzy
msgid "Optimizing directories: "
msgstr "优化目录: "
-#: e2fsck/problem.c:1438
+#: e2fsck/problem.c:1452
msgid "Pass 4: Checking reference counts\n"
msgstr ""
#. @-expanded: unattached zero-length inode %i.
-#: e2fsck/problem.c:1443
+#: e2fsck/problem.c:1457
#, c-format
msgid "@u @z @i %i. "
msgstr ""
#. @-expanded: unattached inode %i\n
-#: e2fsck/problem.c:1448
+#: e2fsck/problem.c:1462
#, c-format
msgid "@u @i %i\n"
msgstr ""
#. @-expanded: inode %i ref count is %Il, should be %N.
-#: e2fsck/problem.c:1453
+#: e2fsck/problem.c:1467
msgid "@i %i ref count is %Il, @s %N. "
msgstr ""
#. @-expanded: WARNING: PROGRAMMING BUG IN E2FSCK!\n
#. @-expanded: \tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n
#. @-expanded: inode_link_info[%i] is %N, inode.i_links_count is %Il. They should be the same!\n
-#: e2fsck/problem.c:1457
+#: e2fsck/problem.c:1471
msgid ""
"WARNING: PROGRAMMING BUG IN E2FSCK!\n"
"\tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n"
@@ -2227,99 +2245,103 @@ msgstr ""
"@i_link_info[%i] 为 %N, @i.i_links_count 为 %Il.它们应该是相åŒçš„!\n"
#. @-expanded: Pass 5: Checking group summary information\n
-#: e2fsck/problem.c:1467
+#: e2fsck/problem.c:1481
msgid "Pass 5: Checking @g summary information\n"
msgstr "第5æ¥: 检查@g概è¦ä¿¡æ¯\n"
#. @-expanded: Padding at end of inode bitmap is not set.
-#: e2fsck/problem.c:1472
+#: e2fsck/problem.c:1486
msgid "Padding at end of @i @B is not set. "
msgstr ""
#. @-expanded: Padding at end of block bitmap is not set.
-#: e2fsck/problem.c:1477
+#: e2fsck/problem.c:1491
msgid "Padding at end of @b @B is not set. "
msgstr ""
#. @-expanded: block bitmap differences:
-#: e2fsck/problem.c:1482
+#: e2fsck/problem.c:1496
msgid "@b @B differences: "
msgstr "@b at B差异: "
#. @-expanded: inode bitmap differences:
-#: e2fsck/problem.c:1502
+#: e2fsck/problem.c:1516
msgid "@i @B differences: "
msgstr "@i at B差异: "
#. @-expanded: Free inodes count wrong for group #%g (%i, counted=%j).\n
-#: e2fsck/problem.c:1522
+#: e2fsck/problem.c:1536
msgid "Free @is count wrong for @g #%g (%i, counted=%j).\n"
msgstr ""
#. @-expanded: Directories count wrong for group #%g (%i, counted=%j).\n
-#: e2fsck/problem.c:1527
+#: e2fsck/problem.c:1541
msgid "Directories count wrong for @g #%g (%i, counted=%j).\n"
msgstr ""
#. @-expanded: Free inodes count wrong (%i, counted=%j).\n
-#: e2fsck/problem.c:1532
+#: e2fsck/problem.c:1546
msgid "Free @is count wrong (%i, counted=%j).\n"
msgstr ""
#. @-expanded: Free blocks count wrong for group #%g (%b, counted=%c).\n
-#: e2fsck/problem.c:1537
+#: e2fsck/problem.c:1551
msgid "Free @bs count wrong for @g #%g (%b, counted=%c).\n"
msgstr ""
#. @-expanded: Free blocks count wrong (%b, counted=%c).\n
-#: e2fsck/problem.c:1542
+#: e2fsck/problem.c:1556
msgid "Free @bs count wrong (%b, counted=%c).\n"
msgstr ""
#. @-expanded: PROGRAMMING ERROR: filesystem (#%N) bitmap endpoints (%b, %c) don't match calculated bitmap
#. @-expanded: endpoints (%i, %j)\n
-#: e2fsck/problem.c:1547
-msgid "PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B endpoints (%i, %j)\n"
+#: e2fsck/problem.c:1561
+msgid ""
+"PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B "
+"endpoints (%i, %j)\n"
msgstr ""
-#: e2fsck/problem.c:1553
+#: e2fsck/problem.c:1567
msgid "Internal error: fudging end of bitmap (%N)\n"
msgstr ""
#. @-expanded: Error copying in replacement inode bitmap: %m\n
-#: e2fsck/problem.c:1558
+#: e2fsck/problem.c:1572
#, c-format
msgid "Error copying in replacement @i @B: %m\n"
msgstr ""
#. @-expanded: Error copying in replacement block bitmap: %m\n
-#: e2fsck/problem.c:1563
+#: e2fsck/problem.c:1577
#, c-format
msgid "Error copying in replacement @b @B: %m\n"
msgstr ""
-#: e2fsck/problem.c:1588
-msgid "Recreate journal to make the filesystem ext3 again?\n"
-msgstr ""
-
#. @-expanded: group %g block(s) in use but group is marked BLOCK_UNINIT\n
-#: e2fsck/problem.c:1593
+#: e2fsck/problem.c:1602
#, c-format
msgid "@g %g @b(s) in use but @g is marked BLOCK_UNINIT\n"
msgstr ""
#. @-expanded: group %g inode(s) in use but group is marked INODE_UNINIT\n
-#: e2fsck/problem.c:1598
+#: e2fsck/problem.c:1607
#, c-format
msgid "@g %g @i(s) in use but @g is marked INODE_UNINIT\n"
msgstr ""
-#: e2fsck/problem.c:1716
+#. @-expanded: Recreate journal
+#: e2fsck/problem.c:1614
+#, fuzzy
+msgid "Recreate @j"
+msgstr "é‡å»º"
+
+#: e2fsck/problem.c:1732
#, c-format
msgid "Unhandled error code (0x%x)!\n"
msgstr ""
-#: e2fsck/problem.c:1810
+#: e2fsck/problem.c:1827
msgid "IGNORED"
msgstr "已忽略"
@@ -2376,7 +2398,8 @@ msgid ""
" -p Automatic repair (no questions)\n"
" -n Make no changes to the filesystem\n"
" -y Assume \"yes\" to all questions\n"
-" -c Check for bad blocks and add them to the badblock list\n"
+" -c Check for bad blocks and add them to the badblock "
+"list\n"
" -f Force checking even if filesystem is marked clean\n"
msgstr ""
@@ -2391,44 +2414,44 @@ msgid ""
" -L bad_blocks_file Set badblocks list\n"
msgstr ""
-#: e2fsck/unix.c:124
+#: e2fsck/unix.c:132
#, c-format
msgid "%s: %u/%u files (%0d.%d%% non-contiguous), %u/%u blocks\n"
msgstr ""
-#: e2fsck/unix.c:136
+#: e2fsck/unix.c:150
#, c-format
msgid " # of inodes with ind/dind/tind blocks: %u/%u/%u\n"
msgstr ""
-#: e2fsck/unix.c:143
+#: e2fsck/unix.c:157
#, c-format
msgid " Extent depth histogram: "
msgstr ""
-#: e2fsck/unix.c:193 misc/badblocks.c:871 misc/tune2fs.c:1501 misc/util.c:151
-#: resize/main.c:245
+#: e2fsck/unix.c:207 misc/badblocks.c:928 misc/tune2fs.c:1584 misc/util.c:151
+#: resize/main.c:249
#, c-format
msgid "while determining whether %s is mounted."
msgstr ""
-#: e2fsck/unix.c:211
+#: e2fsck/unix.c:225
#, c-format
msgid "Warning! %s is mounted.\n"
msgstr "è¦å‘Š! %s已挂载.\n"
-#: e2fsck/unix.c:215
+#: e2fsck/unix.c:229
#, c-format
msgid "%s is mounted. "
msgstr "%s 已挂载."
-#: e2fsck/unix.c:217
+#: e2fsck/unix.c:231
msgid ""
"Cannot continue, aborting.\n"
"\n"
msgstr "æ— æ³•ç»§ç», ä¸æ¢.\n"
-#: e2fsck/unix.c:218
+#: e2fsck/unix.c:232
#, c-format
msgid ""
"\n"
@@ -2438,79 +2461,79 @@ msgid ""
"\n"
msgstr ""
-#: e2fsck/unix.c:221
+#: e2fsck/unix.c:235
msgid "Do you really want to continue"
msgstr "ä½ çœŸçš„æƒ³è¦è¦ç»§ç»"
-#: e2fsck/unix.c:223
+#: e2fsck/unix.c:237
#, c-format
msgid "check aborted.\n"
msgstr "检查被ä¸æ¢\n"
-#: e2fsck/unix.c:296
+#: e2fsck/unix.c:310
msgid " contains a file system with errors"
msgstr ""
-#: e2fsck/unix.c:298
+#: e2fsck/unix.c:312
msgid " was not cleanly unmounted"
msgstr ""
-#: e2fsck/unix.c:300
+#: e2fsck/unix.c:314
msgid " primary superblock features different from backup"
msgstr ""
-#: e2fsck/unix.c:304
+#: e2fsck/unix.c:318
#, c-format
msgid " has been mounted %u times without being checked"
msgstr ""
-#: e2fsck/unix.c:310
+#: e2fsck/unix.c:324
msgid " has filesystem last checked time in the future"
msgstr ""
-#: e2fsck/unix.c:316
+#: e2fsck/unix.c:330
#, c-format
msgid " has gone %u days without being checked"
msgstr ""
-#: e2fsck/unix.c:325
+#: e2fsck/unix.c:339
msgid ", check forced.\n"
msgstr ", 强制检查.\n"
-#: e2fsck/unix.c:328
+#: e2fsck/unix.c:342
#, c-format
msgid "%s: clean, %u/%u files, %u/%u blocks"
msgstr ""
-#: e2fsck/unix.c:345
+#: e2fsck/unix.c:359
msgid " (check deferred; on battery)"
msgstr ""
-#: e2fsck/unix.c:348
+#: e2fsck/unix.c:362
msgid " (check after next mount)"
msgstr "(将于下次挂载时进行检查)"
-#: e2fsck/unix.c:350
+#: e2fsck/unix.c:364
#, c-format
msgid " (check in %ld mounts)"
msgstr ""
-#: e2fsck/unix.c:497
+#: e2fsck/unix.c:511
#, c-format
msgid "ERROR: Couldn't open /dev/null (%s)\n"
msgstr ""
-#: e2fsck/unix.c:567
+#: e2fsck/unix.c:581
#, fuzzy, c-format
msgid "Invalid EA version.\n"
msgstr "æ— æ•ˆçš„EA版本å·.\n"
-#: e2fsck/unix.c:576
+#: e2fsck/unix.c:590
#, c-format
msgid "Unknown extended option: %s\n"
msgstr ""
-#: e2fsck/unix.c:598
+#: e2fsck/unix.c:612
#, c-format
msgid ""
"Syntax error in e2fsck config file (%s, line #%d)\n"
@@ -2519,42 +2542,42 @@ msgstr ""
"e2fsck é…置文件ä¸è¯æ³•é”™è¯¯(%s, è¡Œ #%d)\n"
"\t%s\n"
-#: e2fsck/unix.c:666
+#: e2fsck/unix.c:680
#, c-format
msgid "Error validating file descriptor %d: %s\n"
msgstr ""
-#: e2fsck/unix.c:670
+#: e2fsck/unix.c:684
msgid "Invalid completion information file descriptor"
msgstr ""
-#: e2fsck/unix.c:685
+#: e2fsck/unix.c:699
msgid "Only one of the options -p/-a, -n or -y may be specified."
msgstr ""
-#: e2fsck/unix.c:706
+#: e2fsck/unix.c:720
#, c-format
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr ""
-#: e2fsck/unix.c:787 misc/tune2fs.c:545 misc/tune2fs.c:830 misc/tune2fs.c:847
+#: e2fsck/unix.c:801 misc/tune2fs.c:550 misc/tune2fs.c:835 misc/tune2fs.c:853
#, c-format
msgid "Unable to resolve '%s'"
msgstr ""
-#: e2fsck/unix.c:817
+#: e2fsck/unix.c:830
#, c-format
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
msgstr ""
-#: e2fsck/unix.c:865
+#: e2fsck/unix.c:878
#, c-format
msgid ""
"E2FSCK_JBD_DEBUG \"%s\" not an integer\n"
"\n"
msgstr ""
-#: e2fsck/unix.c:874
+#: e2fsck/unix.c:887
#, c-format
msgid ""
"\n"
@@ -2562,38 +2585,43 @@ msgid ""
"\n"
msgstr ""
-#: e2fsck/unix.c:915
+#: e2fsck/unix.c:961
#, c-format
msgid "Error: ext2fs library version out of date!\n"
msgstr "错误: ext2fs库版本过旧!\n"
-#: e2fsck/unix.c:923
+#: e2fsck/unix.c:969
msgid "while trying to initialize program"
msgstr ""
-#: e2fsck/unix.c:937
+#: e2fsck/unix.c:980
#, fuzzy, c-format
msgid "\tUsing %s, %s\n"
msgstr "\t使用 %s\n"
-#: e2fsck/unix.c:949
+#: e2fsck/unix.c:992
msgid "need terminal for interactive repairs"
msgstr ""
-#: e2fsck/unix.c:993
+#: e2fsck/unix.c:1021
#, c-format
msgid "%s: %s trying backup blocks...\n"
msgstr ""
-#: e2fsck/unix.c:995
+#: e2fsck/unix.c:1023
msgid "Superblock invalid,"
msgstr "超级å—æ— æ•ˆ,"
-#: e2fsck/unix.c:996
+#: e2fsck/unix.c:1024
msgid "Group descriptors look bad..."
msgstr ""
-#: e2fsck/unix.c:1023
+#: e2fsck/unix.c:1034
+#, fuzzy, c-format
+msgid "%s: going back to original superblock\n"
+msgstr "%s: 没有å‘现日志超级å—\n"
+
+#: e2fsck/unix.c:1060
#, c-format
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
@@ -2601,129 +2629,131 @@ msgid ""
"\n"
msgstr ""
-#: e2fsck/unix.c:1029
+#: e2fsck/unix.c:1066
#, c-format
msgid "Could this be a zero-length partition?\n"
msgstr ""
-#: e2fsck/unix.c:1031
+#: e2fsck/unix.c:1068
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr ""
-#: e2fsck/unix.c:1036
+#: e2fsck/unix.c:1073
#, c-format
msgid "Possibly non-existent or swap device?\n"
msgstr ""
-#: e2fsck/unix.c:1038
+#: e2fsck/unix.c:1075
#, c-format
msgid "Filesystem mounted or opened exclusively by another program?\n"
msgstr ""
-#: e2fsck/unix.c:1042
+#: e2fsck/unix.c:1079
#, c-format
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
"check of the device.\n"
msgstr ""
-#: e2fsck/unix.c:1106
+#: e2fsck/unix.c:1143
msgid "Get a newer version of e2fsck!"
msgstr ""
-#: e2fsck/unix.c:1130
+#: e2fsck/unix.c:1173
#, fuzzy, c-format
msgid "while checking ext3 journal for %s"
msgstr "当检查在线文件系统大å°è°ƒæ•´æ”¯æŒæ—¶"
-#: e2fsck/unix.c:1141
+#: e2fsck/unix.c:1184
#, c-format
-msgid "Warning: skipping journal recovery because doing a read-only filesystem check.\n"
+msgid ""
+"Warning: skipping journal recovery because doing a read-only filesystem "
+"check.\n"
msgstr ""
-#: e2fsck/unix.c:1154
+#: e2fsck/unix.c:1197
#, c-format
msgid "unable to set superblock flags on %s\n"
msgstr ""
-#: e2fsck/unix.c:1160
+#: e2fsck/unix.c:1203
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr ""
-#: e2fsck/unix.c:1184
+#: e2fsck/unix.c:1228
#, c-format
msgid "%s has unsupported feature(s):"
msgstr ""
-#: e2fsck/unix.c:1200
+#: e2fsck/unix.c:1244
msgid "Warning: compression support is experimental.\n"
msgstr ""
-#: e2fsck/unix.c:1205
+#: e2fsck/unix.c:1249
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
"\tbut filesystem %s has HTREE directories.\n"
msgstr ""
-#: e2fsck/unix.c:1259
+#: e2fsck/unix.c:1302
#, fuzzy
msgid "while reading bad blocks inode"
msgstr "当读å–åå—inodeæ—¶"
-#: e2fsck/unix.c:1261
+#: e2fsck/unix.c:1304
#, c-format
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr ""
-#: e2fsck/unix.c:1287
+#: e2fsck/unix.c:1330
msgid "Couldn't determine journal size"
msgstr ""
-#: e2fsck/unix.c:1290
+#: e2fsck/unix.c:1333
#, fuzzy, c-format
msgid "Creating journal (%d blocks): "
msgstr "<åå— inode>"
-#: e2fsck/unix.c:1297 misc/mke2fs.c:2059
+#: e2fsck/unix.c:1340 misc/mke2fs.c:2113
msgid ""
"\n"
"\twhile trying to create journal"
msgstr ""
-#: e2fsck/unix.c:1300
+#: e2fsck/unix.c:1343
#, fuzzy, c-format
msgid " Done.\n"
msgstr "完毕。\n"
-#: e2fsck/unix.c:1301
+#: e2fsck/unix.c:1344
#, c-format
msgid ""
"\n"
"*** journal has been re-created - filesystem is now ext3 again ***\n"
msgstr ""
-#: e2fsck/unix.c:1308
+#: e2fsck/unix.c:1351
#, c-format
msgid "Restarting e2fsck from the beginning...\n"
msgstr "æ£åœ¨ä»Žå¤´å¼€å§‹e2fsck...\n"
-#: e2fsck/unix.c:1312
+#: e2fsck/unix.c:1355
msgid "while resetting context"
msgstr ""
-#: e2fsck/unix.c:1319
+#: e2fsck/unix.c:1362
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr "%s: e2fsck被å–消.\n"
-#: e2fsck/unix.c:1324
+#: e2fsck/unix.c:1367
msgid "aborted"
msgstr "å·²ä¸æ¢"
-#: e2fsck/unix.c:1336
+#: e2fsck/unix.c:1379
#, c-format
msgid ""
"\n"
@@ -2732,12 +2762,12 @@ msgstr ""
"\n"
"%s: ***** 文件系统已修改 *****\n"
-#: e2fsck/unix.c:1339
+#: e2fsck/unix.c:1382
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr "%s: ***** é‡æ–°å¯åŠ¨ LINUX *****\n"
-#: e2fsck/unix.c:1347
+#: e2fsck/unix.c:1390
#, c-format
msgid ""
"\n"
@@ -2748,43 +2778,43 @@ msgstr ""
"%s: ********** è¦å‘Š: 文件系统上ä»æœ‰é”™è¯¯ **********\n"
"\n"
-#: e2fsck/unix.c:1383
+#: e2fsck/unix.c:1426
msgid "while setting block group checksum info"
msgstr ""
-#: e2fsck/util.c:135 misc/util.c:68
+#: e2fsck/util.c:138 misc/util.c:68
msgid "yY"
msgstr "yY"
-#: e2fsck/util.c:136
+#: e2fsck/util.c:139
msgid "nN"
msgstr "nN"
-#: e2fsck/util.c:150
+#: e2fsck/util.c:153
msgid "<y>"
msgstr "<y>"
-#: e2fsck/util.c:152
+#: e2fsck/util.c:155
msgid "<n>"
msgstr "<n>"
-#: e2fsck/util.c:154
+#: e2fsck/util.c:157
msgid " (y/n)"
msgstr " (y/n)"
-#: e2fsck/util.c:169
+#: e2fsck/util.c:172
msgid "cancelled!\n"
msgstr "å·²å–消!\n"
-#: e2fsck/util.c:184
+#: e2fsck/util.c:187
msgid "yes\n"
msgstr "是\n"
-#: e2fsck/util.c:186
+#: e2fsck/util.c:189
msgid "no\n"
msgstr "å¦\n"
-#: e2fsck/util.c:196
+#: e2fsck/util.c:199
#, fuzzy, c-format
msgid ""
"%s? no\n"
@@ -2793,7 +2823,7 @@ msgstr ""
"%s? å¦\n"
"\n"
-#: e2fsck/util.c:200
+#: e2fsck/util.c:203
#, c-format
msgid ""
"%s? yes\n"
@@ -2802,40 +2832,40 @@ msgstr ""
"%s? 是\n"
"\n"
-#: e2fsck/util.c:204
+#: e2fsck/util.c:207
#, fuzzy
msgid "yes"
msgstr "yes"
-#: e2fsck/util.c:204
+#: e2fsck/util.c:207
#, fuzzy
msgid "no"
msgstr "no"
-#: e2fsck/util.c:218
+#: e2fsck/util.c:221
#, c-format
msgid "e2fsck_read_bitmaps: illegal bitmap block(s) for %s"
msgstr ""
-#: e2fsck/util.c:223
+#: e2fsck/util.c:226
msgid "reading inode and block bitmaps"
msgstr ""
-#: e2fsck/util.c:228
+#: e2fsck/util.c:231
#, c-format
msgid "while retrying to read bitmaps for %s"
msgstr ""
-#: e2fsck/util.c:240
+#: e2fsck/util.c:243
msgid "writing block and inode bitmaps"
msgstr ""
-#: e2fsck/util.c:245
+#: e2fsck/util.c:248
#, c-format
msgid "while rewriting block and inode bitmaps for %s"
msgstr ""
-#: e2fsck/util.c:257
+#: e2fsck/util.c:260
#, c-format
msgid ""
"\n"
@@ -2844,273 +2874,279 @@ msgid ""
"\t(i.e., without -a or -p options)\n"
msgstr ""
-#: e2fsck/util.c:332
-#, c-format
-msgid "Memory used: %dk/%dk (%dk/%dk), "
+#: e2fsck/util.c:341
+#, fuzzy, c-format
+msgid "Memory used: %luk/%luk (%luk/%luk), "
msgstr "内å˜ä½¿ç”¨é‡: %dk/%dk (%dk/%dk), "
-#: e2fsck/util.c:336
-#, c-format
-msgid "Memory used: %d, "
+#: e2fsck/util.c:345
+#, fuzzy, c-format
+msgid "Memory used: %lu, "
msgstr "已使用内å˜: %d, "
-#: e2fsck/util.c:342
+#: e2fsck/util.c:352
#, c-format
msgid "time: %5.2f/%5.2f/%5.2f\n"
msgstr "时间: %5.2f/%5.2f/%5.2f\n"
-#: e2fsck/util.c:347
+#: e2fsck/util.c:357
#, c-format
msgid "elapsed time: %6.3f\n"
msgstr ""
-#: e2fsck/util.c:381 e2fsck/util.c:395
+#: e2fsck/util.c:391 e2fsck/util.c:405
#, fuzzy, c-format
-msgid "while reading inode %ld in %s"
+msgid "while reading inode %lu in %s"
msgstr "当读å–åå—inodeæ—¶"
-#: e2fsck/util.c:409 e2fsck/util.c:422
-#, c-format
-msgid "while writing inode %ld in %s"
-msgstr ""
+#: e2fsck/util.c:419 e2fsck/util.c:432
+#, fuzzy, c-format
+msgid "while writing inode %lu in %s"
+msgstr "当读å–åå—inodeæ—¶"
-#: e2fsck/util.c:571
+#: e2fsck/util.c:581
msgid "while allocating zeroizing buffer"
msgstr ""
-#: misc/badblocks.c:63
+#: misc/badblocks.c:66
msgid "done \n"
msgstr "å®Œæˆ \n"
-#: misc/badblocks.c:85
+#: misc/badblocks.c:89
#, c-format
msgid ""
"Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnf]\n"
-" [-c blocks_at_once] [-d delay_factor_between_reads] [-e max_bad_blocks]\n"
+" [-c blocks_at_once] [-d delay_factor_between_reads] [-e "
+"max_bad_blocks]\n"
" [-p num_passes] [-t test_pattern [-t test_pattern [...]]]\n"
" device [last_block [first_block]]\n"
msgstr ""
-#: misc/badblocks.c:96
+#: misc/badblocks.c:100
#, c-format
msgid ""
"%s: The -n and -w options are mutually exclusive.\n"
"\n"
msgstr ""
-#: misc/badblocks.c:244
+#: misc/badblocks.c:202
+#, c-format
+msgid "%6.2f%% done, %s elapsed"
+msgstr ""
+
+#: misc/badblocks.c:293
msgid "Testing with random pattern: "
msgstr ""
-#: misc/badblocks.c:262
+#: misc/badblocks.c:311
msgid "Testing with pattern 0x"
msgstr ""
-#: misc/badblocks.c:290 misc/badblocks.c:359
+#: misc/badblocks.c:339 misc/badblocks.c:408
msgid "during seek"
msgstr ""
-#: misc/badblocks.c:301
+#: misc/badblocks.c:350
#, c-format
msgid "Weird value (%ld) in do_read\n"
msgstr ""
-#: misc/badblocks.c:379
+#: misc/badblocks.c:428
msgid "during ext2fs_sync_device"
msgstr ""
-#: misc/badblocks.c:395 misc/badblocks.c:654
+#: misc/badblocks.c:447 misc/badblocks.c:711
msgid "while beginning bad block list iteration"
msgstr ""
-#: misc/badblocks.c:409 misc/badblocks.c:506 misc/badblocks.c:664
+#: misc/badblocks.c:461 misc/badblocks.c:563 misc/badblocks.c:721
msgid "while allocating buffers"
msgstr ""
-#: misc/badblocks.c:413
+#: misc/badblocks.c:465
#, c-format
msgid "Checking blocks %lu to %lu\n"
msgstr "æ£åœ¨æ£€æŸ¥ä»Ž %lu 到 %luçš„å—\n"
-#: misc/badblocks.c:418
+#: misc/badblocks.c:470
msgid "Checking for bad blocks in read-only mode\n"
msgstr ""
-#: misc/badblocks.c:427
+#: misc/badblocks.c:479
msgid "Checking for bad blocks (read-only test): "
msgstr ""
-#: misc/badblocks.c:435 misc/badblocks.c:538 misc/badblocks.c:583
-#: misc/badblocks.c:727
+#: misc/badblocks.c:487 misc/badblocks.c:595 misc/badblocks.c:640
+#: misc/badblocks.c:784
msgid "Too many bad blocks, aborting test\n"
msgstr ""
-#: misc/badblocks.c:513
+#: misc/badblocks.c:570
msgid "Checking for bad blocks in read-write mode\n"
msgstr ""
-#: misc/badblocks.c:515 misc/badblocks.c:677
+#: misc/badblocks.c:572 misc/badblocks.c:734
#, c-format
msgid "From block %lu to %lu\n"
msgstr ""
-#: misc/badblocks.c:573
+#: misc/badblocks.c:630
msgid "Reading and comparing: "
msgstr "æ£åœ¨è¯»å–并比较: "
-#: misc/badblocks.c:676
+#: misc/badblocks.c:733
msgid "Checking for bad blocks in non-destructive read-write mode\n"
msgstr ""
-#: misc/badblocks.c:682
+#: misc/badblocks.c:739
msgid "Checking for bad blocks (non-destructive read-write test)\n"
msgstr ""
-#: misc/badblocks.c:689
+#: misc/badblocks.c:746
msgid ""
"\n"
"Interrupt caught, cleaning up\n"
msgstr ""
-#: misc/badblocks.c:765
+#: misc/badblocks.c:822
#, c-format
msgid "during test data write, block %lu"
msgstr ""
-#: misc/badblocks.c:876 misc/util.c:156
+#: misc/badblocks.c:933 misc/util.c:156
#, c-format
msgid "%s is mounted; "
msgstr "%s å·²ç»æŒ‚è½½;"
-#: misc/badblocks.c:878
+#: misc/badblocks.c:935
msgid "badblocks forced anyway. Hope /etc/mtab is incorrect.\n"
msgstr ""
-#: misc/badblocks.c:883
+#: misc/badblocks.c:940
msgid "it's not safe to run badblocks!\n"
msgstr ""
-#: misc/badblocks.c:888 misc/util.c:167
+#: misc/badblocks.c:945 misc/util.c:167
#, c-format
msgid "%s is apparently in use by the system; "
msgstr ""
-#: misc/badblocks.c:891
+#: misc/badblocks.c:948
#, fuzzy
msgid "badblocks forced anyway.\n"
msgstr "mke2fs 强制执行.\n"
-#: misc/badblocks.c:911
+#: misc/badblocks.c:968
#, c-format
msgid "invalid %s - %s"
msgstr "æ— æ•ˆçš„%s - %s"
-#: misc/badblocks.c:970
-#, c-format
-msgid "bad block size - %s"
-msgstr "错误的å—å¤§å° - %s"
-
-#: misc/badblocks.c:1025
+#: misc/badblocks.c:1077
#, c-format
msgid "can't allocate memory for test_pattern - %s"
msgstr ""
-#: misc/badblocks.c:1052
+#: misc/badblocks.c:1104
msgid "Maximum of one test_pattern may be specified in read-only mode"
msgstr ""
-#: misc/badblocks.c:1058
+#: misc/badblocks.c:1110
msgid "Random test_pattern is not allowed in read-only mode"
msgstr ""
-#: misc/badblocks.c:1072
+#: misc/badblocks.c:1124
msgid ""
"Couldn't determine device size; you must specify\n"
"the size manually\n"
msgstr ""
-#: misc/badblocks.c:1078
+#: misc/badblocks.c:1130
msgid "while trying to determine device size"
msgstr ""
-#: misc/badblocks.c:1083
+#: misc/badblocks.c:1135
#, fuzzy
msgid "last block"
msgstr "最åŽä¸€ä¸ªå—"
-#: misc/badblocks.c:1089
+#: misc/badblocks.c:1141
#, fuzzy
msgid "first block"
msgstr "第一个å—"
-#: misc/badblocks.c:1092
+#: misc/badblocks.c:1144
#, c-format
msgid "invalid starting block (%lu): must be less than %lu"
msgstr ""
-#: misc/badblocks.c:1147
+#: misc/badblocks.c:1200
msgid "while creating in-memory bad blocks list"
msgstr ""
-#: misc/badblocks.c:1162
+#: misc/badblocks.c:1215
msgid "while adding to in-memory bad block list"
msgstr ""
-#: misc/badblocks.c:1186
+#: misc/badblocks.c:1239
#, c-format
msgid "Pass completed, %u bad blocks found.\n"
msgstr ""
#: misc/chattr.c:85
-#, c-format
-msgid "Usage: %s [-RVf] [-+=AacDdijsSu] [-v version] files...\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "Usage: %s [-RVf] [-+=AacDdeijsSu] [-v version] files...\n"
+msgstr "用法: %s [-RVadlv] [files...]\n"
-#: misc/chattr.c:152
+#: misc/chattr.c:153
#, c-format
msgid "bad version - %s\n"
msgstr "错误的版本 - %s\n"
-#: misc/chattr.c:198 misc/lsattr.c:113
+#: misc/chattr.c:200 misc/lsattr.c:115
#, fuzzy, c-format
msgid "while trying to stat %s"
msgstr "当å°è¯•å¯¹%s进行stat调用时"
-#: misc/chattr.c:204 misc/chattr.c:222
+#: misc/chattr.c:207
#, c-format
-msgid "Flags of %s set as "
-msgstr "%sçš„æ ‡å¿—è¢«è®¾ä¸º "
+msgid "while reading flags on %s"
+msgstr ""
-#: misc/chattr.c:214
+#: misc/chattr.c:216 misc/chattr.c:235
#, c-format
-msgid "while reading flags on %s"
+msgid "Clearing extent flag not supported on %s"
msgstr ""
-#: misc/chattr.c:231
+#: misc/chattr.c:221 misc/chattr.c:240
+#, c-format
+msgid "Flags of %s set as "
+msgstr "%sçš„æ ‡å¿—è¢«è®¾ä¸º "
+
+#: misc/chattr.c:249
#, c-format
msgid "while setting flags on %s"
msgstr ""
-#: misc/chattr.c:239
+#: misc/chattr.c:257
#, c-format
msgid "Version of %s set as %lu\n"
msgstr ""
-#: misc/chattr.c:243
+#: misc/chattr.c:261
#, c-format
msgid "while setting version on %s"
msgstr ""
-#: misc/chattr.c:263
+#: misc/chattr.c:281
#, c-format
msgid "Couldn't allocate path variable in chattr_dir_proc"
msgstr ""
-#: misc/chattr.c:302
+#: misc/chattr.c:320
msgid "= is incompatible with - and +\n"
msgstr ""
-#: misc/chattr.c:310
+#: misc/chattr.c:328
msgid "Must use '-v', =, - or +\n"
msgstr ""
@@ -3197,32 +3233,32 @@ msgstr " å¯ç”¨å—æ•°: "
msgid " Free inodes: "
msgstr " å¯ç”¨inodeæ•°: "
-#: misc/dumpe2fs.c:264
+#: misc/dumpe2fs.c:268
msgid "while printing bad block list"
msgstr ""
-#: misc/dumpe2fs.c:270
+#: misc/dumpe2fs.c:274
#, c-format
msgid "Bad blocks: %u"
msgstr "åå—æ•°: %u"
-#: misc/dumpe2fs.c:292 misc/tune2fs.c:276
+#: misc/dumpe2fs.c:297 misc/tune2fs.c:281
msgid "while reading journal inode"
msgstr ""
-#: misc/dumpe2fs.c:295
+#: misc/dumpe2fs.c:300
msgid "Journal size: "
msgstr "日志大å°: "
-#: misc/dumpe2fs.c:319 misc/tune2fs.c:197
+#: misc/dumpe2fs.c:324 misc/tune2fs.c:202
msgid "while reading journal superblock"
msgstr ""
-#: misc/dumpe2fs.c:327
+#: misc/dumpe2fs.c:332
msgid "Couldn't find journal superblock magic numbers"
msgstr ""
-#: misc/dumpe2fs.c:331
+#: misc/dumpe2fs.c:336
#, c-format
msgid ""
"\n"
@@ -3234,27 +3270,27 @@ msgid ""
"Journal number of users: %u\n"
msgstr ""
-#: misc/dumpe2fs.c:344
+#: misc/dumpe2fs.c:349
#, c-format
msgid "Journal users: %s\n"
msgstr "日志使用者: %s\n"
-#: misc/dumpe2fs.c:360 misc/mke2fs.c:692 misc/tune2fs.c:865
+#: misc/dumpe2fs.c:365 misc/mke2fs.c:693 misc/tune2fs.c:872
#, c-format
msgid "Couldn't allocate memory to parse options!\n"
msgstr ""
-#: misc/dumpe2fs.c:386
+#: misc/dumpe2fs.c:391
#, c-format
msgid "Invalid superblock parameter: %s\n"
msgstr ""
-#: misc/dumpe2fs.c:401
+#: misc/dumpe2fs.c:406
#, c-format
msgid "Invalid blocksize parameter: %s\n"
msgstr ""
-#: misc/dumpe2fs.c:412
+#: misc/dumpe2fs.c:417
#, c-format
msgid ""
"\n"
@@ -3268,51 +3304,51 @@ msgid ""
"\tblocksize=<blocksize>\n"
msgstr ""
-#: misc/dumpe2fs.c:471 misc/mke2fs.c:1348
+#: misc/dumpe2fs.c:476 misc/mke2fs.c:1355
#, fuzzy, c-format
msgid "\tUsing %s\n"
msgstr "\t使用 %s\n"
-#: misc/dumpe2fs.c:507 misc/e2image.c:671 misc/tune2fs.c:1452
-#: resize/main.c:306
+#: misc/dumpe2fs.c:512 misc/e2image.c:681 misc/tune2fs.c:1535
+#: resize/main.c:314
#, c-format
msgid "Couldn't find valid filesystem superblock.\n"
msgstr "找ä¸åˆ°æœ‰æ•ˆçš„文件系统超级å—.\n"
-#: misc/dumpe2fs.c:531
+#: misc/dumpe2fs.c:537
#, c-format
msgid ""
"\n"
"%s: %s: error reading bitmaps: %s\n"
msgstr ""
-#: misc/e2image.c:50
+#: misc/e2image.c:52
#, c-format
msgid "Usage: %s [-rsI] device image_file\n"
msgstr ""
-#: misc/e2image.c:62
+#: misc/e2image.c:64
msgid "Couldn't allocate header buffer\n"
msgstr ""
-#: misc/e2image.c:81
+#: misc/e2image.c:83
#, c-format
msgid "short write (only %d bytes) for writing image header"
msgstr ""
-#: misc/e2image.c:100
+#: misc/e2image.c:102
msgid "while writing superblock"
msgstr ""
-#: misc/e2image.c:108
+#: misc/e2image.c:110
msgid "while writing inode table"
msgstr ""
-#: misc/e2image.c:115
+#: misc/e2image.c:117
msgid "while writing block bitmap"
msgstr ""
-#: misc/e2image.c:122
+#: misc/e2image.c:124
msgid "while writing inode bitmap"
msgstr ""
@@ -3336,7 +3372,7 @@ msgstr "e2label: 读å–superblock出错\n"
msgid "e2label: not an ext2 filesystem\n"
msgstr "e2label: ä¸æ˜¯ä¸€ä¸ªex2文件系统\n"
-#: misc/e2label.c:96 misc/tune2fs.c:1585
+#: misc/e2label.c:96 misc/tune2fs.c:1670
#, c-format
msgid "Warning: label too long, truncating.\n"
msgstr ""
@@ -3351,7 +3387,7 @@ msgstr ""
msgid "e2label: error writing superblock\n"
msgstr "写入“%sâ€å‡ºé”™"
-#: misc/e2label.c:116 misc/tune2fs.c:537
+#: misc/e2label.c:116 misc/tune2fs.c:542
#, fuzzy, c-format
msgid "Usage: e2label device [newlabel]\n"
msgstr "用法: %s [-F] [-I inode_buffer_blocks] device\n"
@@ -3408,17 +3444,17 @@ msgstr ""
msgid "Failed write %s\n"
msgstr "写入%s失败\n"
-#: misc/fsck.c:347
+#: misc/fsck.c:343
#, c-format
msgid "WARNING: couldn't open %s: %s\n"
msgstr ""
-#: misc/fsck.c:357
+#: misc/fsck.c:353
#, c-format
msgid "WARNING: bad format on line %d of %s\n"
msgstr ""
-#: misc/fsck.c:372
+#: misc/fsck.c:368
msgid ""
"\a\a\aWARNING: Your /etc/fstab does not contain the fsck passno\n"
"\tfield. I will kludge around things for you, but you\n"
@@ -3426,75 +3462,80 @@ msgid ""
"\n"
msgstr ""
-#: misc/fsck.c:481
+#: misc/fsck.c:477
#, c-format
msgid "fsck: %s: not found\n"
msgstr ""
-#: misc/fsck.c:597
+#: misc/fsck.c:593
#, c-format
msgid "%s: wait: No more child process?!?\n"
msgstr ""
-#: misc/fsck.c:619
+#: misc/fsck.c:615
#, c-format
msgid "Warning... %s for device %s exited with signal %d.\n"
msgstr ""
-#: misc/fsck.c:625
+#: misc/fsck.c:621
#, c-format
msgid "%s %s: status is %x, should never happen.\n"
msgstr ""
-#: misc/fsck.c:664
+#: misc/fsck.c:660
#, c-format
msgid "Finished with %s (exit status %d)\n"
msgstr ""
-#: misc/fsck.c:724
+#: misc/fsck.c:720
#, c-format
msgid "%s: Error %d while executing fsck.%s for %s\n"
msgstr ""
-#: misc/fsck.c:745
+#: misc/fsck.c:741
msgid ""
"Either all or none of the filesystem types passed to -t must be prefixed\n"
"with 'no' or '!'.\n"
msgstr ""
-#: misc/fsck.c:764
+#: misc/fsck.c:760
msgid "Couldn't allocate memory for filesystem types\n"
msgstr ""
-#: misc/fsck.c:887
+#: misc/fsck.c:883
#, c-format
-msgid "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number\n"
+msgid ""
+"%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
+"number\n"
msgstr ""
-#: misc/fsck.c:914
+#: misc/fsck.c:910
#, c-format
msgid "fsck: cannot check %s: fsck.%s not found\n"
msgstr ""
-#: misc/fsck.c:970
+#: misc/fsck.c:966
msgid "Checking all file systems.\n"
msgstr "æ£åœ¨æ£€æŸ¥æ‰€æœ‰æ–‡ä»¶ç³»ç»Ÿ.\n"
-#: misc/fsck.c:1061
+#: misc/fsck.c:1057
#, c-format
msgid "--waiting-- (pass %d)\n"
msgstr "--请ç¨å€™-- (å®Œæˆ %d)\n"
-#: misc/fsck.c:1081
-msgid "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
-msgstr "用法: Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
+#: misc/fsck.c:1077
+msgid ""
+"Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
+msgstr ""
+"用法: Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] "
+"[filesys ...]\n"
-#: misc/fsck.c:1123
+#: misc/fsck.c:1119
#, c-format
msgid "%s: too many devices\n"
msgstr "%s: 设备过多\n"
-#: misc/fsck.c:1156 misc/fsck.c:1242
+#: misc/fsck.c:1152 misc/fsck.c:1238
#, c-format
msgid "%s: too many arguments\n"
msgstr "%s: å‚数过多\n"
@@ -3514,7 +3555,7 @@ msgstr ""
msgid "While reading version on %s"
msgstr ""
-#: misc/mke2fs.c:103
+#: misc/mke2fs.c:104
#, c-format
msgid ""
"Usage: %s [-c|-l filename] [-b block-size] [-f fragment-size]\n"
@@ -3523,38 +3564,38 @@ msgid ""
"\t[-m reserved-blocks-percentage] [-o creator-os]\n"
"\t[-g blocks-per-group] [-L volume-label] [-M last-mounted-directory]\n"
"\t[-O feature[,...]] [-r fs-revision] [-E extended-option[,...]]\n"
-"\t[-T fs-type] [-jnqvFSV] device [blocks-count]\n"
+"\t[-T fs-type] [-U UUID] [-jnqvFSV] device [blocks-count]\n"
msgstr ""
-#: misc/mke2fs.c:205
+#: misc/mke2fs.c:206
#, c-format
msgid "Running command: %s\n"
msgstr "æ£åœ¨æ‰§è¡Œå‘½ä»¤: %s\n"
-#: misc/mke2fs.c:209
+#: misc/mke2fs.c:210
#, c-format
msgid "while trying to run '%s'"
msgstr "当å°è¯•è¿è¡Œ '%s' æ—¶"
-#: misc/mke2fs.c:216
+#: misc/mke2fs.c:217
msgid "while processing list of bad blocks from program"
msgstr ""
-#: misc/mke2fs.c:243
+#: misc/mke2fs.c:244
#, c-format
msgid "Block %d in primary superblock/group descriptor area bad.\n"
msgstr ""
-#: misc/mke2fs.c:245
+#: misc/mke2fs.c:246
#, c-format
msgid "Blocks %u through %u must be good in order to build a filesystem.\n"
msgstr ""
-#: misc/mke2fs.c:248
+#: misc/mke2fs.c:249
msgid "Aborting....\n"
msgstr "æ£åœ¨ç»ˆæ¢...\n"
-#: misc/mke2fs.c:268
+#: misc/mke2fs.c:269
#, c-format
msgid ""
"Warning: the backup superblock/group descriptors at block %u contain\n"
@@ -3562,86 +3603,86 @@ msgid ""
"\n"
msgstr ""
-#: misc/mke2fs.c:287
+#: misc/mke2fs.c:288
msgid "while marking bad blocks as used"
msgstr ""
-#: misc/mke2fs.c:345
+#: misc/mke2fs.c:346
msgid "done \n"
msgstr "å®Œæˆ \n"
-#: misc/mke2fs.c:359
+#: misc/mke2fs.c:360
msgid "Writing inode tables: "
msgstr "æ£åœ¨å†™å…¥inode表: "
-#: misc/mke2fs.c:382
+#: misc/mke2fs.c:383
#, c-format
msgid ""
"\n"
"Could not write %d blocks in inode table starting at %u: %s\n"
msgstr ""
-#: misc/mke2fs.c:406
+#: misc/mke2fs.c:407
msgid "while creating root dir"
msgstr ""
-#: misc/mke2fs.c:413
+#: misc/mke2fs.c:414
msgid "while reading root inode"
msgstr "当读å–åå—inodeæ—¶"
-#: misc/mke2fs.c:427
+#: misc/mke2fs.c:428
msgid "while setting root inode ownership"
msgstr ""
-#: misc/mke2fs.c:445
+#: misc/mke2fs.c:446
msgid "while creating /lost+found"
msgstr ""
-#: misc/mke2fs.c:452
+#: misc/mke2fs.c:453
msgid "while looking up /lost+found"
msgstr ""
-#: misc/mke2fs.c:465
+#: misc/mke2fs.c:466
msgid "while expanding /lost+found"
msgstr ""
-#: misc/mke2fs.c:480
+#: misc/mke2fs.c:481
msgid "while setting bad block inode"
msgstr ""
-#: misc/mke2fs.c:507
+#: misc/mke2fs.c:508
#, c-format
msgid "Out of memory erasing sectors %d-%d\n"
msgstr ""
-#: misc/mke2fs.c:517
+#: misc/mke2fs.c:518
#, c-format
msgid "Warning: could not read block 0: %s\n"
msgstr ""
-#: misc/mke2fs.c:533
+#: misc/mke2fs.c:534
#, c-format
msgid "Warning: could not erase sector %d: %s\n"
msgstr ""
-#: misc/mke2fs.c:549
+#: misc/mke2fs.c:550
msgid "while initializing journal superblock"
msgstr ""
-#: misc/mke2fs.c:555
+#: misc/mke2fs.c:556
msgid "Zeroing journal device: "
msgstr "æ£åœ¨å°†æ—¥å¿—设备清零: "
-#: misc/mke2fs.c:568
+#: misc/mke2fs.c:569
#, c-format
msgid "while zeroing journal device (block %u, count %d)"
msgstr ""
-#: misc/mke2fs.c:584
+#: misc/mke2fs.c:585
msgid "while writing journal superblock"
msgstr ""
-#: misc/mke2fs.c:600
+#: misc/mke2fs.c:601
#, c-format
msgid ""
"warning: %u blocks unused.\n"
@@ -3650,96 +3691,96 @@ msgstr ""
"è¦å‘Š: %u å—未使用.\n"
"\n"
-#: misc/mke2fs.c:605
+#: misc/mke2fs.c:606
#, c-format
msgid "Filesystem label=%s\n"
msgstr "æ–‡ä»¶ç³»ç»Ÿæ ‡ç¾=%s\n"
-#: misc/mke2fs.c:606
+#: misc/mke2fs.c:607
msgid "OS type: "
msgstr "æ“作系统:"
-#: misc/mke2fs.c:611
+#: misc/mke2fs.c:612
#, c-format
msgid "Block size=%u (log=%u)\n"
msgstr "å—大å°=%u (log=%u)\n"
-#: misc/mke2fs.c:613
+#: misc/mke2fs.c:614
#, c-format
msgid "Fragment size=%u (log=%u)\n"
msgstr "分å—大å°=%u (log=%u)\n"
-#: misc/mke2fs.c:615
+#: misc/mke2fs.c:616
#, c-format
msgid "%u inodes, %u blocks\n"
msgstr ""
-#: misc/mke2fs.c:617
+#: misc/mke2fs.c:618
#, c-format
msgid "%u blocks (%2.2f%%) reserved for the super user\n"
msgstr ""
-#: misc/mke2fs.c:620
+#: misc/mke2fs.c:621
#, c-format
msgid "First data block=%u\n"
msgstr "第一个数æ®å—=%u\n"
-#: misc/mke2fs.c:622
+#: misc/mke2fs.c:623
#, c-format
msgid "Maximum filesystem blocks=%lu\n"
msgstr ""
-#: misc/mke2fs.c:626
+#: misc/mke2fs.c:627
#, c-format
msgid "%u block groups\n"
msgstr ""
-#: misc/mke2fs.c:628
+#: misc/mke2fs.c:629
#, c-format
msgid "%u block group\n"
msgstr ""
-#: misc/mke2fs.c:629
+#: misc/mke2fs.c:630
#, c-format
msgid "%u blocks per group, %u fragments per group\n"
msgstr ""
-#: misc/mke2fs.c:631
+#: misc/mke2fs.c:632
#, c-format
msgid "%u inodes per group\n"
msgstr ""
-#: misc/mke2fs.c:638
+#: misc/mke2fs.c:639
#, c-format
msgid "Superblock backups stored on blocks: "
msgstr ""
-#: misc/mke2fs.c:717
+#: misc/mke2fs.c:718
#, c-format
msgid "Invalid stride parameter: %s\n"
msgstr ""
-#: misc/mke2fs.c:732
+#: misc/mke2fs.c:733
#, c-format
msgid "Invalid stripe-width parameter: %s\n"
msgstr ""
-#: misc/mke2fs.c:754
+#: misc/mke2fs.c:755
#, c-format
msgid "Invalid resize parameter: %s\n"
msgstr ""
-#: misc/mke2fs.c:761
+#: misc/mke2fs.c:762
#, c-format
msgid "The resize maximum must be greater than the filesystem size.\n"
msgstr ""
-#: misc/mke2fs.c:785
+#: misc/mke2fs.c:786
#, c-format
msgid "On-line resizing not supported with revision 0 filesystems\n"
msgstr ""
-#: misc/mke2fs.c:807
+#: misc/mke2fs.c:808
#, c-format
msgid ""
"\n"
@@ -3757,7 +3798,7 @@ msgid ""
"\n"
msgstr ""
-#: misc/mke2fs.c:823
+#: misc/mke2fs.c:824
#, c-format
msgid ""
"\n"
@@ -3765,149 +3806,150 @@ msgid ""
"\n"
msgstr ""
-#: misc/mke2fs.c:855
+#: misc/mke2fs.c:856
#, c-format
msgid ""
"Syntax error in mke2fs config file (%s, line #%d)\n"
"\t%s\n"
msgstr ""
-#: misc/mke2fs.c:868 misc/tune2fs.c:350
+#: misc/mke2fs.c:869 misc/tune2fs.c:355
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr "è®¾ç½®äº†æ— æ•ˆçš„æ–‡ä»¶ç³»ç»Ÿé€‰é¡¹: %s\n"
-#: misc/mke2fs.c:976
+#: misc/mke2fs.c:979
#, c-format
msgid ""
"\n"
"Warning! Your mke2fs.conf file does not define the %s filesystem type.\n"
msgstr ""
-#: misc/mke2fs.c:979
+#: misc/mke2fs.c:982
#, c-format
msgid ""
"You probably need to install an updated mke2fs.conf file.\n"
"\n"
msgstr ""
-#: misc/mke2fs.c:1173
+#: misc/mke2fs.c:1176
#, c-format
msgid "invalid block size - %s"
msgstr "æ— æ•ˆçš„å—å¤§å° - %s"
-#: misc/mke2fs.c:1177
+#: misc/mke2fs.c:1180
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr ""
-#: misc/mke2fs.c:1193
+#: misc/mke2fs.c:1196
#, c-format
msgid "invalid fragment size - %s"
msgstr ""
-#: misc/mke2fs.c:1199
+#: misc/mke2fs.c:1202
#, c-format
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr ""
-#: misc/mke2fs.c:1206
+#: misc/mke2fs.c:1209
msgid "Illegal number for blocks per group"
msgstr ""
-#: misc/mke2fs.c:1211
+#: misc/mke2fs.c:1214
msgid "blocks per group must be multiple of 8"
msgstr ""
-#: misc/mke2fs.c:1219
+#: misc/mke2fs.c:1222
msgid "Illegal number for flex_bg size"
msgstr ""
-#: misc/mke2fs.c:1225
+#: misc/mke2fs.c:1228
msgid "flex_bg size must be a power of 2"
msgstr "flex_bg 大å°å¿…须是2的次方"
-#: misc/mke2fs.c:1235
+#: misc/mke2fs.c:1238
#, c-format
msgid "invalid inode ratio %s (min %d/max %d)"
msgstr ""
-#: misc/mke2fs.c:1252
+#: misc/mke2fs.c:1255
msgid "in malloc for bad_blocks_filename"
msgstr ""
-#: misc/mke2fs.c:1261
+#: misc/mke2fs.c:1265
#, c-format
msgid "invalid reserved blocks percent - %s"
msgstr ""
-#: misc/mke2fs.c:1279
+#: misc/mke2fs.c:1283
#, c-format
msgid "bad revision level - %s"
msgstr ""
-#: misc/mke2fs.c:1291
+#: misc/mke2fs.c:1295
#, c-format
msgid "invalid inode size - %s"
msgstr "æ— æ•ˆçš„inodeå¤§å° - %s"
-#: misc/mke2fs.c:1311
+#: misc/mke2fs.c:1315
#, c-format
msgid "bad num inodes - %s"
msgstr ""
-#: misc/mke2fs.c:1372 misc/mke2fs.c:2020
+#: misc/mke2fs.c:1380 misc/mke2fs.c:2068
#, c-format
msgid "while trying to open journal device %s\n"
msgstr ""
-#: misc/mke2fs.c:1378
+#: misc/mke2fs.c:1386
#, c-format
msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n"
msgstr ""
-#: misc/mke2fs.c:1384
+#: misc/mke2fs.c:1392
#, fuzzy, c-format
msgid "Using journal device's blocksize: %d\n"
msgstr "%s ä¸æ˜¯ä¸€ä¸ªæ—¥å¿—设备.\n"
-#: misc/mke2fs.c:1393
+#: misc/mke2fs.c:1401
#, c-format
msgid "%d-byte blocks too big for system (max %d)"
msgstr ""
-#: misc/mke2fs.c:1397
+#: misc/mke2fs.c:1405
#, c-format
-msgid "Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
+msgid ""
+"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
msgstr ""
-#: misc/mke2fs.c:1405
+#: misc/mke2fs.c:1413
#, c-format
msgid "invalid blocks count - %s"
msgstr ""
-#: misc/mke2fs.c:1415
+#: misc/mke2fs.c:1423
msgid "filesystem"
msgstr "文件系统"
-#: misc/mke2fs.c:1437
+#: misc/mke2fs.c:1459
#, c-format
msgid ""
"%s: Size of device %s too big to be expressed in 32 bits\n"
"\tusing a blocksize of %d.\n"
msgstr ""
-#: misc/mke2fs.c:1445 resize/main.c:366
+#: misc/mke2fs.c:1468 resize/main.c:376
msgid "while trying to determine filesystem size"
msgstr ""
-#: misc/mke2fs.c:1451
+#: misc/mke2fs.c:1475
msgid ""
"Couldn't determine device size; you must specify\n"
"the size of the filesystem\n"
msgstr ""
-#: misc/mke2fs.c:1458
+#: misc/mke2fs.c:1482
msgid ""
"Device size reported to be zero. Invalid partition specified, or\n"
"\tpartition table wasn't reread after running fdisk, due to\n"
@@ -3915,73 +3957,73 @@ msgid ""
"\tto re-read your partition table.\n"
msgstr ""
-#: misc/mke2fs.c:1476
+#: misc/mke2fs.c:1500
msgid "Filesystem larger than apparent device size."
msgstr ""
-#: misc/mke2fs.c:1482
+#: misc/mke2fs.c:1506
#, c-format
msgid "Failed to parse fs types list\n"
msgstr ""
-#: misc/mke2fs.c:1518
+#: misc/mke2fs.c:1540
msgid "fs_types for mke2fs.conf resolution: "
msgstr ""
-#: misc/mke2fs.c:1525
+#: misc/mke2fs.c:1547
#, c-format
msgid "Filesystem features not supported with revision 0 filesystems\n"
msgstr ""
-#: misc/mke2fs.c:1532
+#: misc/mke2fs.c:1554
#, c-format
msgid "Sparse superblocks not supported with revision 0 filesystems\n"
msgstr ""
-#: misc/mke2fs.c:1544
+#: misc/mke2fs.c:1566
#, c-format
msgid "Journals not supported with revision 0 filesystems\n"
msgstr ""
-#: misc/mke2fs.c:1562
+#: misc/mke2fs.c:1584
#, c-format
msgid ""
"The resize_inode and meta_bg features are not compatible.\n"
"They can not be both enabled simultaneously.\n"
msgstr ""
-#: misc/mke2fs.c:1579
+#: misc/mke2fs.c:1601
msgid "while trying to determine hardware sector size"
msgstr ""
-#: misc/mke2fs.c:1637
+#: misc/mke2fs.c:1658
msgid "reserved online resize blocks not supported on non-sparse filesystem"
msgstr ""
-#: misc/mke2fs.c:1646
+#: misc/mke2fs.c:1667
msgid "blocks per group count out of range"
msgstr ""
-#: misc/mke2fs.c:1661
+#: misc/mke2fs.c:1682
msgid "Flex_bg feature not enabled, so flex_bg size may not be specified"
msgstr ""
-#: misc/mke2fs.c:1673
+#: misc/mke2fs.c:1694
#, c-format
msgid "invalid inode size %d (min %d/max %d)"
msgstr ""
-#: misc/mke2fs.c:1687
+#: misc/mke2fs.c:1708
#, c-format
msgid "too many inodes (%llu), raise inode ratio?"
msgstr ""
-#: misc/mke2fs.c:1692
+#: misc/mke2fs.c:1713
#, c-format
msgid "too many inodes (%llu), specify < 2^32 inodes"
msgstr ""
-#: misc/mke2fs.c:1707
+#: misc/mke2fs.c:1728
#, c-format
msgid ""
"inode_size (%u) * inodes_count (%u) too big for a\n"
@@ -3989,12 +4031,17 @@ msgid ""
"\tor lower inode count (-N).\n"
msgstr ""
-#: misc/mke2fs.c:1804 misc/tune2fs.c:1398
+#: misc/mke2fs.c:1821 misc/tune2fs.c:1453
+#, fuzzy
+msgid "Couldn't allocate memory for tdb filename\n"
+msgstr "æ— æ³•åˆ†é…å—ç¼“å˜ (大å°=%d)\n"
+
+#: misc/mke2fs.c:1834 misc/tune2fs.c:1475
#, c-format
msgid "while trying to delete %s"
msgstr "当å°è¯•åˆ 除 %s æ—¶"
-#: misc/mke2fs.c:1813
+#: misc/mke2fs.c:1844
#, c-format
msgid ""
"Overwriting existing filesystem; this can be undone using the command:\n"
@@ -4002,67 +4049,72 @@ msgid ""
"\n"
msgstr ""
-#: misc/mke2fs.c:1860
+#: misc/mke2fs.c:1893
msgid "while setting up superblock"
msgstr ""
-#: misc/mke2fs.c:1904
+#: misc/mke2fs.c:1952
#, c-format
msgid "unknown os - %s"
msgstr "未知æ“作系统 - %s"
-#: misc/mke2fs.c:1958
+#: misc/mke2fs.c:2006
msgid "while trying to allocate filesystem tables"
msgstr ""
-#: misc/mke2fs.c:1989
+#: misc/mke2fs.c:2037
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr ""
-#: misc/mke2fs.c:2002
+#: misc/mke2fs.c:2050
msgid "while reserving blocks for online resize"
msgstr ""
-#: misc/mke2fs.c:2013 misc/tune2fs.c:474
+#: misc/mke2fs.c:2061 misc/tune2fs.c:479
msgid "journal"
msgstr "日志"
-#: misc/mke2fs.c:2025
+#: misc/mke2fs.c:2073
#, c-format
msgid "Adding journal to device %s: "
msgstr ""
-#: misc/mke2fs.c:2032
+#: misc/mke2fs.c:2080
#, c-format
msgid ""
"\n"
"\twhile trying to add journal to device %s"
msgstr ""
-#: misc/mke2fs.c:2037 misc/mke2fs.c:2063 misc/tune2fs.c:502 misc/tune2fs.c:516
+#: misc/mke2fs.c:2085 misc/mke2fs.c:2117 misc/tune2fs.c:508 misc/tune2fs.c:522
#, c-format
msgid "done\n"
msgstr "完æˆ\n"
-#: misc/mke2fs.c:2051
+#: misc/mke2fs.c:2094
+#, c-format
+msgid "Skipping journal creation in super-only mode\n"
+msgstr ""
+
+#: misc/mke2fs.c:2105
#, fuzzy, c-format
msgid "Creating journal (%u blocks): "
msgstr "<åå— inode>"
-#: misc/mke2fs.c:2068
+#: misc/mke2fs.c:2122
#, c-format
msgid "Writing superblocks and filesystem accounting information: "
msgstr ""
-#: misc/mke2fs.c:2073
+#: misc/mke2fs.c:2127
#, c-format
msgid ""
"\n"
"Warning, had trouble writing out superblocks."
msgstr ""
-#: misc/mke2fs.c:2076
+#: misc/mke2fs.c:2130
#, c-format
msgid ""
"done\n"
@@ -4111,11 +4163,11 @@ msgstr "æ— æ³•èŽ·å¾— %s 的大å°: %s"
msgid "%s: h=%3d s=%3d c=%4d start=%8d size=%8lu end=%8d\n"
msgstr ""
-#: misc/tune2fs.c:94
+#: misc/tune2fs.c:96
msgid "Please run e2fsck on the filesystem.\n"
msgstr "请在这个文件系统上è¿è¡Œ e2fsck.\n"
-#: misc/tune2fs.c:101
+#: misc/tune2fs.c:105
#, c-format
msgid ""
"Usage: %s [-c max_mounts_count] [-e errors_behavior] [-g group]\n"
@@ -4127,198 +4179,198 @@ msgid ""
"\t[ -I new_inode_size ] device\n"
msgstr ""
-#: misc/tune2fs.c:185
+#: misc/tune2fs.c:190
msgid "while trying to open external journal"
msgstr ""
-#: misc/tune2fs.c:189
+#: misc/tune2fs.c:194
#, fuzzy, c-format
msgid "%s is not a journal device.\n"
msgstr "%s ä¸æ˜¯ä¸€ä¸ªæ—¥å¿—设备.\n"
-#: misc/tune2fs.c:204
+#: misc/tune2fs.c:209
msgid "Journal superblock not found!\n"
msgstr "日志超级å—未找到!\n"
-#: misc/tune2fs.c:216
+#: misc/tune2fs.c:221
msgid "Filesystem's UUID not found on journal device.\n"
msgstr ""
-#: misc/tune2fs.c:237
+#: misc/tune2fs.c:242
#, fuzzy
msgid "Journal NOT removed\n"
msgstr "æ—¥å¿—æœªåˆ é™¤\n"
-#: misc/tune2fs.c:243
+#: misc/tune2fs.c:248
msgid "Journal removed\n"
msgstr "æ—¥å¿—å·²åˆ é™¤\n"
-#: misc/tune2fs.c:283
+#: misc/tune2fs.c:288
msgid "while reading bitmaps"
msgstr "当读å–ä½å›¾æ—¶"
-#: misc/tune2fs.c:291
+#: misc/tune2fs.c:296
msgid "while clearing journal inode"
msgstr "当读å–åå—inodeæ—¶"
-#: misc/tune2fs.c:302
+#: misc/tune2fs.c:307
msgid "while writing journal inode"
msgstr ""
-#: misc/tune2fs.c:317
+#: misc/tune2fs.c:322
#, fuzzy, c-format
msgid "Invalid mount option set: %s\n"
msgstr "è®¾ç½®äº†æ— æ•ˆçš„æŒ‚è½½é€‰é¡¹: %s\n"
-#: misc/tune2fs.c:353
+#: misc/tune2fs.c:358
#, c-format
msgid "Clearing filesystem feature '%s' not supported.\n"
msgstr ""
-#: misc/tune2fs.c:359
+#: misc/tune2fs.c:364
#, c-format
msgid "Setting filesystem feature '%s' not supported.\n"
msgstr ""
-#: misc/tune2fs.c:368
+#: misc/tune2fs.c:373
msgid ""
"The has_journal feature may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
msgstr ""
-#: misc/tune2fs.c:376
+#: misc/tune2fs.c:381
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
msgstr ""
-#: misc/tune2fs.c:409
+#: misc/tune2fs.c:414
msgid ""
"Clearing the flex_bg flag would cause the the filesystem to be\n"
"inconsistent.\n"
msgstr ""
-#: misc/tune2fs.c:420
+#: misc/tune2fs.c:425
msgid ""
"The huge_file feature may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
msgstr ""
-#: misc/tune2fs.c:448
+#: misc/tune2fs.c:453
#, c-format
msgid "(and reboot afterwards!)\n"
msgstr "(并且过åŽé‡å¯!)\n"
-#: misc/tune2fs.c:469
+#: misc/tune2fs.c:474
msgid "The filesystem already has a journal.\n"
msgstr ""
-#: misc/tune2fs.c:486
+#: misc/tune2fs.c:492
#, c-format
msgid ""
"\n"
"\twhile trying to open journal on %s\n"
msgstr ""
-#: misc/tune2fs.c:490
+#: misc/tune2fs.c:496
#, c-format
msgid "Creating journal on device %s: "
msgstr ""
-#: misc/tune2fs.c:498
+#: misc/tune2fs.c:504
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr ""
-#: misc/tune2fs.c:504
+#: misc/tune2fs.c:510
msgid "Creating journal inode: "
msgstr ""
-#: misc/tune2fs.c:513
+#: misc/tune2fs.c:519
msgid ""
"\n"
"\twhile trying to create journal file"
msgstr ""
-#: misc/tune2fs.c:580
+#: misc/tune2fs.c:585
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr ""
-#: misc/tune2fs.c:605 misc/tune2fs.c:618
+#: misc/tune2fs.c:609 misc/tune2fs.c:622
#, c-format
msgid "bad mounts count - %s"
msgstr "错误挂载计数 - %s"
-#: misc/tune2fs.c:634
+#: misc/tune2fs.c:638
#, c-format
msgid "bad error behavior - %s"
msgstr ""
-#: misc/tune2fs.c:661
+#: misc/tune2fs.c:665
#, c-format
msgid "bad gid/group name - %s"
msgstr ""
-#: misc/tune2fs.c:694
+#: misc/tune2fs.c:698
#, c-format
msgid "bad interval - %s"
msgstr ""
-#: misc/tune2fs.c:722
+#: misc/tune2fs.c:727
#, c-format
msgid "bad reserved block ratio - %s"
msgstr ""
-#: misc/tune2fs.c:737
+#: misc/tune2fs.c:742
msgid "-o may only be specified once"
msgstr "-oåªèƒ½è¢«æŒ‡å®šä¸€æ¬¡"
-#: misc/tune2fs.c:747
+#: misc/tune2fs.c:752
msgid "-O may only be specified once"
msgstr "-Oåªèƒ½è¢«æŒ‡å®šä¸€æ¬¡"
-#: misc/tune2fs.c:757
+#: misc/tune2fs.c:762
#, c-format
msgid "bad reserved blocks count - %s"
msgstr ""
-#: misc/tune2fs.c:786
+#: misc/tune2fs.c:791
#, c-format
msgid "bad uid/user name - %s"
msgstr ""
-#: misc/tune2fs.c:803
+#: misc/tune2fs.c:808
#, fuzzy, c-format
msgid "bad inode size - %s"
msgstr "æ— æ•ˆçš„inodeå¤§å° - %s"
-#: misc/tune2fs.c:810
+#: misc/tune2fs.c:815
#, c-format
msgid "Inode size must be a power of two- %s"
msgstr "Inode 大å°å¿…须是2的次方- %s"
-#: misc/tune2fs.c:897
+#: misc/tune2fs.c:904
#, c-format
msgid "Invalid RAID stride: %s\n"
msgstr ""
-#: misc/tune2fs.c:912
+#: misc/tune2fs.c:919
#, c-format
msgid "Invalid RAID stripe-width: %s\n"
msgstr ""
-#: misc/tune2fs.c:927
+#: misc/tune2fs.c:934
#, c-format
msgid "Invalid hash algorithm: %s\n"
msgstr ""
-#: misc/tune2fs.c:933
+#: misc/tune2fs.c:940
#, c-format
msgid "Setting default hash algorithm to %s (%d)\n"
msgstr ""
-#: misc/tune2fs.c:941
+#: misc/tune2fs.c:948
#, c-format
msgid ""
"\n"
@@ -4335,14 +4387,14 @@ msgid ""
"\t^test_fs\n"
msgstr ""
-#: misc/tune2fs.c:1330 resize/resize2fs.c:724
+#: misc/tune2fs.c:1388 misc/tune2fs.c:1393 resize/resize2fs.c:785
msgid "blocks to be moved"
msgstr ""
-#: misc/tune2fs.c:1407
-#, c-format
+#: misc/tune2fs.c:1485
+#, fuzzy, c-format
msgid ""
-"To undo the tune2fs operations please run the command\n"
+"To undo the tune2fs operation please run the command\n"
" e2undo %s %s\n"
"\n"
msgstr ""
@@ -4350,110 +4402,116 @@ msgstr ""
" e2undo %s %s\n"
"\n"
-#: misc/tune2fs.c:1463
-#, c-format
-msgid "The inode size is already %d\n"
-msgstr ""
+#: misc/tune2fs.c:1546
+#, fuzzy, c-format
+msgid "The inode size is already %lu\n"
+msgstr "æ£åœ¨å°†inode大å°è®¾ç½®ä¸º %lu\n"
-#: misc/tune2fs.c:1468
+#: misc/tune2fs.c:1551
#, c-format
msgid "Shrinking the inode size is not supported\n"
msgstr ""
-#: misc/tune2fs.c:1511
+#: misc/tune2fs.c:1594
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr ""
-#: misc/tune2fs.c:1517
+#: misc/tune2fs.c:1600
#, c-format
msgid "Setting current mount count to %d\n"
msgstr ""
-#: misc/tune2fs.c:1522
+#: misc/tune2fs.c:1605
#, c-format
msgid "Setting error behavior to %d\n"
msgstr ""
-#: misc/tune2fs.c:1527
+#: misc/tune2fs.c:1610
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr ""
-#: misc/tune2fs.c:1532
+#: misc/tune2fs.c:1615
#, c-format
msgid "Setting interval between checks to %lu seconds\n"
msgstr ""
-#: misc/tune2fs.c:1538
+#: misc/tune2fs.c:1622
#, c-format
msgid "Setting reserved blocks percentage to %g%% (%u blocks)\n"
msgstr ""
-#: misc/tune2fs.c:1544
+#: misc/tune2fs.c:1629
#, c-format
msgid "reserved blocks count is too big (%lu)"
msgstr "ä¿ç•™å—çš„æ•°é‡å¤ªå¤§ (%lu)"
-#: misc/tune2fs.c:1550
+#: misc/tune2fs.c:1635
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr ""
-#: misc/tune2fs.c:1556
+#: misc/tune2fs.c:1641
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
msgstr ""
-#: misc/tune2fs.c:1563
+#: misc/tune2fs.c:1648
#, c-format
msgid ""
"\n"
"Sparse superblock flag set. %s"
msgstr ""
-#: misc/tune2fs.c:1568
+#: misc/tune2fs.c:1653
msgid ""
"\n"
"Clearing the sparse superflag not supported.\n"
msgstr ""
-#: misc/tune2fs.c:1575
+#: misc/tune2fs.c:1660
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr ""
-#: misc/tune2fs.c:1581
+#: misc/tune2fs.c:1666
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr ""
-#: misc/tune2fs.c:1616
+#: misc/tune2fs.c:1717
msgid "Invalid UUID format\n"
msgstr "æ— æ•ˆçš„ UUID æ ¼å¼\n"
-#: misc/tune2fs.c:1623
+#: misc/tune2fs.c:1729
msgid "The inode size may only be changed when the filesystem is unmounted.\n"
msgstr ""
-#: misc/tune2fs.c:1634
+#: misc/tune2fs.c:1736
+msgid ""
+"Changing the inode size not supported for filesystems with the flex_bg\n"
+"feature enabled.\n"
+msgstr ""
+
+#: misc/tune2fs.c:1748
msgid ""
"Error in resizing the inode size.\n"
"Run e2undo to undo the file system changes. \n"
msgstr ""
-#: misc/tune2fs.c:1638
+#: misc/tune2fs.c:1752
#, c-format
msgid "Setting inode size %lu\n"
msgstr "æ£åœ¨å°†inode大å°è®¾ç½®ä¸º %lu\n"
-#: misc/tune2fs.c:1648
+#: misc/tune2fs.c:1762
#, c-format
msgid "Setting stride size to %d\n"
msgstr ""
-#: misc/tune2fs.c:1653
+#: misc/tune2fs.c:1767
#, c-format
msgid "Setting stripe width to %d\n"
msgstr ""
@@ -4564,74 +4622,84 @@ msgstr ""
msgid "#\t\t %u -> %u (%d)\n"
msgstr ""
-#: resize/main.c:39
+#: resize/main.c:42
#, c-format
msgid ""
"Usage: %s [-d debug_flags] [-f] [-F] [-M] [-P] [-p] device [new_size]\n"
"\n"
msgstr ""
-#: resize/main.c:61
+#: resize/main.c:64
#, fuzzy
msgid "Extending the inode table"
msgstr "æ£åœ¨æ‰©å……inode表"
-#: resize/main.c:64
+#: resize/main.c:67
#, fuzzy
msgid "Relocating blocks"
msgstr "æ£åœ¨é‡å®šä½å—"
-#: resize/main.c:67
+#: resize/main.c:70
msgid "Scanning inode table"
msgstr "æ£åœ¨æ‰«æinode表"
-#: resize/main.c:70
+#: resize/main.c:73
#, fuzzy
msgid "Updating inode references"
msgstr "æ£åœ¨æ›´æ–°inode引用时"
-#: resize/main.c:73
+#: resize/main.c:76
msgid "Moving inode table"
msgstr "移动inode表"
-#: resize/main.c:76
+#: resize/main.c:79
#, fuzzy
msgid "Unknown pass?!?"
msgstr "未知æ¥éª¤?!?"
-#: resize/main.c:79
+#: resize/main.c:82
#, c-format
msgid "Begin pass %d (max = %lu)\n"
msgstr ""
-#: resize/main.c:261
+#: resize/main.c:267
#, c-format
msgid "while opening %s"
msgstr "打开%s时"
-#: resize/main.c:273
+#: resize/main.c:279
#, c-format
msgid "while getting stat information for %s"
msgstr "获å–%sçš„statä¿¡æ¯æ—¶å‡ºé”™ã€‚"
-#: resize/main.c:332
+#: resize/main.c:340
#, c-format
msgid ""
"%s: The combination of flex_bg and\n"
"\t!resize_inode features is not supported by resize2fs.\n"
msgstr ""
-#: resize/main.c:340
+#: resize/main.c:350
#, c-format
msgid "Estimated minimum size of the filesystem: %u\n"
msgstr ""
-#: resize/main.c:384
+#: resize/main.c:386
+#, fuzzy, c-format
+msgid "Invalid new size: %s\n"
+msgstr "æ— æ•ˆçš„inodeå¤§å° - %s"
+
+#: resize/main.c:398
+#, c-format
+msgid "New size smaller than minimum (%u)\n"
+msgstr ""
+
+#: resize/main.c:404
#, fuzzy
msgid "Invalid stride length"
msgstr "æ— æ•ˆçš„åŽç¼€é•¿åº¦"
-#: resize/main.c:408
+#: resize/main.c:428
#, c-format
msgid ""
"The containing partition (or device) is only %u (%dk) blocks.\n"
@@ -4639,14 +4707,14 @@ msgid ""
"\n"
msgstr ""
-#: resize/main.c:415
+#: resize/main.c:435
#, c-format
msgid ""
"The filesystem is already %u blocks long. Nothing to do!\n"
"\n"
msgstr ""
-#: resize/main.c:426
+#: resize/main.c:446
#, c-format
msgid ""
"Please run 'e2fsck -f %s' first.\n"
@@ -4655,18 +4723,23 @@ msgstr ""
"请先è¿è¡Œ 'e2fsck -f %s'.\n"
"\n"
-#: resize/main.c:437
+#: resize/main.c:457
#, c-format
msgid "while trying to resize %s"
msgstr "当å°è¯•è°ƒæ•´%s的大å°æ—¶"
-#: resize/main.c:442
+#: resize/main.c:462
#, c-format
msgid ""
"The filesystem on %s is now %u blocks long.\n"
"\n"
msgstr ""
+#: resize/main.c:477
+#, fuzzy, c-format
+msgid "while trying to truncate %s"
+msgstr "当å°è¯•å¯¹%s进行stat调用时"
+
#: resize/online.c:37
#, c-format
msgid "Filesystem at %s is mounted on %s; on-line resizing required\n"
@@ -4714,23 +4787,28 @@ msgstr ""
#: resize/online.c:191
#, c-format
-msgid "Filesystem at %s is mounted on %s, and on-line resizing is not supported on this system.\n"
+msgid ""
+"Filesystem at %s is mounted on %s, and on-line resizing is not supported on "
+"this system.\n"
msgstr "文件系统 %s 被挂载在 %s,并且这个系统ä¸æ”¯æŒåœ¨çº¿è°ƒæ•´å¤§å°.\n"
-#: resize/resize2fs.c:294
+#: resize/resize2fs.c:345
#, c-format
msgid "inodes (%llu) must be less than %u"
msgstr ""
-#: resize/resize2fs.c:719
+#: resize/resize2fs.c:577
msgid "reserved blocks"
msgstr "ä¿ç•™çš„å—"
-#: resize/resize2fs.c:729
+#: resize/resize2fs.c:790
msgid "meta-data blocks"
msgstr "元数æ®å—"
-#: resize/resize2fs.c:1667
+#: resize/resize2fs.c:1747
#, c-format
msgid "Should never happen: resize inode corrupt!\n"
msgstr ""
+
+#~ msgid "bad block size - %s"
+#~ msgstr "错误的å—å¤§å° - %s"
diff --git a/resize/Makefile.in b/resize/Makefile.in
index 6758912..b2739ac 100644
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -27,46 +27,46 @@ SRCS= $(srcdir)/extent.c \
$(srcdir)/sim_progress.c
LIBS= $(LIBE2P) $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBINTL)
-DEPLIBS= $(LIBE2P) $(LIBEXT2FS) $(LIBCOM_ERR)
+DEPLIBS= $(LIBE2P) $(LIBEXT2FS) $(DEPLIBCOM_ERR)
STATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) \
$(LIBINTL)
-STATIC_DEPLIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
+DEPSTATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR)
.c.o:
- @echo " CC $<"
- @$(CC) -c $(ALL_CFLAGS) $< -o $@
+ $(E) " CC $<"
+ $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
all:: $(PROGS) $(TEST_PROGS) $(MANPAGES)
resize2fs: $(RESIZE_OBJS) $(DEPLIBS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS)
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS)
-resize2fs.static: $(RESIZE_OBJS) $(STATIC_DEPLIBS)
- @echo " LD $@"
- @$(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o resize2fs.static \
+resize2fs.static: $(RESIZE_OBJS) $(DEPSTATIC_LIBS)
+ $(E) " LD $@"
+ $(Q) $(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o resize2fs.static \
$(RESIZE_OBJS) $(STATIC_LIBS)
resize2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/resize2fs.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/resize2fs.8.in resize2fs.8
+ $(E) " SUBST $@"
+ $(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/resize2fs.8.in resize2fs.8
test_extent: $(TEST_EXTENT_OBJS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS)
+ $(E) " LD $@"
+ $(Q) $(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS)
installdirs:
- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
+ $(E) " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
+ $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
$(DESTDIR)$(man8dir)
install: $(PROGS) $(MANPAGES) installdirs
- @for i in $(PROGS); do \
+ $(Q) for i in $(PROGS); do \
echo " INSTALL $(root_sbindir)/$$i"; \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
done
- @for i in $(MANPAGES); do \
+ $(Q) for i in $(MANPAGES); do \
for j in $(COMPRESS_EXT); do \
$(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
done; \
@@ -75,7 +75,7 @@ install: $(PROGS) $(MANPAGES) installdirs
done
install-strip: install
- @for i in $(PROGS); do \
+ $(Q) for i in $(PROGS); do \
echo " STRIP $(root_sbindir)/$$i"; \
$(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
done
@@ -93,7 +93,7 @@ test_extent.out: test_extent $(srcdir)/test_extent.in
> test_extent.out
check:: test_extent.out
- @if cmp -s test_extent.out $(srcdir)/test_extent.in ; then \
+ $(Q) if cmp -s test_extent.out $(srcdir)/test_extent.in ; then \
echo "Test succeeded." ; \
else \
echo "Test failed!" ; \
@@ -146,27 +146,36 @@ source_tar_file: $(top_srcdir)/.exclude-file
#
extent.o: $(srcdir)/extent.c $(srcdir)/resize2fs.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
$(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(top_srcdir)/lib/e2p/e2p.h
resize2fs.o: $(srcdir)/resize2fs.c $(srcdir)/resize2fs.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
$(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(top_srcdir)/lib/e2p/e2p.h
main.o: $(srcdir)/main.c $(top_srcdir)/lib/e2p/e2p.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
$(srcdir)/resize2fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
- $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
$(top_srcdir)/version.h
online.o: $(srcdir)/online.c $(srcdir)/resize2fs.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
$(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(top_srcdir)/lib/e2p/e2p.h
sim_progress.o: $(srcdir)/sim_progress.c $(srcdir)/resize2fs.h \
$(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
- $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
$(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(top_srcdir)/lib/e2p/e2p.h
diff --git a/resize/main.c b/resize/main.c
index 330e3ea..220c192 100644
--- a/resize/main.c
+++ b/resize/main.c
@@ -375,7 +375,7 @@ int main (int argc, char ** argv)
exit(1);
}
if (force_min_size)
- new_size = calculate_minimum_resize_size(fs);
+ new_size = min_size;
else if (new_size_str) {
new_size = parse_num_blocks(new_size_str,
fs->super->s_log_block_size);
@@ -445,16 +445,22 @@ int main (int argc, char ** argv)
device_name);
exit(1);
}
- printf("Resizing the filesystem on %s to %u (%dk) blocks.\n",
+ printf(_("Resizing the filesystem on "
+ "%s to %u (%dk) blocks.\n"),
device_name, new_size, fs->blocksize / 1024);
retval = resize_fs(fs, &new_size, flags,
((flags & RESIZE_PERCENT_COMPLETE) ?
resize_progress_func : 0));
}
+ free(mtpt);
if (retval) {
com_err(program_name, retval, _("while trying to resize %s"),
device_name);
- ext2fs_close (fs);
+ fprintf(stderr,
+ _("Please run 'e2fsck -fy %s' to fix the filesystem\n"
+ "after the aborted resize operation.\n"),
+ device_name);
+ ext2fs_close(fs);
exit(1);
}
printf(_("The filesystem on %s is now %u blocks long.\n\n"),
diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index 0d5dc81..346fd53 100644
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -49,6 +49,7 @@ static errcode_t inode_ref_fix(ext2_resize_t rfs);
static errcode_t move_itables(ext2_resize_t rfs);
static errcode_t fix_resize_inode(ext2_filsys fs);
static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs);
+static errcode_t fix_sb_journal_backup(ext2_filsys fs);
/*
* Some helper CPP macros
@@ -83,6 +84,10 @@ errcode_t resize_fs(ext2_filsys fs, blk_t *new_size, int flags,
if (retval)
return retval;
+ fs->super->s_state |= EXT2_ERROR_FS;
+ ext2fs_mark_super_dirty(fs);
+ ext2fs_flush(fs);
+
/*
* Create the data structure
*/
@@ -148,6 +153,11 @@ errcode_t resize_fs(ext2_filsys fs, blk_t *new_size, int flags,
if (retval)
goto errout;
+ retval = fix_sb_journal_backup(rfs->new_fs);
+ if (retval)
+ goto errout;
+
+ rfs->new_fs->super->s_state &= ~EXT2_ERROR_FS;
rfs->new_fs->flags &= ~EXT2_FLAG_MASTER_SB_ONLY;
retval = ext2fs_close(rfs->new_fs);
if (retval)
@@ -158,6 +168,10 @@ errcode_t resize_fs(ext2_filsys fs, blk_t *new_size, int flags,
ext2fs_free(rfs->old_fs);
if (rfs->itable_buf)
ext2fs_free_mem(&rfs->itable_buf);
+ if (rfs->reserve_blocks)
+ ext2fs_free_block_bitmap(rfs->reserve_blocks);
+ if (rfs->move_blocks)
+ ext2fs_free_block_bitmap(rfs->move_blocks);
ext2fs_free_mem(&rfs);
return 0;
@@ -1805,6 +1819,8 @@ static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs)
group_free;
ext2fs_group_desc_csum_set(fs, group);
group++;
+ if (group >= fs->group_desc_count)
+ break;
count = 0;
group_free = 0;
uninit = (fs->group_desc[group].bg_flags &
@@ -1845,6 +1861,8 @@ static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs)
group_free;
ext2fs_group_desc_csum_set(fs, group);
group++;
+ if (group >= fs->group_desc_count)
+ break;
count = 0;
group_free = 0;
uninit = (fs->group_desc[group].bg_flags &
@@ -1857,6 +1875,32 @@ static errcode_t ext2fs_calculate_summary_stats(ext2_filsys fs)
}
/*
+ * Journal may have been relocated; update the backup journal blocks
+ * in the superblock.
+ */
+static errcode_t fix_sb_journal_backup(ext2_filsys fs)
+{
+ errcode_t retval;
+ struct ext2_inode inode;
+
+ if (!(fs->super->s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL))
+ return 0;
+
+ /* External journal? Nothing to do. */
+ if (fs->super->s_journal_dev && !fs->super->s_journal_inum)
+ return 0;
+
+ retval = ext2fs_read_inode(fs, fs->super->s_journal_inum, &inode);
+ if (retval)
+ return retval;
+ memcpy(fs->super->s_jnl_blocks, inode.i_block, EXT2_N_BLOCKS*4);
+ fs->super->s_jnl_blocks[16] = inode.i_size;
+ fs->super->s_jnl_backup_type = EXT3_JNL_BACKUP_BLOCKS;
+ ext2fs_mark_super_dirty(fs);
+ return 0;
+}
+
+/*
* calcluate the minimum number of blocks the given fs can be resized to
*/
blk_t calculate_minimum_resize_size(ext2_filsys fs)
@@ -1864,6 +1908,8 @@ blk_t calculate_minimum_resize_size(ext2_filsys fs)
blk_t inode_count, blks_needed, groups, data_blocks;
blk_t grp, data_needed, last_start;
int overhead = 0, num_of_superblocks = 0;
+ int extra_groups = 0;
+ int flexbg_size = 1 << fs->super->s_log_groups_per_flex;
/*
* first figure out how many group descriptors we need to
@@ -1898,11 +1944,9 @@ blk_t calculate_minimum_resize_size(ext2_filsys fs)
* of inode tables of slack space so the resize
* operation can be guaranteed to finish.
*/
- int flexbg_size = 1 << fs->super->s_log_groups_per_flex;
- int extra_groups;
-
extra_groups = flexbg_size - (groups & (flexbg_size - 1));
data_needed += META_OVERHEAD(fs) * extra_groups;
+ extra_groups = groups % flexbg_size;
}
/*
@@ -1966,6 +2010,20 @@ blk_t calculate_minimum_resize_size(ext2_filsys fs)
}
groups += extra_grps;
+ extra_groups += extra_grps;
+ if (fs->super->s_feature_incompat
+ & EXT4_FEATURE_INCOMPAT_FLEX_BG
+ && extra_groups > flexbg_size) {
+ /*
+ * For ext4 we need to allow for up to a flex_bg worth
+ * of inode tables of slack space so the resize
+ * operation can be guaranteed to finish.
+ */
+ extra_groups = flexbg_size -
+ (groups & (flexbg_size - 1));
+ data_needed += META_OVERHEAD(fs) * extra_groups;
+ extra_groups = groups % flexbg_size;
+ }
}
/* now for the fun voodoo */
diff --git a/tests/f_badbblocks/expect.1 b/tests/f_badbblocks/expect.1
index d64e745..3107a29 100644
--- a/tests/f_badbblocks/expect.1
+++ b/tests/f_badbblocks/expect.1
@@ -8,7 +8,7 @@ Bad block inode has illegal block(s). Clear? yes
Illegal block #1 (101) in bad block inode. CLEARED.
Illegal block #2 (103) in bad block inode. CLEARED.
Illegal block #3 (234523) in bad block inode. CLEARED.
-Illegal block #-1 (200) in bad block inode. CLEARED.
+Illegal indirect block (200) in bad block inode. CLEARED.
Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
Pass 4: Checking reference counts
diff --git a/tests/f_baddir/expect.1 b/tests/f_baddir/expect.1
index 52f0d20..3973506 100644
--- a/tests/f_baddir/expect.1
+++ b/tests/f_baddir/expect.1
@@ -19,7 +19,7 @@ Clear? yes
Entry 'dot' in /test (14) is a link to '.' Clear? yes
-Directory inode 12, block 0, offset 0: directory corrupted
+Directory inode 12, block #0, offset 0: directory corrupted
Salvage? yes
Missing '.' in directory inode 12.
diff --git a/tests/f_baddir2/expect.1 b/tests/f_baddir2/expect.1
index 1bfea69..ec6ed32 100644
--- a/tests/f_baddir2/expect.1
+++ b/tests/f_baddir2/expect.1
@@ -1,6 +1,6 @@
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
-Directory inode 12, block 0, offset 60: directory corrupted
+Directory inode 12, block #0, offset 60: directory corrupted
Salvage? yes
Pass 3: Checking directory connectivity
diff --git a/tests/f_dup3/expect.1 b/tests/f_dup3/expect.1
index 1393416..9b1a28f 100644
--- a/tests/f_dup3/expect.1
+++ b/tests/f_dup3/expect.1
@@ -24,8 +24,8 @@ File /e2fsck (inode #16, mod time Tue Sep 21 04:32:22 1993)
Clone multiply-claimed blocks? yes
Pass 2: Checking directory structure
-Directory inode 11, block 12, offset 0: directory corrupted
-Salvage? yes
+Entry '' in /lost+found (11) has invalid inode #: 24.
+Clear? yes
Pass 3: Checking directory connectivity
Pass 4: Checking reference counts
diff --git a/tests/f_dup_de/expect.1 b/tests/f_dup_de/expect.1
index 78545cc..e421547 100644
--- a/tests/f_dup_de/expect.1
+++ b/tests/f_dup_de/expect.1
@@ -5,24 +5,24 @@ Duplicate entry 'mailcap.dpkg-old' found.
Pass 3: Checking directory connectivity
Pass 3A: Optimizing directories
-Duplicate entry 'mailcap.dpkg-old' in /etc (12) found. Clear? yes
-
Duplicate entry 'fstab' in /etc (12) found. Clear? yes
Duplicate entry 'localtime' in /etc (12) found. Clear? yes
-Duplicate entry 'resolv.conf' in /etc (12) found. Clear? yes
-
-Duplicate entry 'usb.permissions' in /etc (12) found. Clear? yes
+Duplicate entry 'mailcap.dpkg-old' in /etc (12) found. Clear? yes
Duplicate entry 'modules.conf.old' in /etc (12) found. Clear? yes
Entry 'modules.conf.old' in /etc (12) has a non-unique filename.
Rename to modules.conf.o~0? yes
+Duplicate entry 'resolv.conf' in /etc (12) found. Clear? yes
+
+Duplicate entry 'usb.permissions' in /etc (12) found. Clear? yes
+
Pass 4: Checking reference counts
Pass 5: Checking group summary information
test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
-test_filesys: 18/2048 files (5.6% non-contiguous), 325/330 blocks
+test_filesys: 18/2048 files (5.6% non-contiguous), 324/330 blocks
Exit status is 1
diff --git a/tests/f_dup_de/expect.2 b/tests/f_dup_de/expect.2
index e3accc6..4d680af 100644
--- a/tests/f_dup_de/expect.2
+++ b/tests/f_dup_de/expect.2
@@ -3,5 +3,5 @@ Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
Pass 4: Checking reference counts
Pass 5: Checking group summary information
-test_filesys: 18/2048 files (5.6% non-contiguous), 325/330 blocks
+test_filesys: 18/2048 files (5.6% non-contiguous), 324/330 blocks
Exit status is 0
diff --git a/tests/f_bad_local_jnl/expect.1 b/tests/f_dup_de2/expect.1
similarity index 53%
copy from tests/f_bad_local_jnl/expect.1
copy to tests/f_dup_de2/expect.1
index 10140b5..8dd3d91 100644
--- a/tests/f_bad_local_jnl/expect.1
+++ b/tests/f_dup_de2/expect.1
@@ -1,14 +1,16 @@
-Found invalid V2 journal superblock fields (from V1 journal).
-Clearing fields beyond the V1 journal superblock...
-
-Backing up journal inode block information.
-
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
+Duplicate entry 'test-008' found.
+ Marking / (2) to be rebuilt.
+
Pass 3: Checking directory connectivity
+Pass 3A: Optimizing directories
+Entry 'test-008' in / (2) has a non-unique filename.
+Rename to test-0~0? yes
+
Pass 4: Checking reference counts
Pass 5: Checking group summary information
test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
-test_filesys: 11/256 files (0.0% non-contiguous), 1080/8192 blocks
+test_filesys: 21/256 files (0.0% non-contiguous), 1087/2048 blocks
Exit status is 1
diff --git a/tests/f_badjour_indblks/expect.2 b/tests/f_dup_de2/expect.2
similarity index 77%
copy from tests/f_badjour_indblks/expect.2
copy to tests/f_dup_de2/expect.2
index 3fbb8b3..8781274 100644
--- a/tests/f_badjour_indblks/expect.2
+++ b/tests/f_dup_de2/expect.2
@@ -3,5 +3,5 @@ Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
Pass 4: Checking reference counts
Pass 5: Checking group summary information
-test_filesys: 11/256 files (0.0% non-contiguous), 1111/8192 blocks
+test_filesys: 21/256 files (0.0% non-contiguous), 1087/2048 blocks
Exit status is 0
diff --git a/tests/f_dup_de2/image.gz b/tests/f_dup_de2/image.gz
new file mode 100644
index 0000000..a8e4db3
Binary files /dev/null and b/tests/f_dup_de2/image.gz differ
diff --git a/tests/f_dup_de2/name b/tests/f_dup_de2/name
new file mode 100644
index 0000000..e337f10
--- /dev/null
+++ b/tests/f_dup_de2/name
@@ -0,0 +1 @@
+duplicate directory entries for non-indexed dirs
diff --git a/tests/f_dupfsblks/expect.1 b/tests/f_dupfsblks/expect.1
index 32ce89b..aba2f52 100644
--- a/tests/f_dupfsblks/expect.1
+++ b/tests/f_dupfsblks/expect.1
@@ -35,19 +35,16 @@ File /quux (inode #14, mod time Thu Aug 5 07:18:09 1999)
Clone multiply-claimed blocks? yes
Pass 2: Checking directory structure
-Directory inode 12, block 1, offset 0: directory corrupted
-Salvage? yes
-
-Directory inode 12, block 2, offset 0: directory corrupted
-Salvage? yes
+Entry '' in ??? (12) has invalid inode #: 4194303.
+Clear? yes
-Directory inode 12, block 3, offset 0: directory corrupted
-Salvage? yes
+Entry 'M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?M-^?' in ??? (12) has invalid inode #: 16383.
+Clear? yes
Entry '' in ??? (12) has a zero-length name.
Clear? yes
-Directory inode 12, block 4, offset 100: directory corrupted
+Directory inode 12, block #4, offset 100: directory corrupted
Salvage? yes
Pass 3: Checking directory connectivity
diff --git a/tests/f_h_badnode/expect.1 b/tests/f_h_badnode/expect.1
index 5aa3cda..ce2adb3 100644
--- a/tests/f_h_badnode/expect.1
+++ b/tests/f_h_badnode/expect.1
@@ -1,11 +1,11 @@
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
-Problem in HTREE directory inode 12929: node (531) has bad max hash
-Problem in HTREE directory inode 12929: node (993) referenced twice
-Problem in HTREE directory inode 12929: node (1061) has bad min hash
-Problem in HTREE directory inode 12929: node (1062) has invalid depth (2)
-Problem in HTREE directory inode 12929: node (1062) has bad max hash
-Problem in HTREE directory inode 12929: node (1062) not referenced
+Problem in HTREE directory inode 12929: block #531 has bad max hash
+Problem in HTREE directory inode 12929: block #993 referenced twice
+Problem in HTREE directory inode 12929: block #1061 has bad min hash
+Problem in HTREE directory inode 12929: block #1062 has invalid depth (2)
+Problem in HTREE directory inode 12929: block #1062 has bad max hash
+Problem in HTREE directory inode 12929: block #1062 not referenced
Invalid HTREE directory inode 12929 (/test2). Clear HTree index? yes
Pass 3: Checking directory connectivity
diff --git a/tests/f_h_badroot/expect.1 b/tests/f_h_badroot/expect.1
index 037942d..88eba51 100644
--- a/tests/f_h_badroot/expect.1
+++ b/tests/f_h_badroot/expect.1
@@ -17,17 +17,17 @@ HTREE directory inode 66721 uses an incompatible htree root node flag.
Clear HTree index? yes
Pass 2: Checking directory structure
-Problem in HTREE directory inode 80065: node (0) has an unordered hash table
+Problem in HTREE directory inode 80065: block #0 has an unordered hash table
Clear HTree index? yes
-Problem in HTREE directory inode 86737: node (0) has invalid limit (511)
+Problem in HTREE directory inode 86737: block #0 has invalid limit (511)
Clear HTree index? yes
-Problem in HTREE directory inode 93409: node (0) has invalid count (234)
+Problem in HTREE directory inode 93409: block #0 has invalid count (234)
Clear HTree index? yes
-Problem in HTREE directory inode 73393: node (1) has bad min hash
-Problem in HTREE directory inode 73393: node (2) has bad max hash
+Problem in HTREE directory inode 73393: block #1 has bad min hash
+Problem in HTREE directory inode 73393: block #2 has bad max hash
Invalid HTREE directory inode 73393 (/test6). Clear HTree index? yes
Pass 3: Checking directory connectivity
diff --git a/tests/f_h_reindex/expect.1 b/tests/f_h_reindex/expect.1
index a2324d7..2887239 100755
--- a/tests/f_h_reindex/expect.1
+++ b/tests/f_h_reindex/expect.1
@@ -2,950 +2,950 @@ Backing up journal inode block information.
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
-Problem in HTREE directory inode 16001: node (1) has bad max hash
-Problem in HTREE directory inode 16001: node (2) has bad min hash
-Problem in HTREE directory inode 16001: node (2) has bad max hash
-Problem in HTREE directory inode 16001: node (3) has bad min hash
-Problem in HTREE directory inode 16001: node (3) has bad max hash
-Problem in HTREE directory inode 16001: node (4) has bad min hash
-Problem in HTREE directory inode 16001: node (4) has bad max hash
-Problem in HTREE directory inode 16001: node (5) has bad min hash
-Problem in HTREE directory inode 16001: node (5) has bad max hash
-Problem in HTREE directory inode 16001: node (6) has bad min hash
-Problem in HTREE directory inode 16001: node (6) has bad max hash
-Problem in HTREE directory inode 16001: node (7) has bad min hash
-Problem in HTREE directory inode 16001: node (7) has bad max hash
-Problem in HTREE directory inode 16001: node (8) has bad min hash
+Problem in HTREE directory inode 16001: block #1 has bad max hash
+Problem in HTREE directory inode 16001: block #2 has bad min hash
+Problem in HTREE directory inode 16001: block #2 has bad max hash
+Problem in HTREE directory inode 16001: block #3 has bad min hash
+Problem in HTREE directory inode 16001: block #3 has bad max hash
+Problem in HTREE directory inode 16001: block #4 has bad min hash
+Problem in HTREE directory inode 16001: block #4 has bad max hash
+Problem in HTREE directory inode 16001: block #5 has bad min hash
+Problem in HTREE directory inode 16001: block #5 has bad max hash
+Problem in HTREE directory inode 16001: block #6 has bad min hash
+Problem in HTREE directory inode 16001: block #6 has bad max hash
+Problem in HTREE directory inode 16001: block #7 has bad min hash
+Problem in HTREE directory inode 16001: block #7 has bad max hash
+Problem in HTREE directory inode 16001: block #8 has bad min hash
Invalid HTREE directory inode 16001 (/test). Clear HTree index? yes
-Problem in HTREE directory inode 24001: node (1) has bad max hash
-Problem in HTREE directory inode 24001: node (2) has bad max hash
-Problem in HTREE directory inode 24001: node (3) has bad min hash
-Problem in HTREE directory inode 24001: node (3) has bad max hash
-Problem in HTREE directory inode 24001: node (4) has bad max hash
-Problem in HTREE directory inode 24001: node (5) has bad min hash
-Problem in HTREE directory inode 24001: node (5) has bad max hash
-Problem in HTREE directory inode 24001: node (6) has bad min hash
-Problem in HTREE directory inode 24001: node (6) has bad max hash
-Problem in HTREE directory inode 24001: node (7) has bad min hash
-Problem in HTREE directory inode 24001: node (7) has bad max hash
-Problem in HTREE directory inode 24001: node (8) has bad max hash
-Problem in HTREE directory inode 24001: node (9) has bad min hash
-Problem in HTREE directory inode 24001: node (9) has bad max hash
-Problem in HTREE directory inode 24001: node (10) has bad min hash
-Problem in HTREE directory inode 24001: node (10) has bad max hash
-Problem in HTREE directory inode 24001: node (11) has bad max hash
-Problem in HTREE directory inode 24001: node (12) has bad min hash
-Problem in HTREE directory inode 24001: node (12) has bad max hash
-Problem in HTREE directory inode 24001: node (13) has bad min hash
-Problem in HTREE directory inode 24001: node (13) has bad max hash
-Problem in HTREE directory inode 24001: node (14) has bad min hash
-Problem in HTREE directory inode 24001: node (14) has bad max hash
-Problem in HTREE directory inode 24001: node (15) has bad min hash
-Problem in HTREE directory inode 24001: node (15) has bad max hash
-Problem in HTREE directory inode 24001: node (16) has bad min hash
-Problem in HTREE directory inode 24001: node (16) has bad max hash
-Problem in HTREE directory inode 24001: node (17) has bad min hash
-Problem in HTREE directory inode 24001: node (17) has bad max hash
-Problem in HTREE directory inode 24001: node (18) has bad min hash
-Problem in HTREE directory inode 24001: node (18) has bad max hash
-Problem in HTREE directory inode 24001: node (19) has bad min hash
-Problem in HTREE directory inode 24001: node (19) has bad max hash
-Problem in HTREE directory inode 24001: node (20) has bad min hash
-Problem in HTREE directory inode 24001: node (20) has bad max hash
-Problem in HTREE directory inode 24001: node (21) has bad min hash
-Problem in HTREE directory inode 24001: node (21) has bad max hash
-Problem in HTREE directory inode 24001: node (22) has bad min hash
-Problem in HTREE directory inode 24001: node (22) has bad max hash
-Problem in HTREE directory inode 24001: node (23) has bad min hash
-Problem in HTREE directory inode 24001: node (23) has bad max hash
-Problem in HTREE directory inode 24001: node (24) has bad min hash
-Problem in HTREE directory inode 24001: node (24) has bad max hash
-Problem in HTREE directory inode 24001: node (25) has bad min hash
-Problem in HTREE directory inode 24001: node (25) has bad max hash
-Problem in HTREE directory inode 24001: node (26) has bad min hash
-Problem in HTREE directory inode 24001: node (26) has bad max hash
-Problem in HTREE directory inode 24001: node (27) has bad min hash
-Problem in HTREE directory inode 24001: node (27) has bad max hash
-Problem in HTREE directory inode 24001: node (28) has bad min hash
-Problem in HTREE directory inode 24001: node (28) has bad max hash
-Problem in HTREE directory inode 24001: node (29) has bad min hash
-Problem in HTREE directory inode 24001: node (29) has bad max hash
-Problem in HTREE directory inode 24001: node (30) has bad min hash
-Problem in HTREE directory inode 24001: node (30) has bad max hash
-Problem in HTREE directory inode 24001: node (31) has bad min hash
-Problem in HTREE directory inode 24001: node (31) has bad max hash
-Problem in HTREE directory inode 24001: node (32) has bad min hash
-Problem in HTREE directory inode 24001: node (32) has bad max hash
-Problem in HTREE directory inode 24001: node (33) has bad min hash
-Problem in HTREE directory inode 24001: node (33) has bad max hash
-Problem in HTREE directory inode 24001: node (34) has bad min hash
-Problem in HTREE directory inode 24001: node (34) has bad max hash
-Problem in HTREE directory inode 24001: node (35) has bad min hash
-Problem in HTREE directory inode 24001: node (35) has bad max hash
-Problem in HTREE directory inode 24001: node (36) has bad min hash
-Problem in HTREE directory inode 24001: node (36) has bad max hash
-Problem in HTREE directory inode 24001: node (37) has bad min hash
-Problem in HTREE directory inode 24001: node (37) has bad max hash
-Problem in HTREE directory inode 24001: node (38) has bad min hash
-Problem in HTREE directory inode 24001: node (38) has bad max hash
-Problem in HTREE directory inode 24001: node (39) has bad min hash
-Problem in HTREE directory inode 24001: node (39) has bad max hash
-Problem in HTREE directory inode 24001: node (40) has bad min hash
-Problem in HTREE directory inode 24001: node (40) has bad max hash
-Problem in HTREE directory inode 24001: node (41) has bad min hash
-Problem in HTREE directory inode 24001: node (41) has bad max hash
-Problem in HTREE directory inode 24001: node (42) has bad min hash
-Problem in HTREE directory inode 24001: node (42) has bad max hash
-Problem in HTREE directory inode 24001: node (43) has bad min hash
-Problem in HTREE directory inode 24001: node (43) has bad max hash
-Problem in HTREE directory inode 24001: node (44) has bad min hash
-Problem in HTREE directory inode 24001: node (44) has bad max hash
-Problem in HTREE directory inode 24001: node (45) has bad min hash
-Problem in HTREE directory inode 24001: node (45) has bad max hash
-Problem in HTREE directory inode 24001: node (46) has bad min hash
-Problem in HTREE directory inode 24001: node (46) has bad max hash
-Problem in HTREE directory inode 24001: node (47) has bad min hash
-Problem in HTREE directory inode 24001: node (47) has bad max hash
-Problem in HTREE directory inode 24001: node (48) has bad min hash
-Problem in HTREE directory inode 24001: node (48) has bad max hash
-Problem in HTREE directory inode 24001: node (49) has bad min hash
-Problem in HTREE directory inode 24001: node (49) has bad max hash
-Problem in HTREE directory inode 24001: node (50) has bad min hash
-Problem in HTREE directory inode 24001: node (50) has bad max hash
-Problem in HTREE directory inode 24001: node (51) has bad min hash
-Problem in HTREE directory inode 24001: node (51) has bad max hash
-Problem in HTREE directory inode 24001: node (52) has bad min hash
-Problem in HTREE directory inode 24001: node (52) has bad max hash
-Problem in HTREE directory inode 24001: node (53) has bad min hash
-Problem in HTREE directory inode 24001: node (53) has bad max hash
-Problem in HTREE directory inode 24001: node (54) has bad min hash
-Problem in HTREE directory inode 24001: node (54) has bad max hash
-Problem in HTREE directory inode 24001: node (55) has bad min hash
-Problem in HTREE directory inode 24001: node (55) has bad max hash
-Problem in HTREE directory inode 24001: node (56) has bad min hash
-Problem in HTREE directory inode 24001: node (56) has bad max hash
-Problem in HTREE directory inode 24001: node (57) has bad min hash
-Problem in HTREE directory inode 24001: node (57) has bad max hash
-Problem in HTREE directory inode 24001: node (58) has bad min hash
-Problem in HTREE directory inode 24001: node (58) has bad max hash
-Problem in HTREE directory inode 24001: node (59) has bad min hash
-Problem in HTREE directory inode 24001: node (59) has bad max hash
-Problem in HTREE directory inode 24001: node (60) has bad min hash
-Problem in HTREE directory inode 24001: node (60) has bad max hash
-Problem in HTREE directory inode 24001: node (61) has bad min hash
-Problem in HTREE directory inode 24001: node (61) has bad max hash
-Problem in HTREE directory inode 24001: node (62) has bad min hash
-Problem in HTREE directory inode 24001: node (62) has bad max hash
-Problem in HTREE directory inode 24001: node (63) has bad min hash
-Problem in HTREE directory inode 24001: node (63) has bad max hash
-Problem in HTREE directory inode 24001: node (64) has bad min hash
-Problem in HTREE directory inode 24001: node (64) has bad max hash
-Problem in HTREE directory inode 24001: node (65) has bad min hash
-Problem in HTREE directory inode 24001: node (65) has bad max hash
-Problem in HTREE directory inode 24001: node (66) has bad min hash
-Problem in HTREE directory inode 24001: node (66) has bad max hash
-Problem in HTREE directory inode 24001: node (67) has bad min hash
-Problem in HTREE directory inode 24001: node (67) has bad max hash
-Problem in HTREE directory inode 24001: node (68) has bad min hash
-Problem in HTREE directory inode 24001: node (68) has bad max hash
-Problem in HTREE directory inode 24001: node (69) has bad min hash
-Problem in HTREE directory inode 24001: node (69) has bad max hash
-Problem in HTREE directory inode 24001: node (70) has bad min hash
-Problem in HTREE directory inode 24001: node (70) has bad max hash
-Problem in HTREE directory inode 24001: node (71) has bad min hash
-Problem in HTREE directory inode 24001: node (71) has bad max hash
-Problem in HTREE directory inode 24001: node (72) has bad min hash
-Problem in HTREE directory inode 24001: node (72) has bad max hash
-Problem in HTREE directory inode 24001: node (73) has bad min hash
-Problem in HTREE directory inode 24001: node (73) has bad max hash
-Problem in HTREE directory inode 24001: node (74) has bad min hash
-Problem in HTREE directory inode 24001: node (74) has bad max hash
-Problem in HTREE directory inode 24001: node (75) has bad min hash
-Problem in HTREE directory inode 24001: node (75) has bad max hash
-Problem in HTREE directory inode 24001: node (76) has bad min hash
-Problem in HTREE directory inode 24001: node (76) has bad max hash
-Problem in HTREE directory inode 24001: node (77) has bad min hash
-Problem in HTREE directory inode 24001: node (77) has bad max hash
-Problem in HTREE directory inode 24001: node (78) has bad min hash
-Problem in HTREE directory inode 24001: node (78) has bad max hash
-Problem in HTREE directory inode 24001: node (79) has bad min hash
-Problem in HTREE directory inode 24001: node (79) has bad max hash
-Problem in HTREE directory inode 24001: node (80) has bad min hash
-Problem in HTREE directory inode 24001: node (80) has bad max hash
-Problem in HTREE directory inode 24001: node (81) has bad min hash
-Problem in HTREE directory inode 24001: node (81) has bad max hash
-Problem in HTREE directory inode 24001: node (82) has bad min hash
-Problem in HTREE directory inode 24001: node (82) has bad max hash
-Problem in HTREE directory inode 24001: node (83) has bad min hash
-Problem in HTREE directory inode 24001: node (83) has bad max hash
-Problem in HTREE directory inode 24001: node (84) has bad min hash
-Problem in HTREE directory inode 24001: node (84) has bad max hash
-Problem in HTREE directory inode 24001: node (85) has bad min hash
-Problem in HTREE directory inode 24001: node (85) has bad max hash
-Problem in HTREE directory inode 24001: node (86) has bad min hash
-Problem in HTREE directory inode 24001: node (86) has bad max hash
-Problem in HTREE directory inode 24001: node (87) has bad min hash
-Problem in HTREE directory inode 24001: node (87) has bad max hash
-Problem in HTREE directory inode 24001: node (88) has bad min hash
-Problem in HTREE directory inode 24001: node (88) has bad max hash
-Problem in HTREE directory inode 24001: node (89) has bad min hash
-Problem in HTREE directory inode 24001: node (89) has bad max hash
-Problem in HTREE directory inode 24001: node (90) has bad min hash
-Problem in HTREE directory inode 24001: node (90) has bad max hash
-Problem in HTREE directory inode 24001: node (91) has bad min hash
-Problem in HTREE directory inode 24001: node (91) has bad max hash
-Problem in HTREE directory inode 24001: node (92) has bad min hash
-Problem in HTREE directory inode 24001: node (92) has bad max hash
-Problem in HTREE directory inode 24001: node (93) has bad min hash
-Problem in HTREE directory inode 24001: node (93) has bad max hash
-Problem in HTREE directory inode 24001: node (94) has bad min hash
-Problem in HTREE directory inode 24001: node (94) has bad max hash
-Problem in HTREE directory inode 24001: node (95) has bad min hash
-Problem in HTREE directory inode 24001: node (95) has bad max hash
-Problem in HTREE directory inode 24001: node (96) has bad min hash
-Problem in HTREE directory inode 24001: node (96) has bad max hash
-Problem in HTREE directory inode 24001: node (97) has bad min hash
-Problem in HTREE directory inode 24001: node (97) has bad max hash
-Problem in HTREE directory inode 24001: node (98) has bad min hash
-Problem in HTREE directory inode 24001: node (98) has bad max hash
-Problem in HTREE directory inode 24001: node (99) has bad min hash
-Problem in HTREE directory inode 24001: node (99) has bad max hash
-Problem in HTREE directory inode 24001: node (100) has bad min hash
-Problem in HTREE directory inode 24001: node (100) has bad max hash
-Problem in HTREE directory inode 24001: node (101) has bad min hash
-Problem in HTREE directory inode 24001: node (101) has bad max hash
-Problem in HTREE directory inode 24001: node (102) has bad min hash
-Problem in HTREE directory inode 24001: node (102) has bad max hash
-Problem in HTREE directory inode 24001: node (103) has bad min hash
-Problem in HTREE directory inode 24001: node (103) has bad max hash
-Problem in HTREE directory inode 24001: node (104) has bad min hash
-Problem in HTREE directory inode 24001: node (104) has bad max hash
-Problem in HTREE directory inode 24001: node (105) has bad min hash
-Problem in HTREE directory inode 24001: node (105) has bad max hash
-Problem in HTREE directory inode 24001: node (106) has bad min hash
-Problem in HTREE directory inode 24001: node (106) has bad max hash
-Problem in HTREE directory inode 24001: node (107) has bad min hash
-Problem in HTREE directory inode 24001: node (107) has bad max hash
-Problem in HTREE directory inode 24001: node (108) has bad min hash
-Problem in HTREE directory inode 24001: node (108) has bad max hash
-Problem in HTREE directory inode 24001: node (109) has bad min hash
-Problem in HTREE directory inode 24001: node (109) has bad max hash
-Problem in HTREE directory inode 24001: node (110) has bad min hash
-Problem in HTREE directory inode 24001: node (110) has bad max hash
-Problem in HTREE directory inode 24001: node (111) has bad min hash
-Problem in HTREE directory inode 24001: node (111) has bad max hash
-Problem in HTREE directory inode 24001: node (112) has bad min hash
-Problem in HTREE directory inode 24001: node (112) has bad max hash
-Problem in HTREE directory inode 24001: node (113) has bad min hash
-Problem in HTREE directory inode 24001: node (113) has bad max hash
-Problem in HTREE directory inode 24001: node (114) has bad min hash
-Problem in HTREE directory inode 24001: node (114) has bad max hash
-Problem in HTREE directory inode 24001: node (115) has bad min hash
-Problem in HTREE directory inode 24001: node (115) has bad max hash
-Problem in HTREE directory inode 24001: node (116) has bad min hash
-Problem in HTREE directory inode 24001: node (116) has bad max hash
-Problem in HTREE directory inode 24001: node (117) has bad min hash
-Problem in HTREE directory inode 24001: node (117) has bad max hash
-Problem in HTREE directory inode 24001: node (118) has bad min hash
-Problem in HTREE directory inode 24001: node (118) has bad max hash
-Problem in HTREE directory inode 24001: node (119) has bad min hash
-Problem in HTREE directory inode 24001: node (119) has bad max hash
-Problem in HTREE directory inode 24001: node (120) has bad min hash
-Problem in HTREE directory inode 24001: node (120) has bad max hash
-Problem in HTREE directory inode 24001: node (121) has bad min hash
-Problem in HTREE directory inode 24001: node (121) has bad max hash
-Problem in HTREE directory inode 24001: node (122) has bad min hash
-Problem in HTREE directory inode 24001: node (122) has bad max hash
-Problem in HTREE directory inode 24001: node (123) has bad min hash
-Problem in HTREE directory inode 24001: node (123) has bad max hash
-Problem in HTREE directory inode 24001: node (124) has bad min hash
-Problem in HTREE directory inode 24001: node (124) has bad max hash
-Problem in HTREE directory inode 24001: node (125) has bad min hash
-Problem in HTREE directory inode 24001: node (125) has bad max hash
-Problem in HTREE directory inode 24001: node (126) has bad min hash
-Problem in HTREE directory inode 24001: node (126) has bad max hash
-Problem in HTREE directory inode 24001: node (127) has bad min hash
-Problem in HTREE directory inode 24001: node (128) has bad max hash
-Problem in HTREE directory inode 24001: node (129) has bad min hash
-Problem in HTREE directory inode 24001: node (129) has bad max hash
-Problem in HTREE directory inode 24001: node (130) has bad min hash
-Problem in HTREE directory inode 24001: node (130) has bad max hash
-Problem in HTREE directory inode 24001: node (131) has bad min hash
-Problem in HTREE directory inode 24001: node (131) has bad max hash
-Problem in HTREE directory inode 24001: node (132) has bad min hash
-Problem in HTREE directory inode 24001: node (132) has bad max hash
-Problem in HTREE directory inode 24001: node (133) has bad min hash
-Problem in HTREE directory inode 24001: node (133) has bad max hash
-Problem in HTREE directory inode 24001: node (134) has bad min hash
-Problem in HTREE directory inode 24001: node (134) has bad max hash
-Problem in HTREE directory inode 24001: node (135) has bad min hash
-Problem in HTREE directory inode 24001: node (135) has bad max hash
-Problem in HTREE directory inode 24001: node (136) has bad min hash
-Problem in HTREE directory inode 24001: node (136) has bad max hash
-Problem in HTREE directory inode 24001: node (137) has bad min hash
-Problem in HTREE directory inode 24001: node (137) has bad max hash
-Problem in HTREE directory inode 24001: node (138) has bad min hash
-Problem in HTREE directory inode 24001: node (138) has bad max hash
-Problem in HTREE directory inode 24001: node (139) has bad min hash
-Problem in HTREE directory inode 24001: node (139) has bad max hash
-Problem in HTREE directory inode 24001: node (140) has bad min hash
-Problem in HTREE directory inode 24001: node (140) has bad max hash
-Problem in HTREE directory inode 24001: node (141) has bad min hash
-Problem in HTREE directory inode 24001: node (141) has bad max hash
-Problem in HTREE directory inode 24001: node (142) has bad min hash
-Problem in HTREE directory inode 24001: node (142) has bad max hash
-Problem in HTREE directory inode 24001: node (143) has bad min hash
-Problem in HTREE directory inode 24001: node (143) has bad max hash
-Problem in HTREE directory inode 24001: node (144) has bad min hash
-Problem in HTREE directory inode 24001: node (144) has bad max hash
-Problem in HTREE directory inode 24001: node (145) has bad min hash
-Problem in HTREE directory inode 24001: node (145) has bad max hash
-Problem in HTREE directory inode 24001: node (146) has bad min hash
-Problem in HTREE directory inode 24001: node (146) has bad max hash
-Problem in HTREE directory inode 24001: node (147) has bad min hash
-Problem in HTREE directory inode 24001: node (147) has bad max hash
-Problem in HTREE directory inode 24001: node (148) has bad min hash
-Problem in HTREE directory inode 24001: node (148) has bad max hash
-Problem in HTREE directory inode 24001: node (149) has bad min hash
-Problem in HTREE directory inode 24001: node (149) has bad max hash
-Problem in HTREE directory inode 24001: node (150) has bad min hash
-Problem in HTREE directory inode 24001: node (150) has bad max hash
-Problem in HTREE directory inode 24001: node (151) has bad min hash
-Problem in HTREE directory inode 24001: node (151) has bad max hash
-Problem in HTREE directory inode 24001: node (152) has bad min hash
-Problem in HTREE directory inode 24001: node (152) has bad max hash
-Problem in HTREE directory inode 24001: node (153) has bad min hash
-Problem in HTREE directory inode 24001: node (153) has bad max hash
-Problem in HTREE directory inode 24001: node (154) has bad min hash
-Problem in HTREE directory inode 24001: node (154) has bad max hash
-Problem in HTREE directory inode 24001: node (155) has bad min hash
-Problem in HTREE directory inode 24001: node (155) has bad max hash
-Problem in HTREE directory inode 24001: node (156) has bad min hash
-Problem in HTREE directory inode 24001: node (156) has bad max hash
-Problem in HTREE directory inode 24001: node (157) has bad min hash
-Problem in HTREE directory inode 24001: node (157) has bad max hash
-Problem in HTREE directory inode 24001: node (158) has bad min hash
-Problem in HTREE directory inode 24001: node (158) has bad max hash
-Problem in HTREE directory inode 24001: node (159) has bad min hash
-Problem in HTREE directory inode 24001: node (159) has bad max hash
-Problem in HTREE directory inode 24001: node (160) has bad min hash
-Problem in HTREE directory inode 24001: node (160) has bad max hash
-Problem in HTREE directory inode 24001: node (161) has bad min hash
-Problem in HTREE directory inode 24001: node (161) has bad max hash
-Problem in HTREE directory inode 24001: node (162) has bad min hash
-Problem in HTREE directory inode 24001: node (162) has bad max hash
-Problem in HTREE directory inode 24001: node (163) has bad min hash
-Problem in HTREE directory inode 24001: node (163) has bad max hash
-Problem in HTREE directory inode 24001: node (164) has bad min hash
-Problem in HTREE directory inode 24001: node (164) has bad max hash
-Problem in HTREE directory inode 24001: node (165) has bad min hash
-Problem in HTREE directory inode 24001: node (165) has bad max hash
-Problem in HTREE directory inode 24001: node (166) has bad min hash
-Problem in HTREE directory inode 24001: node (166) has bad max hash
-Problem in HTREE directory inode 24001: node (167) has bad min hash
-Problem in HTREE directory inode 24001: node (167) has bad max hash
-Problem in HTREE directory inode 24001: node (168) has bad min hash
-Problem in HTREE directory inode 24001: node (168) has bad max hash
-Problem in HTREE directory inode 24001: node (169) has bad min hash
-Problem in HTREE directory inode 24001: node (169) has bad max hash
-Problem in HTREE directory inode 24001: node (170) has bad min hash
-Problem in HTREE directory inode 24001: node (170) has bad max hash
-Problem in HTREE directory inode 24001: node (171) has bad min hash
-Problem in HTREE directory inode 24001: node (171) has bad max hash
-Problem in HTREE directory inode 24001: node (172) has bad min hash
-Problem in HTREE directory inode 24001: node (172) has bad max hash
-Problem in HTREE directory inode 24001: node (173) has bad min hash
-Problem in HTREE directory inode 24001: node (173) has bad max hash
-Problem in HTREE directory inode 24001: node (174) has bad min hash
-Problem in HTREE directory inode 24001: node (174) has bad max hash
-Problem in HTREE directory inode 24001: node (175) has bad min hash
-Problem in HTREE directory inode 24001: node (175) has bad max hash
-Problem in HTREE directory inode 24001: node (176) has bad min hash
-Problem in HTREE directory inode 24001: node (176) has bad max hash
-Problem in HTREE directory inode 24001: node (177) has bad min hash
-Problem in HTREE directory inode 24001: node (177) has bad max hash
-Problem in HTREE directory inode 24001: node (178) has bad min hash
-Problem in HTREE directory inode 24001: node (178) has bad max hash
-Problem in HTREE directory inode 24001: node (179) has bad min hash
-Problem in HTREE directory inode 24001: node (179) has bad max hash
-Problem in HTREE directory inode 24001: node (180) has bad min hash
-Problem in HTREE directory inode 24001: node (180) has bad max hash
-Problem in HTREE directory inode 24001: node (181) has bad min hash
-Problem in HTREE directory inode 24001: node (181) has bad max hash
-Problem in HTREE directory inode 24001: node (182) has bad min hash
-Problem in HTREE directory inode 24001: node (182) has bad max hash
-Problem in HTREE directory inode 24001: node (183) has bad min hash
-Problem in HTREE directory inode 24001: node (183) has bad max hash
-Problem in HTREE directory inode 24001: node (184) has bad min hash
-Problem in HTREE directory inode 24001: node (184) has bad max hash
-Problem in HTREE directory inode 24001: node (185) has bad min hash
-Problem in HTREE directory inode 24001: node (185) has bad max hash
-Problem in HTREE directory inode 24001: node (186) has bad min hash
-Problem in HTREE directory inode 24001: node (186) has bad max hash
-Problem in HTREE directory inode 24001: node (187) has bad min hash
-Problem in HTREE directory inode 24001: node (187) has bad max hash
-Problem in HTREE directory inode 24001: node (188) has bad min hash
-Problem in HTREE directory inode 24001: node (188) has bad max hash
-Problem in HTREE directory inode 24001: node (189) has bad min hash
-Problem in HTREE directory inode 24001: node (189) has bad max hash
-Problem in HTREE directory inode 24001: node (190) has bad min hash
-Problem in HTREE directory inode 24001: node (190) has bad max hash
-Problem in HTREE directory inode 24001: node (191) has bad min hash
-Problem in HTREE directory inode 24001: node (191) has bad max hash
-Problem in HTREE directory inode 24001: node (192) has bad min hash
-Problem in HTREE directory inode 24001: node (192) has bad max hash
-Problem in HTREE directory inode 24001: node (193) has bad min hash
-Problem in HTREE directory inode 24001: node (193) has bad max hash
-Problem in HTREE directory inode 24001: node (194) has bad min hash
-Problem in HTREE directory inode 24001: node (194) has bad max hash
-Problem in HTREE directory inode 24001: node (195) has bad min hash
-Problem in HTREE directory inode 24001: node (195) has bad max hash
-Problem in HTREE directory inode 24001: node (196) has bad min hash
-Problem in HTREE directory inode 24001: node (196) has bad max hash
-Problem in HTREE directory inode 24001: node (197) has bad min hash
-Problem in HTREE directory inode 24001: node (197) has bad max hash
-Problem in HTREE directory inode 24001: node (198) has bad min hash
-Problem in HTREE directory inode 24001: node (198) has bad max hash
-Problem in HTREE directory inode 24001: node (199) has bad min hash
-Problem in HTREE directory inode 24001: node (199) has bad max hash
-Problem in HTREE directory inode 24001: node (200) has bad min hash
-Problem in HTREE directory inode 24001: node (200) has bad max hash
-Problem in HTREE directory inode 24001: node (201) has bad min hash
-Problem in HTREE directory inode 24001: node (201) has bad max hash
-Problem in HTREE directory inode 24001: node (202) has bad min hash
-Problem in HTREE directory inode 24001: node (202) has bad max hash
-Problem in HTREE directory inode 24001: node (203) has bad min hash
-Problem in HTREE directory inode 24001: node (203) has bad max hash
-Problem in HTREE directory inode 24001: node (204) has bad min hash
-Problem in HTREE directory inode 24001: node (204) has bad max hash
-Problem in HTREE directory inode 24001: node (205) has bad min hash
-Problem in HTREE directory inode 24001: node (205) has bad max hash
-Problem in HTREE directory inode 24001: node (206) has bad min hash
-Problem in HTREE directory inode 24001: node (206) has bad max hash
-Problem in HTREE directory inode 24001: node (207) has bad min hash
-Problem in HTREE directory inode 24001: node (207) has bad max hash
-Problem in HTREE directory inode 24001: node (208) has bad min hash
-Problem in HTREE directory inode 24001: node (208) has bad max hash
-Problem in HTREE directory inode 24001: node (209) has bad min hash
-Problem in HTREE directory inode 24001: node (209) has bad max hash
-Problem in HTREE directory inode 24001: node (210) has bad min hash
-Problem in HTREE directory inode 24001: node (210) has bad max hash
-Problem in HTREE directory inode 24001: node (211) has bad min hash
-Problem in HTREE directory inode 24001: node (211) has bad max hash
-Problem in HTREE directory inode 24001: node (212) has bad min hash
-Problem in HTREE directory inode 24001: node (212) has bad max hash
-Problem in HTREE directory inode 24001: node (213) has bad min hash
-Problem in HTREE directory inode 24001: node (213) has bad max hash
-Problem in HTREE directory inode 24001: node (214) has bad min hash
-Problem in HTREE directory inode 24001: node (214) has bad max hash
-Problem in HTREE directory inode 24001: node (215) has bad min hash
-Problem in HTREE directory inode 24001: node (215) has bad max hash
-Problem in HTREE directory inode 24001: node (216) has bad min hash
-Problem in HTREE directory inode 24001: node (216) has bad max hash
-Problem in HTREE directory inode 24001: node (217) has bad min hash
-Problem in HTREE directory inode 24001: node (217) has bad max hash
-Problem in HTREE directory inode 24001: node (218) has bad min hash
-Problem in HTREE directory inode 24001: node (218) has bad max hash
-Problem in HTREE directory inode 24001: node (219) has bad min hash
-Problem in HTREE directory inode 24001: node (219) has bad max hash
-Problem in HTREE directory inode 24001: node (220) has bad min hash
-Problem in HTREE directory inode 24001: node (220) has bad max hash
-Problem in HTREE directory inode 24001: node (221) has bad min hash
-Problem in HTREE directory inode 24001: node (221) has bad max hash
-Problem in HTREE directory inode 24001: node (222) has bad min hash
-Problem in HTREE directory inode 24001: node (222) has bad max hash
-Problem in HTREE directory inode 24001: node (223) has bad min hash
-Problem in HTREE directory inode 24001: node (223) has bad max hash
-Problem in HTREE directory inode 24001: node (224) has bad min hash
-Problem in HTREE directory inode 24001: node (224) has bad max hash
-Problem in HTREE directory inode 24001: node (225) has bad min hash
-Problem in HTREE directory inode 24001: node (225) has bad max hash
-Problem in HTREE directory inode 24001: node (226) has bad min hash
-Problem in HTREE directory inode 24001: node (226) has bad max hash
-Problem in HTREE directory inode 24001: node (227) has bad min hash
-Problem in HTREE directory inode 24001: node (227) has bad max hash
-Problem in HTREE directory inode 24001: node (228) has bad min hash
-Problem in HTREE directory inode 24001: node (228) has bad max hash
-Problem in HTREE directory inode 24001: node (229) has bad min hash
-Problem in HTREE directory inode 24001: node (229) has bad max hash
-Problem in HTREE directory inode 24001: node (230) has bad min hash
-Problem in HTREE directory inode 24001: node (230) has bad max hash
-Problem in HTREE directory inode 24001: node (231) has bad min hash
-Problem in HTREE directory inode 24001: node (231) has bad max hash
-Problem in HTREE directory inode 24001: node (232) has bad min hash
-Problem in HTREE directory inode 24001: node (232) has bad max hash
-Problem in HTREE directory inode 24001: node (233) has bad min hash
-Problem in HTREE directory inode 24001: node (233) has bad max hash
-Problem in HTREE directory inode 24001: node (234) has bad min hash
-Problem in HTREE directory inode 24001: node (234) has bad max hash
-Problem in HTREE directory inode 24001: node (235) has bad min hash
-Problem in HTREE directory inode 24001: node (235) has bad max hash
-Problem in HTREE directory inode 24001: node (236) has bad min hash
-Problem in HTREE directory inode 24001: node (236) has bad max hash
-Problem in HTREE directory inode 24001: node (237) has bad min hash
-Problem in HTREE directory inode 24001: node (237) has bad max hash
-Problem in HTREE directory inode 24001: node (238) has bad min hash
-Problem in HTREE directory inode 24001: node (238) has bad max hash
-Problem in HTREE directory inode 24001: node (239) has bad min hash
-Problem in HTREE directory inode 24001: node (239) has bad max hash
-Problem in HTREE directory inode 24001: node (240) has bad min hash
-Problem in HTREE directory inode 24001: node (240) has bad max hash
-Problem in HTREE directory inode 24001: node (241) has bad min hash
-Problem in HTREE directory inode 24001: node (241) has bad max hash
-Problem in HTREE directory inode 24001: node (242) has bad min hash
-Problem in HTREE directory inode 24001: node (242) has bad max hash
-Problem in HTREE directory inode 24001: node (243) has bad min hash
-Problem in HTREE directory inode 24001: node (243) has bad max hash
-Problem in HTREE directory inode 24001: node (244) has bad min hash
-Problem in HTREE directory inode 24001: node (244) has bad max hash
-Problem in HTREE directory inode 24001: node (245) has bad min hash
-Problem in HTREE directory inode 24001: node (245) has bad max hash
-Problem in HTREE directory inode 24001: node (246) has bad min hash
-Problem in HTREE directory inode 24001: node (246) has bad max hash
-Problem in HTREE directory inode 24001: node (247) has bad min hash
-Problem in HTREE directory inode 24001: node (247) has bad max hash
-Problem in HTREE directory inode 24001: node (248) has bad min hash
-Problem in HTREE directory inode 24001: node (248) has bad max hash
-Problem in HTREE directory inode 24001: node (249) has bad min hash
-Problem in HTREE directory inode 24001: node (249) has bad max hash
-Problem in HTREE directory inode 24001: node (250) has bad min hash
-Problem in HTREE directory inode 24001: node (250) has bad max hash
-Problem in HTREE directory inode 24001: node (251) has bad min hash
-Problem in HTREE directory inode 24001: node (251) has bad max hash
-Problem in HTREE directory inode 24001: node (252) has bad min hash
-Problem in HTREE directory inode 24001: node (252) has bad max hash
-Problem in HTREE directory inode 24001: node (253) has bad min hash
-Problem in HTREE directory inode 24001: node (253) has bad max hash
-Problem in HTREE directory inode 24001: node (254) has bad min hash
-Problem in HTREE directory inode 24001: node (255) has bad max hash
-Problem in HTREE directory inode 24001: node (256) has bad min hash
-Problem in HTREE directory inode 24001: node (256) has bad max hash
-Problem in HTREE directory inode 24001: node (257) has bad min hash
-Problem in HTREE directory inode 24001: node (257) has bad max hash
-Problem in HTREE directory inode 24001: node (258) has bad min hash
-Problem in HTREE directory inode 24001: node (258) has bad max hash
-Problem in HTREE directory inode 24001: node (259) has bad min hash
-Problem in HTREE directory inode 24001: node (259) has bad max hash
-Problem in HTREE directory inode 24001: node (260) has bad min hash
-Problem in HTREE directory inode 24001: node (260) has bad max hash
-Problem in HTREE directory inode 24001: node (261) has bad min hash
-Problem in HTREE directory inode 24001: node (261) has bad max hash
-Problem in HTREE directory inode 24001: node (262) has bad min hash
-Problem in HTREE directory inode 24001: node (262) has bad max hash
-Problem in HTREE directory inode 24001: node (263) has bad min hash
-Problem in HTREE directory inode 24001: node (263) has bad max hash
-Problem in HTREE directory inode 24001: node (264) has bad min hash
-Problem in HTREE directory inode 24001: node (264) has bad max hash
-Problem in HTREE directory inode 24001: node (265) has bad min hash
-Problem in HTREE directory inode 24001: node (265) has bad max hash
-Problem in HTREE directory inode 24001: node (266) has bad min hash
-Problem in HTREE directory inode 24001: node (266) has bad max hash
-Problem in HTREE directory inode 24001: node (267) has bad min hash
-Problem in HTREE directory inode 24001: node (267) has bad max hash
-Problem in HTREE directory inode 24001: node (268) has bad min hash
-Problem in HTREE directory inode 24001: node (268) has bad max hash
-Problem in HTREE directory inode 24001: node (269) has bad min hash
-Problem in HTREE directory inode 24001: node (269) has bad max hash
-Problem in HTREE directory inode 24001: node (270) has bad min hash
-Problem in HTREE directory inode 24001: node (270) has bad max hash
-Problem in HTREE directory inode 24001: node (271) has bad min hash
-Problem in HTREE directory inode 24001: node (271) has bad max hash
-Problem in HTREE directory inode 24001: node (272) has bad min hash
-Problem in HTREE directory inode 24001: node (272) has bad max hash
-Problem in HTREE directory inode 24001: node (273) has bad min hash
-Problem in HTREE directory inode 24001: node (273) has bad max hash
-Problem in HTREE directory inode 24001: node (274) has bad min hash
-Problem in HTREE directory inode 24001: node (274) has bad max hash
-Problem in HTREE directory inode 24001: node (275) has bad min hash
-Problem in HTREE directory inode 24001: node (275) has bad max hash
-Problem in HTREE directory inode 24001: node (276) has bad min hash
-Problem in HTREE directory inode 24001: node (276) has bad max hash
-Problem in HTREE directory inode 24001: node (277) has bad min hash
-Problem in HTREE directory inode 24001: node (277) has bad max hash
-Problem in HTREE directory inode 24001: node (278) has bad min hash
-Problem in HTREE directory inode 24001: node (278) has bad max hash
-Problem in HTREE directory inode 24001: node (279) has bad min hash
-Problem in HTREE directory inode 24001: node (279) has bad max hash
-Problem in HTREE directory inode 24001: node (280) has bad min hash
-Problem in HTREE directory inode 24001: node (280) has bad max hash
-Problem in HTREE directory inode 24001: node (281) has bad min hash
-Problem in HTREE directory inode 24001: node (281) has bad max hash
-Problem in HTREE directory inode 24001: node (282) has bad min hash
-Problem in HTREE directory inode 24001: node (282) has bad max hash
-Problem in HTREE directory inode 24001: node (283) has bad min hash
-Problem in HTREE directory inode 24001: node (283) has bad max hash
-Problem in HTREE directory inode 24001: node (284) has bad min hash
-Problem in HTREE directory inode 24001: node (284) has bad max hash
-Problem in HTREE directory inode 24001: node (285) has bad min hash
-Problem in HTREE directory inode 24001: node (285) has bad max hash
-Problem in HTREE directory inode 24001: node (286) has bad min hash
-Problem in HTREE directory inode 24001: node (286) has bad max hash
-Problem in HTREE directory inode 24001: node (287) has bad min hash
-Problem in HTREE directory inode 24001: node (287) has bad max hash
-Problem in HTREE directory inode 24001: node (288) has bad min hash
-Problem in HTREE directory inode 24001: node (288) has bad max hash
-Problem in HTREE directory inode 24001: node (289) has bad min hash
-Problem in HTREE directory inode 24001: node (289) has bad max hash
-Problem in HTREE directory inode 24001: node (290) has bad min hash
-Problem in HTREE directory inode 24001: node (290) has bad max hash
-Problem in HTREE directory inode 24001: node (291) has bad min hash
-Problem in HTREE directory inode 24001: node (291) has bad max hash
-Problem in HTREE directory inode 24001: node (292) has bad min hash
-Problem in HTREE directory inode 24001: node (292) has bad max hash
-Problem in HTREE directory inode 24001: node (293) has bad min hash
-Problem in HTREE directory inode 24001: node (293) has bad max hash
-Problem in HTREE directory inode 24001: node (294) has bad min hash
-Problem in HTREE directory inode 24001: node (294) has bad max hash
-Problem in HTREE directory inode 24001: node (295) has bad min hash
-Problem in HTREE directory inode 24001: node (295) has bad max hash
-Problem in HTREE directory inode 24001: node (296) has bad min hash
-Problem in HTREE directory inode 24001: node (296) has bad max hash
-Problem in HTREE directory inode 24001: node (297) has bad min hash
-Problem in HTREE directory inode 24001: node (297) has bad max hash
-Problem in HTREE directory inode 24001: node (298) has bad min hash
-Problem in HTREE directory inode 24001: node (298) has bad max hash
-Problem in HTREE directory inode 24001: node (299) has bad min hash
-Problem in HTREE directory inode 24001: node (299) has bad max hash
-Problem in HTREE directory inode 24001: node (300) has bad min hash
-Problem in HTREE directory inode 24001: node (300) has bad max hash
-Problem in HTREE directory inode 24001: node (301) has bad min hash
-Problem in HTREE directory inode 24001: node (301) has bad max hash
-Problem in HTREE directory inode 24001: node (302) has bad min hash
-Problem in HTREE directory inode 24001: node (302) has bad max hash
-Problem in HTREE directory inode 24001: node (303) has bad min hash
-Problem in HTREE directory inode 24001: node (303) has bad max hash
-Problem in HTREE directory inode 24001: node (304) has bad min hash
-Problem in HTREE directory inode 24001: node (304) has bad max hash
-Problem in HTREE directory inode 24001: node (305) has bad min hash
-Problem in HTREE directory inode 24001: node (305) has bad max hash
-Problem in HTREE directory inode 24001: node (306) has bad min hash
-Problem in HTREE directory inode 24001: node (306) has bad max hash
-Problem in HTREE directory inode 24001: node (307) has bad min hash
-Problem in HTREE directory inode 24001: node (307) has bad max hash
-Problem in HTREE directory inode 24001: node (308) has bad min hash
-Problem in HTREE directory inode 24001: node (308) has bad max hash
-Problem in HTREE directory inode 24001: node (309) has bad min hash
-Problem in HTREE directory inode 24001: node (309) has bad max hash
-Problem in HTREE directory inode 24001: node (310) has bad min hash
-Problem in HTREE directory inode 24001: node (310) has bad max hash
-Problem in HTREE directory inode 24001: node (311) has bad min hash
-Problem in HTREE directory inode 24001: node (311) has bad max hash
-Problem in HTREE directory inode 24001: node (312) has bad min hash
-Problem in HTREE directory inode 24001: node (312) has bad max hash
-Problem in HTREE directory inode 24001: node (313) has bad min hash
-Problem in HTREE directory inode 24001: node (313) has bad max hash
-Problem in HTREE directory inode 24001: node (314) has bad min hash
-Problem in HTREE directory inode 24001: node (314) has bad max hash
-Problem in HTREE directory inode 24001: node (315) has bad min hash
-Problem in HTREE directory inode 24001: node (315) has bad max hash
-Problem in HTREE directory inode 24001: node (316) has bad min hash
-Problem in HTREE directory inode 24001: node (316) has bad max hash
-Problem in HTREE directory inode 24001: node (317) has bad min hash
-Problem in HTREE directory inode 24001: node (317) has bad max hash
-Problem in HTREE directory inode 24001: node (318) has bad min hash
-Problem in HTREE directory inode 24001: node (318) has bad max hash
-Problem in HTREE directory inode 24001: node (319) has bad min hash
-Problem in HTREE directory inode 24001: node (319) has bad max hash
-Problem in HTREE directory inode 24001: node (320) has bad min hash
-Problem in HTREE directory inode 24001: node (320) has bad max hash
-Problem in HTREE directory inode 24001: node (321) has bad min hash
-Problem in HTREE directory inode 24001: node (321) has bad max hash
-Problem in HTREE directory inode 24001: node (322) has bad min hash
-Problem in HTREE directory inode 24001: node (322) has bad max hash
-Problem in HTREE directory inode 24001: node (323) has bad min hash
-Problem in HTREE directory inode 24001: node (323) has bad max hash
-Problem in HTREE directory inode 24001: node (324) has bad min hash
-Problem in HTREE directory inode 24001: node (324) has bad max hash
-Problem in HTREE directory inode 24001: node (325) has bad min hash
-Problem in HTREE directory inode 24001: node (325) has bad max hash
-Problem in HTREE directory inode 24001: node (326) has bad min hash
-Problem in HTREE directory inode 24001: node (326) has bad max hash
-Problem in HTREE directory inode 24001: node (327) has bad min hash
-Problem in HTREE directory inode 24001: node (327) has bad max hash
-Problem in HTREE directory inode 24001: node (328) has bad min hash
-Problem in HTREE directory inode 24001: node (328) has bad max hash
-Problem in HTREE directory inode 24001: node (329) has bad min hash
-Problem in HTREE directory inode 24001: node (329) has bad max hash
-Problem in HTREE directory inode 24001: node (330) has bad min hash
-Problem in HTREE directory inode 24001: node (330) has bad max hash
-Problem in HTREE directory inode 24001: node (331) has bad min hash
-Problem in HTREE directory inode 24001: node (331) has bad max hash
-Problem in HTREE directory inode 24001: node (332) has bad min hash
-Problem in HTREE directory inode 24001: node (332) has bad max hash
-Problem in HTREE directory inode 24001: node (333) has bad min hash
-Problem in HTREE directory inode 24001: node (333) has bad max hash
-Problem in HTREE directory inode 24001: node (334) has bad min hash
-Problem in HTREE directory inode 24001: node (334) has bad max hash
-Problem in HTREE directory inode 24001: node (335) has bad min hash
-Problem in HTREE directory inode 24001: node (335) has bad max hash
-Problem in HTREE directory inode 24001: node (336) has bad min hash
-Problem in HTREE directory inode 24001: node (336) has bad max hash
-Problem in HTREE directory inode 24001: node (337) has bad min hash
-Problem in HTREE directory inode 24001: node (337) has bad max hash
-Problem in HTREE directory inode 24001: node (338) has bad min hash
-Problem in HTREE directory inode 24001: node (338) has bad max hash
-Problem in HTREE directory inode 24001: node (339) has bad min hash
-Problem in HTREE directory inode 24001: node (339) has bad max hash
-Problem in HTREE directory inode 24001: node (340) has bad min hash
-Problem in HTREE directory inode 24001: node (340) has bad max hash
-Problem in HTREE directory inode 24001: node (341) has bad min hash
-Problem in HTREE directory inode 24001: node (341) has bad max hash
-Problem in HTREE directory inode 24001: node (342) has bad min hash
-Problem in HTREE directory inode 24001: node (342) has bad max hash
-Problem in HTREE directory inode 24001: node (343) has bad min hash
-Problem in HTREE directory inode 24001: node (343) has bad max hash
-Problem in HTREE directory inode 24001: node (344) has bad min hash
-Problem in HTREE directory inode 24001: node (344) has bad max hash
-Problem in HTREE directory inode 24001: node (345) has bad min hash
-Problem in HTREE directory inode 24001: node (345) has bad max hash
-Problem in HTREE directory inode 24001: node (346) has bad min hash
-Problem in HTREE directory inode 24001: node (346) has bad max hash
-Problem in HTREE directory inode 24001: node (347) has bad min hash
-Problem in HTREE directory inode 24001: node (347) has bad max hash
-Problem in HTREE directory inode 24001: node (348) has bad min hash
-Problem in HTREE directory inode 24001: node (348) has bad max hash
-Problem in HTREE directory inode 24001: node (349) has bad min hash
-Problem in HTREE directory inode 24001: node (349) has bad max hash
-Problem in HTREE directory inode 24001: node (350) has bad min hash
-Problem in HTREE directory inode 24001: node (350) has bad max hash
-Problem in HTREE directory inode 24001: node (351) has bad min hash
-Problem in HTREE directory inode 24001: node (351) has bad max hash
-Problem in HTREE directory inode 24001: node (352) has bad min hash
-Problem in HTREE directory inode 24001: node (352) has bad max hash
-Problem in HTREE directory inode 24001: node (353) has bad min hash
-Problem in HTREE directory inode 24001: node (353) has bad max hash
-Problem in HTREE directory inode 24001: node (354) has bad min hash
-Problem in HTREE directory inode 24001: node (354) has bad max hash
-Problem in HTREE directory inode 24001: node (355) has bad min hash
-Problem in HTREE directory inode 24001: node (355) has bad max hash
-Problem in HTREE directory inode 24001: node (356) has bad min hash
-Problem in HTREE directory inode 24001: node (356) has bad max hash
-Problem in HTREE directory inode 24001: node (357) has bad min hash
-Problem in HTREE directory inode 24001: node (357) has bad max hash
-Problem in HTREE directory inode 24001: node (358) has bad min hash
-Problem in HTREE directory inode 24001: node (358) has bad max hash
-Problem in HTREE directory inode 24001: node (359) has bad min hash
-Problem in HTREE directory inode 24001: node (359) has bad max hash
-Problem in HTREE directory inode 24001: node (360) has bad min hash
-Problem in HTREE directory inode 24001: node (360) has bad max hash
-Problem in HTREE directory inode 24001: node (361) has bad min hash
-Problem in HTREE directory inode 24001: node (361) has bad max hash
-Problem in HTREE directory inode 24001: node (362) has bad min hash
-Problem in HTREE directory inode 24001: node (362) has bad max hash
-Problem in HTREE directory inode 24001: node (363) has bad min hash
-Problem in HTREE directory inode 24001: node (363) has bad max hash
-Problem in HTREE directory inode 24001: node (364) has bad min hash
-Problem in HTREE directory inode 24001: node (364) has bad max hash
-Problem in HTREE directory inode 24001: node (365) has bad min hash
-Problem in HTREE directory inode 24001: node (365) has bad max hash
-Problem in HTREE directory inode 24001: node (366) has bad min hash
-Problem in HTREE directory inode 24001: node (366) has bad max hash
-Problem in HTREE directory inode 24001: node (367) has bad min hash
-Problem in HTREE directory inode 24001: node (367) has bad max hash
-Problem in HTREE directory inode 24001: node (368) has bad min hash
-Problem in HTREE directory inode 24001: node (368) has bad max hash
-Problem in HTREE directory inode 24001: node (369) has bad min hash
-Problem in HTREE directory inode 24001: node (369) has bad max hash
-Problem in HTREE directory inode 24001: node (370) has bad min hash
-Problem in HTREE directory inode 24001: node (370) has bad max hash
-Problem in HTREE directory inode 24001: node (371) has bad min hash
-Problem in HTREE directory inode 24001: node (371) has bad max hash
-Problem in HTREE directory inode 24001: node (372) has bad min hash
-Problem in HTREE directory inode 24001: node (372) has bad max hash
-Problem in HTREE directory inode 24001: node (373) has bad min hash
-Problem in HTREE directory inode 24001: node (373) has bad max hash
-Problem in HTREE directory inode 24001: node (374) has bad min hash
-Problem in HTREE directory inode 24001: node (374) has bad max hash
-Problem in HTREE directory inode 24001: node (375) has bad min hash
-Problem in HTREE directory inode 24001: node (375) has bad max hash
-Problem in HTREE directory inode 24001: node (376) has bad min hash
-Problem in HTREE directory inode 24001: node (376) has bad max hash
-Problem in HTREE directory inode 24001: node (377) has bad min hash
-Problem in HTREE directory inode 24001: node (377) has bad max hash
-Problem in HTREE directory inode 24001: node (378) has bad min hash
-Problem in HTREE directory inode 24001: node (378) has bad max hash
-Problem in HTREE directory inode 24001: node (379) has bad min hash
-Problem in HTREE directory inode 24001: node (379) has bad max hash
-Problem in HTREE directory inode 24001: node (380) has bad min hash
-Problem in HTREE directory inode 24001: node (380) has bad max hash
-Problem in HTREE directory inode 24001: node (381) has bad min hash
-Problem in HTREE directory inode 24001: node (382) has bad max hash
-Problem in HTREE directory inode 24001: node (383) has bad min hash
-Problem in HTREE directory inode 24001: node (383) has bad max hash
-Problem in HTREE directory inode 24001: node (384) has bad min hash
-Problem in HTREE directory inode 24001: node (384) has bad max hash
-Problem in HTREE directory inode 24001: node (385) has bad min hash
-Problem in HTREE directory inode 24001: node (385) has bad max hash
-Problem in HTREE directory inode 24001: node (386) has bad min hash
-Problem in HTREE directory inode 24001: node (386) has bad max hash
-Problem in HTREE directory inode 24001: node (387) has bad min hash
-Problem in HTREE directory inode 24001: node (387) has bad max hash
-Problem in HTREE directory inode 24001: node (388) has bad min hash
-Problem in HTREE directory inode 24001: node (388) has bad max hash
-Problem in HTREE directory inode 24001: node (389) has bad min hash
-Problem in HTREE directory inode 24001: node (389) has bad max hash
-Problem in HTREE directory inode 24001: node (390) has bad min hash
-Problem in HTREE directory inode 24001: node (390) has bad max hash
-Problem in HTREE directory inode 24001: node (391) has bad min hash
-Problem in HTREE directory inode 24001: node (391) has bad max hash
-Problem in HTREE directory inode 24001: node (392) has bad min hash
-Problem in HTREE directory inode 24001: node (392) has bad max hash
-Problem in HTREE directory inode 24001: node (393) has bad min hash
-Problem in HTREE directory inode 24001: node (393) has bad max hash
-Problem in HTREE directory inode 24001: node (394) has bad min hash
-Problem in HTREE directory inode 24001: node (394) has bad max hash
-Problem in HTREE directory inode 24001: node (395) has bad min hash
-Problem in HTREE directory inode 24001: node (395) has bad max hash
-Problem in HTREE directory inode 24001: node (396) has bad min hash
-Problem in HTREE directory inode 24001: node (396) has bad max hash
-Problem in HTREE directory inode 24001: node (397) has bad min hash
-Problem in HTREE directory inode 24001: node (397) has bad max hash
-Problem in HTREE directory inode 24001: node (398) has bad min hash
-Problem in HTREE directory inode 24001: node (398) has bad max hash
-Problem in HTREE directory inode 24001: node (399) has bad min hash
-Problem in HTREE directory inode 24001: node (399) has bad max hash
-Problem in HTREE directory inode 24001: node (400) has bad min hash
-Problem in HTREE directory inode 24001: node (400) has bad max hash
-Problem in HTREE directory inode 24001: node (401) has bad min hash
-Problem in HTREE directory inode 24001: node (401) has bad max hash
-Problem in HTREE directory inode 24001: node (402) has bad min hash
-Problem in HTREE directory inode 24001: node (402) has bad max hash
-Problem in HTREE directory inode 24001: node (403) has bad min hash
-Problem in HTREE directory inode 24001: node (403) has bad max hash
-Problem in HTREE directory inode 24001: node (404) has bad min hash
-Problem in HTREE directory inode 24001: node (404) has bad max hash
-Problem in HTREE directory inode 24001: node (405) has bad min hash
-Problem in HTREE directory inode 24001: node (405) has bad max hash
-Problem in HTREE directory inode 24001: node (406) has bad min hash
-Problem in HTREE directory inode 24001: node (406) has bad max hash
-Problem in HTREE directory inode 24001: node (407) has bad min hash
-Problem in HTREE directory inode 24001: node (407) has bad max hash
-Problem in HTREE directory inode 24001: node (408) has bad min hash
-Problem in HTREE directory inode 24001: node (408) has bad max hash
-Problem in HTREE directory inode 24001: node (409) has bad min hash
-Problem in HTREE directory inode 24001: node (409) has bad max hash
-Problem in HTREE directory inode 24001: node (410) has bad min hash
-Problem in HTREE directory inode 24001: node (410) has bad max hash
-Problem in HTREE directory inode 24001: node (411) has bad min hash
-Problem in HTREE directory inode 24001: node (411) has bad max hash
-Problem in HTREE directory inode 24001: node (412) has bad min hash
-Problem in HTREE directory inode 24001: node (412) has bad max hash
-Problem in HTREE directory inode 24001: node (413) has bad min hash
-Problem in HTREE directory inode 24001: node (413) has bad max hash
-Problem in HTREE directory inode 24001: node (414) has bad min hash
-Problem in HTREE directory inode 24001: node (414) has bad max hash
-Problem in HTREE directory inode 24001: node (415) has bad min hash
-Problem in HTREE directory inode 24001: node (415) has bad max hash
-Problem in HTREE directory inode 24001: node (416) has bad min hash
-Problem in HTREE directory inode 24001: node (416) has bad max hash
-Problem in HTREE directory inode 24001: node (417) has bad min hash
-Problem in HTREE directory inode 24001: node (417) has bad max hash
-Problem in HTREE directory inode 24001: node (418) has bad min hash
-Problem in HTREE directory inode 24001: node (418) has bad max hash
-Problem in HTREE directory inode 24001: node (419) has bad min hash
-Problem in HTREE directory inode 24001: node (419) has bad max hash
-Problem in HTREE directory inode 24001: node (420) has bad min hash
-Problem in HTREE directory inode 24001: node (420) has bad max hash
-Problem in HTREE directory inode 24001: node (421) has bad min hash
-Problem in HTREE directory inode 24001: node (421) has bad max hash
-Problem in HTREE directory inode 24001: node (422) has bad min hash
-Problem in HTREE directory inode 24001: node (422) has bad max hash
-Problem in HTREE directory inode 24001: node (423) has bad min hash
-Problem in HTREE directory inode 24001: node (423) has bad max hash
-Problem in HTREE directory inode 24001: node (424) has bad min hash
-Problem in HTREE directory inode 24001: node (424) has bad max hash
-Problem in HTREE directory inode 24001: node (425) has bad min hash
-Problem in HTREE directory inode 24001: node (425) has bad max hash
-Problem in HTREE directory inode 24001: node (426) has bad min hash
-Problem in HTREE directory inode 24001: node (426) has bad max hash
-Problem in HTREE directory inode 24001: node (427) has bad min hash
-Problem in HTREE directory inode 24001: node (427) has bad max hash
-Problem in HTREE directory inode 24001: node (428) has bad min hash
-Problem in HTREE directory inode 24001: node (428) has bad max hash
-Problem in HTREE directory inode 24001: node (429) has bad min hash
-Problem in HTREE directory inode 24001: node (429) has bad max hash
-Problem in HTREE directory inode 24001: node (430) has bad min hash
-Problem in HTREE directory inode 24001: node (430) has bad max hash
-Problem in HTREE directory inode 24001: node (431) has bad min hash
-Problem in HTREE directory inode 24001: node (431) has bad max hash
-Problem in HTREE directory inode 24001: node (432) has bad min hash
-Problem in HTREE directory inode 24001: node (432) has bad max hash
-Problem in HTREE directory inode 24001: node (433) has bad min hash
-Problem in HTREE directory inode 24001: node (433) has bad max hash
-Problem in HTREE directory inode 24001: node (434) has bad min hash
-Problem in HTREE directory inode 24001: node (434) has bad max hash
-Problem in HTREE directory inode 24001: node (435) has bad min hash
-Problem in HTREE directory inode 24001: node (435) has bad max hash
-Problem in HTREE directory inode 24001: node (436) has bad min hash
-Problem in HTREE directory inode 24001: node (436) has bad max hash
-Problem in HTREE directory inode 24001: node (437) has bad min hash
-Problem in HTREE directory inode 24001: node (437) has bad max hash
-Problem in HTREE directory inode 24001: node (438) has bad min hash
-Problem in HTREE directory inode 24001: node (438) has bad max hash
-Problem in HTREE directory inode 24001: node (439) has bad min hash
-Problem in HTREE directory inode 24001: node (439) has bad max hash
-Problem in HTREE directory inode 24001: node (440) has bad min hash
-Problem in HTREE directory inode 24001: node (440) has bad max hash
-Problem in HTREE directory inode 24001: node (441) has bad min hash
-Problem in HTREE directory inode 24001: node (441) has bad max hash
-Problem in HTREE directory inode 24001: node (442) has bad min hash
-Problem in HTREE directory inode 24001: node (442) has bad max hash
-Problem in HTREE directory inode 24001: node (443) has bad min hash
-Problem in HTREE directory inode 24001: node (443) has bad max hash
-Problem in HTREE directory inode 24001: node (444) has bad min hash
-Problem in HTREE directory inode 24001: node (444) has bad max hash
-Problem in HTREE directory inode 24001: node (445) has bad min hash
-Problem in HTREE directory inode 24001: node (445) has bad max hash
-Problem in HTREE directory inode 24001: node (446) has bad min hash
-Problem in HTREE directory inode 24001: node (446) has bad max hash
-Problem in HTREE directory inode 24001: node (447) has bad min hash
-Problem in HTREE directory inode 24001: node (447) has bad max hash
-Problem in HTREE directory inode 24001: node (448) has bad min hash
-Problem in HTREE directory inode 24001: node (448) has bad max hash
-Problem in HTREE directory inode 24001: node (449) has bad min hash
-Problem in HTREE directory inode 24001: node (449) has bad max hash
-Problem in HTREE directory inode 24001: node (450) has bad min hash
-Problem in HTREE directory inode 24001: node (450) has bad max hash
-Problem in HTREE directory inode 24001: node (451) has bad min hash
-Problem in HTREE directory inode 24001: node (451) has bad max hash
-Problem in HTREE directory inode 24001: node (452) has bad min hash
-Problem in HTREE directory inode 24001: node (452) has bad max hash
-Problem in HTREE directory inode 24001: node (453) has bad min hash
-Problem in HTREE directory inode 24001: node (453) has bad max hash
-Problem in HTREE directory inode 24001: node (454) has bad min hash
-Problem in HTREE directory inode 24001: node (454) has bad max hash
-Problem in HTREE directory inode 24001: node (455) has bad min hash
-Problem in HTREE directory inode 24001: node (455) has bad max hash
-Problem in HTREE directory inode 24001: node (456) has bad min hash
-Problem in HTREE directory inode 24001: node (457) has bad min hash
-Problem in HTREE directory inode 24001: node (457) has bad max hash
-Problem in HTREE directory inode 24001: node (458) has bad min hash
-Problem in HTREE directory inode 24001: node (458) has bad max hash
-Problem in HTREE directory inode 24001: node (459) has bad min hash
-Problem in HTREE directory inode 24001: node (459) has bad max hash
-Problem in HTREE directory inode 24001: node (460) has bad min hash
-Problem in HTREE directory inode 24001: node (460) has bad max hash
-Problem in HTREE directory inode 24001: node (461) has bad min hash
-Problem in HTREE directory inode 24001: node (461) has bad max hash
-Problem in HTREE directory inode 24001: node (462) has bad min hash
-Problem in HTREE directory inode 24001: node (463) has bad min hash
-Problem in HTREE directory inode 24001: node (463) has bad max hash
-Problem in HTREE directory inode 24001: node (464) has bad min hash
-Problem in HTREE directory inode 24001: node (464) has bad max hash
-Problem in HTREE directory inode 24001: node (465) has bad min hash
-Problem in HTREE directory inode 24001: node (466) has bad min hash
-Problem in HTREE directory inode 24001: node (466) has bad max hash
-Problem in HTREE directory inode 24001: node (467) has bad min hash
-Problem in HTREE directory inode 24001: node (468) has bad min hash
-Problem in HTREE directory inode 24001: node (468) has bad max hash
-Problem in HTREE directory inode 24001: node (469) has bad min hash
-Problem in HTREE directory inode 24001: node (470) has bad max hash
-Problem in HTREE directory inode 24001: node (471) has bad min hash
-Problem in HTREE directory inode 24001: node (471) has bad max hash
-Problem in HTREE directory inode 24001: node (472) has bad min hash
-Problem in HTREE directory inode 24001: node (472) has bad max hash
-Problem in HTREE directory inode 24001: node (473) has bad min hash
+Problem in HTREE directory inode 24001: block #1 has bad max hash
+Problem in HTREE directory inode 24001: block #2 has bad max hash
+Problem in HTREE directory inode 24001: block #3 has bad min hash
+Problem in HTREE directory inode 24001: block #3 has bad max hash
+Problem in HTREE directory inode 24001: block #4 has bad max hash
+Problem in HTREE directory inode 24001: block #5 has bad min hash
+Problem in HTREE directory inode 24001: block #5 has bad max hash
+Problem in HTREE directory inode 24001: block #6 has bad min hash
+Problem in HTREE directory inode 24001: block #6 has bad max hash
+Problem in HTREE directory inode 24001: block #7 has bad min hash
+Problem in HTREE directory inode 24001: block #7 has bad max hash
+Problem in HTREE directory inode 24001: block #8 has bad max hash
+Problem in HTREE directory inode 24001: block #9 has bad min hash
+Problem in HTREE directory inode 24001: block #9 has bad max hash
+Problem in HTREE directory inode 24001: block #10 has bad min hash
+Problem in HTREE directory inode 24001: block #10 has bad max hash
+Problem in HTREE directory inode 24001: block #11 has bad max hash
+Problem in HTREE directory inode 24001: block #12 has bad min hash
+Problem in HTREE directory inode 24001: block #12 has bad max hash
+Problem in HTREE directory inode 24001: block #13 has bad min hash
+Problem in HTREE directory inode 24001: block #13 has bad max hash
+Problem in HTREE directory inode 24001: block #14 has bad min hash
+Problem in HTREE directory inode 24001: block #14 has bad max hash
+Problem in HTREE directory inode 24001: block #15 has bad min hash
+Problem in HTREE directory inode 24001: block #15 has bad max hash
+Problem in HTREE directory inode 24001: block #16 has bad min hash
+Problem in HTREE directory inode 24001: block #16 has bad max hash
+Problem in HTREE directory inode 24001: block #17 has bad min hash
+Problem in HTREE directory inode 24001: block #17 has bad max hash
+Problem in HTREE directory inode 24001: block #18 has bad min hash
+Problem in HTREE directory inode 24001: block #18 has bad max hash
+Problem in HTREE directory inode 24001: block #19 has bad min hash
+Problem in HTREE directory inode 24001: block #19 has bad max hash
+Problem in HTREE directory inode 24001: block #20 has bad min hash
+Problem in HTREE directory inode 24001: block #20 has bad max hash
+Problem in HTREE directory inode 24001: block #21 has bad min hash
+Problem in HTREE directory inode 24001: block #21 has bad max hash
+Problem in HTREE directory inode 24001: block #22 has bad min hash
+Problem in HTREE directory inode 24001: block #22 has bad max hash
+Problem in HTREE directory inode 24001: block #23 has bad min hash
+Problem in HTREE directory inode 24001: block #23 has bad max hash
+Problem in HTREE directory inode 24001: block #24 has bad min hash
+Problem in HTREE directory inode 24001: block #24 has bad max hash
+Problem in HTREE directory inode 24001: block #25 has bad min hash
+Problem in HTREE directory inode 24001: block #25 has bad max hash
+Problem in HTREE directory inode 24001: block #26 has bad min hash
+Problem in HTREE directory inode 24001: block #26 has bad max hash
+Problem in HTREE directory inode 24001: block #27 has bad min hash
+Problem in HTREE directory inode 24001: block #27 has bad max hash
+Problem in HTREE directory inode 24001: block #28 has bad min hash
+Problem in HTREE directory inode 24001: block #28 has bad max hash
+Problem in HTREE directory inode 24001: block #29 has bad min hash
+Problem in HTREE directory inode 24001: block #29 has bad max hash
+Problem in HTREE directory inode 24001: block #30 has bad min hash
+Problem in HTREE directory inode 24001: block #30 has bad max hash
+Problem in HTREE directory inode 24001: block #31 has bad min hash
+Problem in HTREE directory inode 24001: block #31 has bad max hash
+Problem in HTREE directory inode 24001: block #32 has bad min hash
+Problem in HTREE directory inode 24001: block #32 has bad max hash
+Problem in HTREE directory inode 24001: block #33 has bad min hash
+Problem in HTREE directory inode 24001: block #33 has bad max hash
+Problem in HTREE directory inode 24001: block #34 has bad min hash
+Problem in HTREE directory inode 24001: block #34 has bad max hash
+Problem in HTREE directory inode 24001: block #35 has bad min hash
+Problem in HTREE directory inode 24001: block #35 has bad max hash
+Problem in HTREE directory inode 24001: block #36 has bad min hash
+Problem in HTREE directory inode 24001: block #36 has bad max hash
+Problem in HTREE directory inode 24001: block #37 has bad min hash
+Problem in HTREE directory inode 24001: block #37 has bad max hash
+Problem in HTREE directory inode 24001: block #38 has bad min hash
+Problem in HTREE directory inode 24001: block #38 has bad max hash
+Problem in HTREE directory inode 24001: block #39 has bad min hash
+Problem in HTREE directory inode 24001: block #39 has bad max hash
+Problem in HTREE directory inode 24001: block #40 has bad min hash
+Problem in HTREE directory inode 24001: block #40 has bad max hash
+Problem in HTREE directory inode 24001: block #41 has bad min hash
+Problem in HTREE directory inode 24001: block #41 has bad max hash
+Problem in HTREE directory inode 24001: block #42 has bad min hash
+Problem in HTREE directory inode 24001: block #42 has bad max hash
+Problem in HTREE directory inode 24001: block #43 has bad min hash
+Problem in HTREE directory inode 24001: block #43 has bad max hash
+Problem in HTREE directory inode 24001: block #44 has bad min hash
+Problem in HTREE directory inode 24001: block #44 has bad max hash
+Problem in HTREE directory inode 24001: block #45 has bad min hash
+Problem in HTREE directory inode 24001: block #45 has bad max hash
+Problem in HTREE directory inode 24001: block #46 has bad min hash
+Problem in HTREE directory inode 24001: block #46 has bad max hash
+Problem in HTREE directory inode 24001: block #47 has bad min hash
+Problem in HTREE directory inode 24001: block #47 has bad max hash
+Problem in HTREE directory inode 24001: block #48 has bad min hash
+Problem in HTREE directory inode 24001: block #48 has bad max hash
+Problem in HTREE directory inode 24001: block #49 has bad min hash
+Problem in HTREE directory inode 24001: block #49 has bad max hash
+Problem in HTREE directory inode 24001: block #50 has bad min hash
+Problem in HTREE directory inode 24001: block #50 has bad max hash
+Problem in HTREE directory inode 24001: block #51 has bad min hash
+Problem in HTREE directory inode 24001: block #51 has bad max hash
+Problem in HTREE directory inode 24001: block #52 has bad min hash
+Problem in HTREE directory inode 24001: block #52 has bad max hash
+Problem in HTREE directory inode 24001: block #53 has bad min hash
+Problem in HTREE directory inode 24001: block #53 has bad max hash
+Problem in HTREE directory inode 24001: block #54 has bad min hash
+Problem in HTREE directory inode 24001: block #54 has bad max hash
+Problem in HTREE directory inode 24001: block #55 has bad min hash
+Problem in HTREE directory inode 24001: block #55 has bad max hash
+Problem in HTREE directory inode 24001: block #56 has bad min hash
+Problem in HTREE directory inode 24001: block #56 has bad max hash
+Problem in HTREE directory inode 24001: block #57 has bad min hash
+Problem in HTREE directory inode 24001: block #57 has bad max hash
+Problem in HTREE directory inode 24001: block #58 has bad min hash
+Problem in HTREE directory inode 24001: block #58 has bad max hash
+Problem in HTREE directory inode 24001: block #59 has bad min hash
+Problem in HTREE directory inode 24001: block #59 has bad max hash
+Problem in HTREE directory inode 24001: block #60 has bad min hash
+Problem in HTREE directory inode 24001: block #60 has bad max hash
+Problem in HTREE directory inode 24001: block #61 has bad min hash
+Problem in HTREE directory inode 24001: block #61 has bad max hash
+Problem in HTREE directory inode 24001: block #62 has bad min hash
+Problem in HTREE directory inode 24001: block #62 has bad max hash
+Problem in HTREE directory inode 24001: block #63 has bad min hash
+Problem in HTREE directory inode 24001: block #63 has bad max hash
+Problem in HTREE directory inode 24001: block #64 has bad min hash
+Problem in HTREE directory inode 24001: block #64 has bad max hash
+Problem in HTREE directory inode 24001: block #65 has bad min hash
+Problem in HTREE directory inode 24001: block #65 has bad max hash
+Problem in HTREE directory inode 24001: block #66 has bad min hash
+Problem in HTREE directory inode 24001: block #66 has bad max hash
+Problem in HTREE directory inode 24001: block #67 has bad min hash
+Problem in HTREE directory inode 24001: block #67 has bad max hash
+Problem in HTREE directory inode 24001: block #68 has bad min hash
+Problem in HTREE directory inode 24001: block #68 has bad max hash
+Problem in HTREE directory inode 24001: block #69 has bad min hash
+Problem in HTREE directory inode 24001: block #69 has bad max hash
+Problem in HTREE directory inode 24001: block #70 has bad min hash
+Problem in HTREE directory inode 24001: block #70 has bad max hash
+Problem in HTREE directory inode 24001: block #71 has bad min hash
+Problem in HTREE directory inode 24001: block #71 has bad max hash
+Problem in HTREE directory inode 24001: block #72 has bad min hash
+Problem in HTREE directory inode 24001: block #72 has bad max hash
+Problem in HTREE directory inode 24001: block #73 has bad min hash
+Problem in HTREE directory inode 24001: block #73 has bad max hash
+Problem in HTREE directory inode 24001: block #74 has bad min hash
+Problem in HTREE directory inode 24001: block #74 has bad max hash
+Problem in HTREE directory inode 24001: block #75 has bad min hash
+Problem in HTREE directory inode 24001: block #75 has bad max hash
+Problem in HTREE directory inode 24001: block #76 has bad min hash
+Problem in HTREE directory inode 24001: block #76 has bad max hash
+Problem in HTREE directory inode 24001: block #77 has bad min hash
+Problem in HTREE directory inode 24001: block #77 has bad max hash
+Problem in HTREE directory inode 24001: block #78 has bad min hash
+Problem in HTREE directory inode 24001: block #78 has bad max hash
+Problem in HTREE directory inode 24001: block #79 has bad min hash
+Problem in HTREE directory inode 24001: block #79 has bad max hash
+Problem in HTREE directory inode 24001: block #80 has bad min hash
+Problem in HTREE directory inode 24001: block #80 has bad max hash
+Problem in HTREE directory inode 24001: block #81 has bad min hash
+Problem in HTREE directory inode 24001: block #81 has bad max hash
+Problem in HTREE directory inode 24001: block #82 has bad min hash
+Problem in HTREE directory inode 24001: block #82 has bad max hash
+Problem in HTREE directory inode 24001: block #83 has bad min hash
+Problem in HTREE directory inode 24001: block #83 has bad max hash
+Problem in HTREE directory inode 24001: block #84 has bad min hash
+Problem in HTREE directory inode 24001: block #84 has bad max hash
+Problem in HTREE directory inode 24001: block #85 has bad min hash
+Problem in HTREE directory inode 24001: block #85 has bad max hash
+Problem in HTREE directory inode 24001: block #86 has bad min hash
+Problem in HTREE directory inode 24001: block #86 has bad max hash
+Problem in HTREE directory inode 24001: block #87 has bad min hash
+Problem in HTREE directory inode 24001: block #87 has bad max hash
+Problem in HTREE directory inode 24001: block #88 has bad min hash
+Problem in HTREE directory inode 24001: block #88 has bad max hash
+Problem in HTREE directory inode 24001: block #89 has bad min hash
+Problem in HTREE directory inode 24001: block #89 has bad max hash
+Problem in HTREE directory inode 24001: block #90 has bad min hash
+Problem in HTREE directory inode 24001: block #90 has bad max hash
+Problem in HTREE directory inode 24001: block #91 has bad min hash
+Problem in HTREE directory inode 24001: block #91 has bad max hash
+Problem in HTREE directory inode 24001: block #92 has bad min hash
+Problem in HTREE directory inode 24001: block #92 has bad max hash
+Problem in HTREE directory inode 24001: block #93 has bad min hash
+Problem in HTREE directory inode 24001: block #93 has bad max hash
+Problem in HTREE directory inode 24001: block #94 has bad min hash
+Problem in HTREE directory inode 24001: block #94 has bad max hash
+Problem in HTREE directory inode 24001: block #95 has bad min hash
+Problem in HTREE directory inode 24001: block #95 has bad max hash
+Problem in HTREE directory inode 24001: block #96 has bad min hash
+Problem in HTREE directory inode 24001: block #96 has bad max hash
+Problem in HTREE directory inode 24001: block #97 has bad min hash
+Problem in HTREE directory inode 24001: block #97 has bad max hash
+Problem in HTREE directory inode 24001: block #98 has bad min hash
+Problem in HTREE directory inode 24001: block #98 has bad max hash
+Problem in HTREE directory inode 24001: block #99 has bad min hash
+Problem in HTREE directory inode 24001: block #99 has bad max hash
+Problem in HTREE directory inode 24001: block #100 has bad min hash
+Problem in HTREE directory inode 24001: block #100 has bad max hash
+Problem in HTREE directory inode 24001: block #101 has bad min hash
+Problem in HTREE directory inode 24001: block #101 has bad max hash
+Problem in HTREE directory inode 24001: block #102 has bad min hash
+Problem in HTREE directory inode 24001: block #102 has bad max hash
+Problem in HTREE directory inode 24001: block #103 has bad min hash
+Problem in HTREE directory inode 24001: block #103 has bad max hash
+Problem in HTREE directory inode 24001: block #104 has bad min hash
+Problem in HTREE directory inode 24001: block #104 has bad max hash
+Problem in HTREE directory inode 24001: block #105 has bad min hash
+Problem in HTREE directory inode 24001: block #105 has bad max hash
+Problem in HTREE directory inode 24001: block #106 has bad min hash
+Problem in HTREE directory inode 24001: block #106 has bad max hash
+Problem in HTREE directory inode 24001: block #107 has bad min hash
+Problem in HTREE directory inode 24001: block #107 has bad max hash
+Problem in HTREE directory inode 24001: block #108 has bad min hash
+Problem in HTREE directory inode 24001: block #108 has bad max hash
+Problem in HTREE directory inode 24001: block #109 has bad min hash
+Problem in HTREE directory inode 24001: block #109 has bad max hash
+Problem in HTREE directory inode 24001: block #110 has bad min hash
+Problem in HTREE directory inode 24001: block #110 has bad max hash
+Problem in HTREE directory inode 24001: block #111 has bad min hash
+Problem in HTREE directory inode 24001: block #111 has bad max hash
+Problem in HTREE directory inode 24001: block #112 has bad min hash
+Problem in HTREE directory inode 24001: block #112 has bad max hash
+Problem in HTREE directory inode 24001: block #113 has bad min hash
+Problem in HTREE directory inode 24001: block #113 has bad max hash
+Problem in HTREE directory inode 24001: block #114 has bad min hash
+Problem in HTREE directory inode 24001: block #114 has bad max hash
+Problem in HTREE directory inode 24001: block #115 has bad min hash
+Problem in HTREE directory inode 24001: block #115 has bad max hash
+Problem in HTREE directory inode 24001: block #116 has bad min hash
+Problem in HTREE directory inode 24001: block #116 has bad max hash
+Problem in HTREE directory inode 24001: block #117 has bad min hash
+Problem in HTREE directory inode 24001: block #117 has bad max hash
+Problem in HTREE directory inode 24001: block #118 has bad min hash
+Problem in HTREE directory inode 24001: block #118 has bad max hash
+Problem in HTREE directory inode 24001: block #119 has bad min hash
+Problem in HTREE directory inode 24001: block #119 has bad max hash
+Problem in HTREE directory inode 24001: block #120 has bad min hash
+Problem in HTREE directory inode 24001: block #120 has bad max hash
+Problem in HTREE directory inode 24001: block #121 has bad min hash
+Problem in HTREE directory inode 24001: block #121 has bad max hash
+Problem in HTREE directory inode 24001: block #122 has bad min hash
+Problem in HTREE directory inode 24001: block #122 has bad max hash
+Problem in HTREE directory inode 24001: block #123 has bad min hash
+Problem in HTREE directory inode 24001: block #123 has bad max hash
+Problem in HTREE directory inode 24001: block #124 has bad min hash
+Problem in HTREE directory inode 24001: block #124 has bad max hash
+Problem in HTREE directory inode 24001: block #125 has bad min hash
+Problem in HTREE directory inode 24001: block #125 has bad max hash
+Problem in HTREE directory inode 24001: block #126 has bad min hash
+Problem in HTREE directory inode 24001: block #126 has bad max hash
+Problem in HTREE directory inode 24001: block #127 has bad min hash
+Problem in HTREE directory inode 24001: block #128 has bad max hash
+Problem in HTREE directory inode 24001: block #129 has bad min hash
+Problem in HTREE directory inode 24001: block #129 has bad max hash
+Problem in HTREE directory inode 24001: block #130 has bad min hash
+Problem in HTREE directory inode 24001: block #130 has bad max hash
+Problem in HTREE directory inode 24001: block #131 has bad min hash
+Problem in HTREE directory inode 24001: block #131 has bad max hash
+Problem in HTREE directory inode 24001: block #132 has bad min hash
+Problem in HTREE directory inode 24001: block #132 has bad max hash
+Problem in HTREE directory inode 24001: block #133 has bad min hash
+Problem in HTREE directory inode 24001: block #133 has bad max hash
+Problem in HTREE directory inode 24001: block #134 has bad min hash
+Problem in HTREE directory inode 24001: block #134 has bad max hash
+Problem in HTREE directory inode 24001: block #135 has bad min hash
+Problem in HTREE directory inode 24001: block #135 has bad max hash
+Problem in HTREE directory inode 24001: block #136 has bad min hash
+Problem in HTREE directory inode 24001: block #136 has bad max hash
+Problem in HTREE directory inode 24001: block #137 has bad min hash
+Problem in HTREE directory inode 24001: block #137 has bad max hash
+Problem in HTREE directory inode 24001: block #138 has bad min hash
+Problem in HTREE directory inode 24001: block #138 has bad max hash
+Problem in HTREE directory inode 24001: block #139 has bad min hash
+Problem in HTREE directory inode 24001: block #139 has bad max hash
+Problem in HTREE directory inode 24001: block #140 has bad min hash
+Problem in HTREE directory inode 24001: block #140 has bad max hash
+Problem in HTREE directory inode 24001: block #141 has bad min hash
+Problem in HTREE directory inode 24001: block #141 has bad max hash
+Problem in HTREE directory inode 24001: block #142 has bad min hash
+Problem in HTREE directory inode 24001: block #142 has bad max hash
+Problem in HTREE directory inode 24001: block #143 has bad min hash
+Problem in HTREE directory inode 24001: block #143 has bad max hash
+Problem in HTREE directory inode 24001: block #144 has bad min hash
+Problem in HTREE directory inode 24001: block #144 has bad max hash
+Problem in HTREE directory inode 24001: block #145 has bad min hash
+Problem in HTREE directory inode 24001: block #145 has bad max hash
+Problem in HTREE directory inode 24001: block #146 has bad min hash
+Problem in HTREE directory inode 24001: block #146 has bad max hash
+Problem in HTREE directory inode 24001: block #147 has bad min hash
+Problem in HTREE directory inode 24001: block #147 has bad max hash
+Problem in HTREE directory inode 24001: block #148 has bad min hash
+Problem in HTREE directory inode 24001: block #148 has bad max hash
+Problem in HTREE directory inode 24001: block #149 has bad min hash
+Problem in HTREE directory inode 24001: block #149 has bad max hash
+Problem in HTREE directory inode 24001: block #150 has bad min hash
+Problem in HTREE directory inode 24001: block #150 has bad max hash
+Problem in HTREE directory inode 24001: block #151 has bad min hash
+Problem in HTREE directory inode 24001: block #151 has bad max hash
+Problem in HTREE directory inode 24001: block #152 has bad min hash
+Problem in HTREE directory inode 24001: block #152 has bad max hash
+Problem in HTREE directory inode 24001: block #153 has bad min hash
+Problem in HTREE directory inode 24001: block #153 has bad max hash
+Problem in HTREE directory inode 24001: block #154 has bad min hash
+Problem in HTREE directory inode 24001: block #154 has bad max hash
+Problem in HTREE directory inode 24001: block #155 has bad min hash
+Problem in HTREE directory inode 24001: block #155 has bad max hash
+Problem in HTREE directory inode 24001: block #156 has bad min hash
+Problem in HTREE directory inode 24001: block #156 has bad max hash
+Problem in HTREE directory inode 24001: block #157 has bad min hash
+Problem in HTREE directory inode 24001: block #157 has bad max hash
+Problem in HTREE directory inode 24001: block #158 has bad min hash
+Problem in HTREE directory inode 24001: block #158 has bad max hash
+Problem in HTREE directory inode 24001: block #159 has bad min hash
+Problem in HTREE directory inode 24001: block #159 has bad max hash
+Problem in HTREE directory inode 24001: block #160 has bad min hash
+Problem in HTREE directory inode 24001: block #160 has bad max hash
+Problem in HTREE directory inode 24001: block #161 has bad min hash
+Problem in HTREE directory inode 24001: block #161 has bad max hash
+Problem in HTREE directory inode 24001: block #162 has bad min hash
+Problem in HTREE directory inode 24001: block #162 has bad max hash
+Problem in HTREE directory inode 24001: block #163 has bad min hash
+Problem in HTREE directory inode 24001: block #163 has bad max hash
+Problem in HTREE directory inode 24001: block #164 has bad min hash
+Problem in HTREE directory inode 24001: block #164 has bad max hash
+Problem in HTREE directory inode 24001: block #165 has bad min hash
+Problem in HTREE directory inode 24001: block #165 has bad max hash
+Problem in HTREE directory inode 24001: block #166 has bad min hash
+Problem in HTREE directory inode 24001: block #166 has bad max hash
+Problem in HTREE directory inode 24001: block #167 has bad min hash
+Problem in HTREE directory inode 24001: block #167 has bad max hash
+Problem in HTREE directory inode 24001: block #168 has bad min hash
+Problem in HTREE directory inode 24001: block #168 has bad max hash
+Problem in HTREE directory inode 24001: block #169 has bad min hash
+Problem in HTREE directory inode 24001: block #169 has bad max hash
+Problem in HTREE directory inode 24001: block #170 has bad min hash
+Problem in HTREE directory inode 24001: block #170 has bad max hash
+Problem in HTREE directory inode 24001: block #171 has bad min hash
+Problem in HTREE directory inode 24001: block #171 has bad max hash
+Problem in HTREE directory inode 24001: block #172 has bad min hash
+Problem in HTREE directory inode 24001: block #172 has bad max hash
+Problem in HTREE directory inode 24001: block #173 has bad min hash
+Problem in HTREE directory inode 24001: block #173 has bad max hash
+Problem in HTREE directory inode 24001: block #174 has bad min hash
+Problem in HTREE directory inode 24001: block #174 has bad max hash
+Problem in HTREE directory inode 24001: block #175 has bad min hash
+Problem in HTREE directory inode 24001: block #175 has bad max hash
+Problem in HTREE directory inode 24001: block #176 has bad min hash
+Problem in HTREE directory inode 24001: block #176 has bad max hash
+Problem in HTREE directory inode 24001: block #177 has bad min hash
+Problem in HTREE directory inode 24001: block #177 has bad max hash
+Problem in HTREE directory inode 24001: block #178 has bad min hash
+Problem in HTREE directory inode 24001: block #178 has bad max hash
+Problem in HTREE directory inode 24001: block #179 has bad min hash
+Problem in HTREE directory inode 24001: block #179 has bad max hash
+Problem in HTREE directory inode 24001: block #180 has bad min hash
+Problem in HTREE directory inode 24001: block #180 has bad max hash
+Problem in HTREE directory inode 24001: block #181 has bad min hash
+Problem in HTREE directory inode 24001: block #181 has bad max hash
+Problem in HTREE directory inode 24001: block #182 has bad min hash
+Problem in HTREE directory inode 24001: block #182 has bad max hash
+Problem in HTREE directory inode 24001: block #183 has bad min hash
+Problem in HTREE directory inode 24001: block #183 has bad max hash
+Problem in HTREE directory inode 24001: block #184 has bad min hash
+Problem in HTREE directory inode 24001: block #184 has bad max hash
+Problem in HTREE directory inode 24001: block #185 has bad min hash
+Problem in HTREE directory inode 24001: block #185 has bad max hash
+Problem in HTREE directory inode 24001: block #186 has bad min hash
+Problem in HTREE directory inode 24001: block #186 has bad max hash
+Problem in HTREE directory inode 24001: block #187 has bad min hash
+Problem in HTREE directory inode 24001: block #187 has bad max hash
+Problem in HTREE directory inode 24001: block #188 has bad min hash
+Problem in HTREE directory inode 24001: block #188 has bad max hash
+Problem in HTREE directory inode 24001: block #189 has bad min hash
+Problem in HTREE directory inode 24001: block #189 has bad max hash
+Problem in HTREE directory inode 24001: block #190 has bad min hash
+Problem in HTREE directory inode 24001: block #190 has bad max hash
+Problem in HTREE directory inode 24001: block #191 has bad min hash
+Problem in HTREE directory inode 24001: block #191 has bad max hash
+Problem in HTREE directory inode 24001: block #192 has bad min hash
+Problem in HTREE directory inode 24001: block #192 has bad max hash
+Problem in HTREE directory inode 24001: block #193 has bad min hash
+Problem in HTREE directory inode 24001: block #193 has bad max hash
+Problem in HTREE directory inode 24001: block #194 has bad min hash
+Problem in HTREE directory inode 24001: block #194 has bad max hash
+Problem in HTREE directory inode 24001: block #195 has bad min hash
+Problem in HTREE directory inode 24001: block #195 has bad max hash
+Problem in HTREE directory inode 24001: block #196 has bad min hash
+Problem in HTREE directory inode 24001: block #196 has bad max hash
+Problem in HTREE directory inode 24001: block #197 has bad min hash
+Problem in HTREE directory inode 24001: block #197 has bad max hash
+Problem in HTREE directory inode 24001: block #198 has bad min hash
+Problem in HTREE directory inode 24001: block #198 has bad max hash
+Problem in HTREE directory inode 24001: block #199 has bad min hash
+Problem in HTREE directory inode 24001: block #199 has bad max hash
+Problem in HTREE directory inode 24001: block #200 has bad min hash
+Problem in HTREE directory inode 24001: block #200 has bad max hash
+Problem in HTREE directory inode 24001: block #201 has bad min hash
+Problem in HTREE directory inode 24001: block #201 has bad max hash
+Problem in HTREE directory inode 24001: block #202 has bad min hash
+Problem in HTREE directory inode 24001: block #202 has bad max hash
+Problem in HTREE directory inode 24001: block #203 has bad min hash
+Problem in HTREE directory inode 24001: block #203 has bad max hash
+Problem in HTREE directory inode 24001: block #204 has bad min hash
+Problem in HTREE directory inode 24001: block #204 has bad max hash
+Problem in HTREE directory inode 24001: block #205 has bad min hash
+Problem in HTREE directory inode 24001: block #205 has bad max hash
+Problem in HTREE directory inode 24001: block #206 has bad min hash
+Problem in HTREE directory inode 24001: block #206 has bad max hash
+Problem in HTREE directory inode 24001: block #207 has bad min hash
+Problem in HTREE directory inode 24001: block #207 has bad max hash
+Problem in HTREE directory inode 24001: block #208 has bad min hash
+Problem in HTREE directory inode 24001: block #208 has bad max hash
+Problem in HTREE directory inode 24001: block #209 has bad min hash
+Problem in HTREE directory inode 24001: block #209 has bad max hash
+Problem in HTREE directory inode 24001: block #210 has bad min hash
+Problem in HTREE directory inode 24001: block #210 has bad max hash
+Problem in HTREE directory inode 24001: block #211 has bad min hash
+Problem in HTREE directory inode 24001: block #211 has bad max hash
+Problem in HTREE directory inode 24001: block #212 has bad min hash
+Problem in HTREE directory inode 24001: block #212 has bad max hash
+Problem in HTREE directory inode 24001: block #213 has bad min hash
+Problem in HTREE directory inode 24001: block #213 has bad max hash
+Problem in HTREE directory inode 24001: block #214 has bad min hash
+Problem in HTREE directory inode 24001: block #214 has bad max hash
+Problem in HTREE directory inode 24001: block #215 has bad min hash
+Problem in HTREE directory inode 24001: block #215 has bad max hash
+Problem in HTREE directory inode 24001: block #216 has bad min hash
+Problem in HTREE directory inode 24001: block #216 has bad max hash
+Problem in HTREE directory inode 24001: block #217 has bad min hash
+Problem in HTREE directory inode 24001: block #217 has bad max hash
+Problem in HTREE directory inode 24001: block #218 has bad min hash
+Problem in HTREE directory inode 24001: block #218 has bad max hash
+Problem in HTREE directory inode 24001: block #219 has bad min hash
+Problem in HTREE directory inode 24001: block #219 has bad max hash
+Problem in HTREE directory inode 24001: block #220 has bad min hash
+Problem in HTREE directory inode 24001: block #220 has bad max hash
+Problem in HTREE directory inode 24001: block #221 has bad min hash
+Problem in HTREE directory inode 24001: block #221 has bad max hash
+Problem in HTREE directory inode 24001: block #222 has bad min hash
+Problem in HTREE directory inode 24001: block #222 has bad max hash
+Problem in HTREE directory inode 24001: block #223 has bad min hash
+Problem in HTREE directory inode 24001: block #223 has bad max hash
+Problem in HTREE directory inode 24001: block #224 has bad min hash
+Problem in HTREE directory inode 24001: block #224 has bad max hash
+Problem in HTREE directory inode 24001: block #225 has bad min hash
+Problem in HTREE directory inode 24001: block #225 has bad max hash
+Problem in HTREE directory inode 24001: block #226 has bad min hash
+Problem in HTREE directory inode 24001: block #226 has bad max hash
+Problem in HTREE directory inode 24001: block #227 has bad min hash
+Problem in HTREE directory inode 24001: block #227 has bad max hash
+Problem in HTREE directory inode 24001: block #228 has bad min hash
+Problem in HTREE directory inode 24001: block #228 has bad max hash
+Problem in HTREE directory inode 24001: block #229 has bad min hash
+Problem in HTREE directory inode 24001: block #229 has bad max hash
+Problem in HTREE directory inode 24001: block #230 has bad min hash
+Problem in HTREE directory inode 24001: block #230 has bad max hash
+Problem in HTREE directory inode 24001: block #231 has bad min hash
+Problem in HTREE directory inode 24001: block #231 has bad max hash
+Problem in HTREE directory inode 24001: block #232 has bad min hash
+Problem in HTREE directory inode 24001: block #232 has bad max hash
+Problem in HTREE directory inode 24001: block #233 has bad min hash
+Problem in HTREE directory inode 24001: block #233 has bad max hash
+Problem in HTREE directory inode 24001: block #234 has bad min hash
+Problem in HTREE directory inode 24001: block #234 has bad max hash
+Problem in HTREE directory inode 24001: block #235 has bad min hash
+Problem in HTREE directory inode 24001: block #235 has bad max hash
+Problem in HTREE directory inode 24001: block #236 has bad min hash
+Problem in HTREE directory inode 24001: block #236 has bad max hash
+Problem in HTREE directory inode 24001: block #237 has bad min hash
+Problem in HTREE directory inode 24001: block #237 has bad max hash
+Problem in HTREE directory inode 24001: block #238 has bad min hash
+Problem in HTREE directory inode 24001: block #238 has bad max hash
+Problem in HTREE directory inode 24001: block #239 has bad min hash
+Problem in HTREE directory inode 24001: block #239 has bad max hash
+Problem in HTREE directory inode 24001: block #240 has bad min hash
+Problem in HTREE directory inode 24001: block #240 has bad max hash
+Problem in HTREE directory inode 24001: block #241 has bad min hash
+Problem in HTREE directory inode 24001: block #241 has bad max hash
+Problem in HTREE directory inode 24001: block #242 has bad min hash
+Problem in HTREE directory inode 24001: block #242 has bad max hash
+Problem in HTREE directory inode 24001: block #243 has bad min hash
+Problem in HTREE directory inode 24001: block #243 has bad max hash
+Problem in HTREE directory inode 24001: block #244 has bad min hash
+Problem in HTREE directory inode 24001: block #244 has bad max hash
+Problem in HTREE directory inode 24001: block #245 has bad min hash
+Problem in HTREE directory inode 24001: block #245 has bad max hash
+Problem in HTREE directory inode 24001: block #246 has bad min hash
+Problem in HTREE directory inode 24001: block #246 has bad max hash
+Problem in HTREE directory inode 24001: block #247 has bad min hash
+Problem in HTREE directory inode 24001: block #247 has bad max hash
+Problem in HTREE directory inode 24001: block #248 has bad min hash
+Problem in HTREE directory inode 24001: block #248 has bad max hash
+Problem in HTREE directory inode 24001: block #249 has bad min hash
+Problem in HTREE directory inode 24001: block #249 has bad max hash
+Problem in HTREE directory inode 24001: block #250 has bad min hash
+Problem in HTREE directory inode 24001: block #250 has bad max hash
+Problem in HTREE directory inode 24001: block #251 has bad min hash
+Problem in HTREE directory inode 24001: block #251 has bad max hash
+Problem in HTREE directory inode 24001: block #252 has bad min hash
+Problem in HTREE directory inode 24001: block #252 has bad max hash
+Problem in HTREE directory inode 24001: block #253 has bad min hash
+Problem in HTREE directory inode 24001: block #253 has bad max hash
+Problem in HTREE directory inode 24001: block #254 has bad min hash
+Problem in HTREE directory inode 24001: block #255 has bad max hash
+Problem in HTREE directory inode 24001: block #256 has bad min hash
+Problem in HTREE directory inode 24001: block #256 has bad max hash
+Problem in HTREE directory inode 24001: block #257 has bad min hash
+Problem in HTREE directory inode 24001: block #257 has bad max hash
+Problem in HTREE directory inode 24001: block #258 has bad min hash
+Problem in HTREE directory inode 24001: block #258 has bad max hash
+Problem in HTREE directory inode 24001: block #259 has bad min hash
+Problem in HTREE directory inode 24001: block #259 has bad max hash
+Problem in HTREE directory inode 24001: block #260 has bad min hash
+Problem in HTREE directory inode 24001: block #260 has bad max hash
+Problem in HTREE directory inode 24001: block #261 has bad min hash
+Problem in HTREE directory inode 24001: block #261 has bad max hash
+Problem in HTREE directory inode 24001: block #262 has bad min hash
+Problem in HTREE directory inode 24001: block #262 has bad max hash
+Problem in HTREE directory inode 24001: block #263 has bad min hash
+Problem in HTREE directory inode 24001: block #263 has bad max hash
+Problem in HTREE directory inode 24001: block #264 has bad min hash
+Problem in HTREE directory inode 24001: block #264 has bad max hash
+Problem in HTREE directory inode 24001: block #265 has bad min hash
+Problem in HTREE directory inode 24001: block #265 has bad max hash
+Problem in HTREE directory inode 24001: block #266 has bad min hash
+Problem in HTREE directory inode 24001: block #266 has bad max hash
+Problem in HTREE directory inode 24001: block #267 has bad min hash
+Problem in HTREE directory inode 24001: block #267 has bad max hash
+Problem in HTREE directory inode 24001: block #268 has bad min hash
+Problem in HTREE directory inode 24001: block #268 has bad max hash
+Problem in HTREE directory inode 24001: block #269 has bad min hash
+Problem in HTREE directory inode 24001: block #269 has bad max hash
+Problem in HTREE directory inode 24001: block #270 has bad min hash
+Problem in HTREE directory inode 24001: block #270 has bad max hash
+Problem in HTREE directory inode 24001: block #271 has bad min hash
+Problem in HTREE directory inode 24001: block #271 has bad max hash
+Problem in HTREE directory inode 24001: block #272 has bad min hash
+Problem in HTREE directory inode 24001: block #272 has bad max hash
+Problem in HTREE directory inode 24001: block #273 has bad min hash
+Problem in HTREE directory inode 24001: block #273 has bad max hash
+Problem in HTREE directory inode 24001: block #274 has bad min hash
+Problem in HTREE directory inode 24001: block #274 has bad max hash
+Problem in HTREE directory inode 24001: block #275 has bad min hash
+Problem in HTREE directory inode 24001: block #275 has bad max hash
+Problem in HTREE directory inode 24001: block #276 has bad min hash
+Problem in HTREE directory inode 24001: block #276 has bad max hash
+Problem in HTREE directory inode 24001: block #277 has bad min hash
+Problem in HTREE directory inode 24001: block #277 has bad max hash
+Problem in HTREE directory inode 24001: block #278 has bad min hash
+Problem in HTREE directory inode 24001: block #278 has bad max hash
+Problem in HTREE directory inode 24001: block #279 has bad min hash
+Problem in HTREE directory inode 24001: block #279 has bad max hash
+Problem in HTREE directory inode 24001: block #280 has bad min hash
+Problem in HTREE directory inode 24001: block #280 has bad max hash
+Problem in HTREE directory inode 24001: block #281 has bad min hash
+Problem in HTREE directory inode 24001: block #281 has bad max hash
+Problem in HTREE directory inode 24001: block #282 has bad min hash
+Problem in HTREE directory inode 24001: block #282 has bad max hash
+Problem in HTREE directory inode 24001: block #283 has bad min hash
+Problem in HTREE directory inode 24001: block #283 has bad max hash
+Problem in HTREE directory inode 24001: block #284 has bad min hash
+Problem in HTREE directory inode 24001: block #284 has bad max hash
+Problem in HTREE directory inode 24001: block #285 has bad min hash
+Problem in HTREE directory inode 24001: block #285 has bad max hash
+Problem in HTREE directory inode 24001: block #286 has bad min hash
+Problem in HTREE directory inode 24001: block #286 has bad max hash
+Problem in HTREE directory inode 24001: block #287 has bad min hash
+Problem in HTREE directory inode 24001: block #287 has bad max hash
+Problem in HTREE directory inode 24001: block #288 has bad min hash
+Problem in HTREE directory inode 24001: block #288 has bad max hash
+Problem in HTREE directory inode 24001: block #289 has bad min hash
+Problem in HTREE directory inode 24001: block #289 has bad max hash
+Problem in HTREE directory inode 24001: block #290 has bad min hash
+Problem in HTREE directory inode 24001: block #290 has bad max hash
+Problem in HTREE directory inode 24001: block #291 has bad min hash
+Problem in HTREE directory inode 24001: block #291 has bad max hash
+Problem in HTREE directory inode 24001: block #292 has bad min hash
+Problem in HTREE directory inode 24001: block #292 has bad max hash
+Problem in HTREE directory inode 24001: block #293 has bad min hash
+Problem in HTREE directory inode 24001: block #293 has bad max hash
+Problem in HTREE directory inode 24001: block #294 has bad min hash
+Problem in HTREE directory inode 24001: block #294 has bad max hash
+Problem in HTREE directory inode 24001: block #295 has bad min hash
+Problem in HTREE directory inode 24001: block #295 has bad max hash
+Problem in HTREE directory inode 24001: block #296 has bad min hash
+Problem in HTREE directory inode 24001: block #296 has bad max hash
+Problem in HTREE directory inode 24001: block #297 has bad min hash
+Problem in HTREE directory inode 24001: block #297 has bad max hash
+Problem in HTREE directory inode 24001: block #298 has bad min hash
+Problem in HTREE directory inode 24001: block #298 has bad max hash
+Problem in HTREE directory inode 24001: block #299 has bad min hash
+Problem in HTREE directory inode 24001: block #299 has bad max hash
+Problem in HTREE directory inode 24001: block #300 has bad min hash
+Problem in HTREE directory inode 24001: block #300 has bad max hash
+Problem in HTREE directory inode 24001: block #301 has bad min hash
+Problem in HTREE directory inode 24001: block #301 has bad max hash
+Problem in HTREE directory inode 24001: block #302 has bad min hash
+Problem in HTREE directory inode 24001: block #302 has bad max hash
+Problem in HTREE directory inode 24001: block #303 has bad min hash
+Problem in HTREE directory inode 24001: block #303 has bad max hash
+Problem in HTREE directory inode 24001: block #304 has bad min hash
+Problem in HTREE directory inode 24001: block #304 has bad max hash
+Problem in HTREE directory inode 24001: block #305 has bad min hash
+Problem in HTREE directory inode 24001: block #305 has bad max hash
+Problem in HTREE directory inode 24001: block #306 has bad min hash
+Problem in HTREE directory inode 24001: block #306 has bad max hash
+Problem in HTREE directory inode 24001: block #307 has bad min hash
+Problem in HTREE directory inode 24001: block #307 has bad max hash
+Problem in HTREE directory inode 24001: block #308 has bad min hash
+Problem in HTREE directory inode 24001: block #308 has bad max hash
+Problem in HTREE directory inode 24001: block #309 has bad min hash
+Problem in HTREE directory inode 24001: block #309 has bad max hash
+Problem in HTREE directory inode 24001: block #310 has bad min hash
+Problem in HTREE directory inode 24001: block #310 has bad max hash
+Problem in HTREE directory inode 24001: block #311 has bad min hash
+Problem in HTREE directory inode 24001: block #311 has bad max hash
+Problem in HTREE directory inode 24001: block #312 has bad min hash
+Problem in HTREE directory inode 24001: block #312 has bad max hash
+Problem in HTREE directory inode 24001: block #313 has bad min hash
+Problem in HTREE directory inode 24001: block #313 has bad max hash
+Problem in HTREE directory inode 24001: block #314 has bad min hash
+Problem in HTREE directory inode 24001: block #314 has bad max hash
+Problem in HTREE directory inode 24001: block #315 has bad min hash
+Problem in HTREE directory inode 24001: block #315 has bad max hash
+Problem in HTREE directory inode 24001: block #316 has bad min hash
+Problem in HTREE directory inode 24001: block #316 has bad max hash
+Problem in HTREE directory inode 24001: block #317 has bad min hash
+Problem in HTREE directory inode 24001: block #317 has bad max hash
+Problem in HTREE directory inode 24001: block #318 has bad min hash
+Problem in HTREE directory inode 24001: block #318 has bad max hash
+Problem in HTREE directory inode 24001: block #319 has bad min hash
+Problem in HTREE directory inode 24001: block #319 has bad max hash
+Problem in HTREE directory inode 24001: block #320 has bad min hash
+Problem in HTREE directory inode 24001: block #320 has bad max hash
+Problem in HTREE directory inode 24001: block #321 has bad min hash
+Problem in HTREE directory inode 24001: block #321 has bad max hash
+Problem in HTREE directory inode 24001: block #322 has bad min hash
+Problem in HTREE directory inode 24001: block #322 has bad max hash
+Problem in HTREE directory inode 24001: block #323 has bad min hash
+Problem in HTREE directory inode 24001: block #323 has bad max hash
+Problem in HTREE directory inode 24001: block #324 has bad min hash
+Problem in HTREE directory inode 24001: block #324 has bad max hash
+Problem in HTREE directory inode 24001: block #325 has bad min hash
+Problem in HTREE directory inode 24001: block #325 has bad max hash
+Problem in HTREE directory inode 24001: block #326 has bad min hash
+Problem in HTREE directory inode 24001: block #326 has bad max hash
+Problem in HTREE directory inode 24001: block #327 has bad min hash
+Problem in HTREE directory inode 24001: block #327 has bad max hash
+Problem in HTREE directory inode 24001: block #328 has bad min hash
+Problem in HTREE directory inode 24001: block #328 has bad max hash
+Problem in HTREE directory inode 24001: block #329 has bad min hash
+Problem in HTREE directory inode 24001: block #329 has bad max hash
+Problem in HTREE directory inode 24001: block #330 has bad min hash
+Problem in HTREE directory inode 24001: block #330 has bad max hash
+Problem in HTREE directory inode 24001: block #331 has bad min hash
+Problem in HTREE directory inode 24001: block #331 has bad max hash
+Problem in HTREE directory inode 24001: block #332 has bad min hash
+Problem in HTREE directory inode 24001: block #332 has bad max hash
+Problem in HTREE directory inode 24001: block #333 has bad min hash
+Problem in HTREE directory inode 24001: block #333 has bad max hash
+Problem in HTREE directory inode 24001: block #334 has bad min hash
+Problem in HTREE directory inode 24001: block #334 has bad max hash
+Problem in HTREE directory inode 24001: block #335 has bad min hash
+Problem in HTREE directory inode 24001: block #335 has bad max hash
+Problem in HTREE directory inode 24001: block #336 has bad min hash
+Problem in HTREE directory inode 24001: block #336 has bad max hash
+Problem in HTREE directory inode 24001: block #337 has bad min hash
+Problem in HTREE directory inode 24001: block #337 has bad max hash
+Problem in HTREE directory inode 24001: block #338 has bad min hash
+Problem in HTREE directory inode 24001: block #338 has bad max hash
+Problem in HTREE directory inode 24001: block #339 has bad min hash
+Problem in HTREE directory inode 24001: block #339 has bad max hash
+Problem in HTREE directory inode 24001: block #340 has bad min hash
+Problem in HTREE directory inode 24001: block #340 has bad max hash
+Problem in HTREE directory inode 24001: block #341 has bad min hash
+Problem in HTREE directory inode 24001: block #341 has bad max hash
+Problem in HTREE directory inode 24001: block #342 has bad min hash
+Problem in HTREE directory inode 24001: block #342 has bad max hash
+Problem in HTREE directory inode 24001: block #343 has bad min hash
+Problem in HTREE directory inode 24001: block #343 has bad max hash
+Problem in HTREE directory inode 24001: block #344 has bad min hash
+Problem in HTREE directory inode 24001: block #344 has bad max hash
+Problem in HTREE directory inode 24001: block #345 has bad min hash
+Problem in HTREE directory inode 24001: block #345 has bad max hash
+Problem in HTREE directory inode 24001: block #346 has bad min hash
+Problem in HTREE directory inode 24001: block #346 has bad max hash
+Problem in HTREE directory inode 24001: block #347 has bad min hash
+Problem in HTREE directory inode 24001: block #347 has bad max hash
+Problem in HTREE directory inode 24001: block #348 has bad min hash
+Problem in HTREE directory inode 24001: block #348 has bad max hash
+Problem in HTREE directory inode 24001: block #349 has bad min hash
+Problem in HTREE directory inode 24001: block #349 has bad max hash
+Problem in HTREE directory inode 24001: block #350 has bad min hash
+Problem in HTREE directory inode 24001: block #350 has bad max hash
+Problem in HTREE directory inode 24001: block #351 has bad min hash
+Problem in HTREE directory inode 24001: block #351 has bad max hash
+Problem in HTREE directory inode 24001: block #352 has bad min hash
+Problem in HTREE directory inode 24001: block #352 has bad max hash
+Problem in HTREE directory inode 24001: block #353 has bad min hash
+Problem in HTREE directory inode 24001: block #353 has bad max hash
+Problem in HTREE directory inode 24001: block #354 has bad min hash
+Problem in HTREE directory inode 24001: block #354 has bad max hash
+Problem in HTREE directory inode 24001: block #355 has bad min hash
+Problem in HTREE directory inode 24001: block #355 has bad max hash
+Problem in HTREE directory inode 24001: block #356 has bad min hash
+Problem in HTREE directory inode 24001: block #356 has bad max hash
+Problem in HTREE directory inode 24001: block #357 has bad min hash
+Problem in HTREE directory inode 24001: block #357 has bad max hash
+Problem in HTREE directory inode 24001: block #358 has bad min hash
+Problem in HTREE directory inode 24001: block #358 has bad max hash
+Problem in HTREE directory inode 24001: block #359 has bad min hash
+Problem in HTREE directory inode 24001: block #359 has bad max hash
+Problem in HTREE directory inode 24001: block #360 has bad min hash
+Problem in HTREE directory inode 24001: block #360 has bad max hash
+Problem in HTREE directory inode 24001: block #361 has bad min hash
+Problem in HTREE directory inode 24001: block #361 has bad max hash
+Problem in HTREE directory inode 24001: block #362 has bad min hash
+Problem in HTREE directory inode 24001: block #362 has bad max hash
+Problem in HTREE directory inode 24001: block #363 has bad min hash
+Problem in HTREE directory inode 24001: block #363 has bad max hash
+Problem in HTREE directory inode 24001: block #364 has bad min hash
+Problem in HTREE directory inode 24001: block #364 has bad max hash
+Problem in HTREE directory inode 24001: block #365 has bad min hash
+Problem in HTREE directory inode 24001: block #365 has bad max hash
+Problem in HTREE directory inode 24001: block #366 has bad min hash
+Problem in HTREE directory inode 24001: block #366 has bad max hash
+Problem in HTREE directory inode 24001: block #367 has bad min hash
+Problem in HTREE directory inode 24001: block #367 has bad max hash
+Problem in HTREE directory inode 24001: block #368 has bad min hash
+Problem in HTREE directory inode 24001: block #368 has bad max hash
+Problem in HTREE directory inode 24001: block #369 has bad min hash
+Problem in HTREE directory inode 24001: block #369 has bad max hash
+Problem in HTREE directory inode 24001: block #370 has bad min hash
+Problem in HTREE directory inode 24001: block #370 has bad max hash
+Problem in HTREE directory inode 24001: block #371 has bad min hash
+Problem in HTREE directory inode 24001: block #371 has bad max hash
+Problem in HTREE directory inode 24001: block #372 has bad min hash
+Problem in HTREE directory inode 24001: block #372 has bad max hash
+Problem in HTREE directory inode 24001: block #373 has bad min hash
+Problem in HTREE directory inode 24001: block #373 has bad max hash
+Problem in HTREE directory inode 24001: block #374 has bad min hash
+Problem in HTREE directory inode 24001: block #374 has bad max hash
+Problem in HTREE directory inode 24001: block #375 has bad min hash
+Problem in HTREE directory inode 24001: block #375 has bad max hash
+Problem in HTREE directory inode 24001: block #376 has bad min hash
+Problem in HTREE directory inode 24001: block #376 has bad max hash
+Problem in HTREE directory inode 24001: block #377 has bad min hash
+Problem in HTREE directory inode 24001: block #377 has bad max hash
+Problem in HTREE directory inode 24001: block #378 has bad min hash
+Problem in HTREE directory inode 24001: block #378 has bad max hash
+Problem in HTREE directory inode 24001: block #379 has bad min hash
+Problem in HTREE directory inode 24001: block #379 has bad max hash
+Problem in HTREE directory inode 24001: block #380 has bad min hash
+Problem in HTREE directory inode 24001: block #380 has bad max hash
+Problem in HTREE directory inode 24001: block #381 has bad min hash
+Problem in HTREE directory inode 24001: block #382 has bad max hash
+Problem in HTREE directory inode 24001: block #383 has bad min hash
+Problem in HTREE directory inode 24001: block #383 has bad max hash
+Problem in HTREE directory inode 24001: block #384 has bad min hash
+Problem in HTREE directory inode 24001: block #384 has bad max hash
+Problem in HTREE directory inode 24001: block #385 has bad min hash
+Problem in HTREE directory inode 24001: block #385 has bad max hash
+Problem in HTREE directory inode 24001: block #386 has bad min hash
+Problem in HTREE directory inode 24001: block #386 has bad max hash
+Problem in HTREE directory inode 24001: block #387 has bad min hash
+Problem in HTREE directory inode 24001: block #387 has bad max hash
+Problem in HTREE directory inode 24001: block #388 has bad min hash
+Problem in HTREE directory inode 24001: block #388 has bad max hash
+Problem in HTREE directory inode 24001: block #389 has bad min hash
+Problem in HTREE directory inode 24001: block #389 has bad max hash
+Problem in HTREE directory inode 24001: block #390 has bad min hash
+Problem in HTREE directory inode 24001: block #390 has bad max hash
+Problem in HTREE directory inode 24001: block #391 has bad min hash
+Problem in HTREE directory inode 24001: block #391 has bad max hash
+Problem in HTREE directory inode 24001: block #392 has bad min hash
+Problem in HTREE directory inode 24001: block #392 has bad max hash
+Problem in HTREE directory inode 24001: block #393 has bad min hash
+Problem in HTREE directory inode 24001: block #393 has bad max hash
+Problem in HTREE directory inode 24001: block #394 has bad min hash
+Problem in HTREE directory inode 24001: block #394 has bad max hash
+Problem in HTREE directory inode 24001: block #395 has bad min hash
+Problem in HTREE directory inode 24001: block #395 has bad max hash
+Problem in HTREE directory inode 24001: block #396 has bad min hash
+Problem in HTREE directory inode 24001: block #396 has bad max hash
+Problem in HTREE directory inode 24001: block #397 has bad min hash
+Problem in HTREE directory inode 24001: block #397 has bad max hash
+Problem in HTREE directory inode 24001: block #398 has bad min hash
+Problem in HTREE directory inode 24001: block #398 has bad max hash
+Problem in HTREE directory inode 24001: block #399 has bad min hash
+Problem in HTREE directory inode 24001: block #399 has bad max hash
+Problem in HTREE directory inode 24001: block #400 has bad min hash
+Problem in HTREE directory inode 24001: block #400 has bad max hash
+Problem in HTREE directory inode 24001: block #401 has bad min hash
+Problem in HTREE directory inode 24001: block #401 has bad max hash
+Problem in HTREE directory inode 24001: block #402 has bad min hash
+Problem in HTREE directory inode 24001: block #402 has bad max hash
+Problem in HTREE directory inode 24001: block #403 has bad min hash
+Problem in HTREE directory inode 24001: block #403 has bad max hash
+Problem in HTREE directory inode 24001: block #404 has bad min hash
+Problem in HTREE directory inode 24001: block #404 has bad max hash
+Problem in HTREE directory inode 24001: block #405 has bad min hash
+Problem in HTREE directory inode 24001: block #405 has bad max hash
+Problem in HTREE directory inode 24001: block #406 has bad min hash
+Problem in HTREE directory inode 24001: block #406 has bad max hash
+Problem in HTREE directory inode 24001: block #407 has bad min hash
+Problem in HTREE directory inode 24001: block #407 has bad max hash
+Problem in HTREE directory inode 24001: block #408 has bad min hash
+Problem in HTREE directory inode 24001: block #408 has bad max hash
+Problem in HTREE directory inode 24001: block #409 has bad min hash
+Problem in HTREE directory inode 24001: block #409 has bad max hash
+Problem in HTREE directory inode 24001: block #410 has bad min hash
+Problem in HTREE directory inode 24001: block #410 has bad max hash
+Problem in HTREE directory inode 24001: block #411 has bad min hash
+Problem in HTREE directory inode 24001: block #411 has bad max hash
+Problem in HTREE directory inode 24001: block #412 has bad min hash
+Problem in HTREE directory inode 24001: block #412 has bad max hash
+Problem in HTREE directory inode 24001: block #413 has bad min hash
+Problem in HTREE directory inode 24001: block #413 has bad max hash
+Problem in HTREE directory inode 24001: block #414 has bad min hash
+Problem in HTREE directory inode 24001: block #414 has bad max hash
+Problem in HTREE directory inode 24001: block #415 has bad min hash
+Problem in HTREE directory inode 24001: block #415 has bad max hash
+Problem in HTREE directory inode 24001: block #416 has bad min hash
+Problem in HTREE directory inode 24001: block #416 has bad max hash
+Problem in HTREE directory inode 24001: block #417 has bad min hash
+Problem in HTREE directory inode 24001: block #417 has bad max hash
+Problem in HTREE directory inode 24001: block #418 has bad min hash
+Problem in HTREE directory inode 24001: block #418 has bad max hash
+Problem in HTREE directory inode 24001: block #419 has bad min hash
+Problem in HTREE directory inode 24001: block #419 has bad max hash
+Problem in HTREE directory inode 24001: block #420 has bad min hash
+Problem in HTREE directory inode 24001: block #420 has bad max hash
+Problem in HTREE directory inode 24001: block #421 has bad min hash
+Problem in HTREE directory inode 24001: block #421 has bad max hash
+Problem in HTREE directory inode 24001: block #422 has bad min hash
+Problem in HTREE directory inode 24001: block #422 has bad max hash
+Problem in HTREE directory inode 24001: block #423 has bad min hash
+Problem in HTREE directory inode 24001: block #423 has bad max hash
+Problem in HTREE directory inode 24001: block #424 has bad min hash
+Problem in HTREE directory inode 24001: block #424 has bad max hash
+Problem in HTREE directory inode 24001: block #425 has bad min hash
+Problem in HTREE directory inode 24001: block #425 has bad max hash
+Problem in HTREE directory inode 24001: block #426 has bad min hash
+Problem in HTREE directory inode 24001: block #426 has bad max hash
+Problem in HTREE directory inode 24001: block #427 has bad min hash
+Problem in HTREE directory inode 24001: block #427 has bad max hash
+Problem in HTREE directory inode 24001: block #428 has bad min hash
+Problem in HTREE directory inode 24001: block #428 has bad max hash
+Problem in HTREE directory inode 24001: block #429 has bad min hash
+Problem in HTREE directory inode 24001: block #429 has bad max hash
+Problem in HTREE directory inode 24001: block #430 has bad min hash
+Problem in HTREE directory inode 24001: block #430 has bad max hash
+Problem in HTREE directory inode 24001: block #431 has bad min hash
+Problem in HTREE directory inode 24001: block #431 has bad max hash
+Problem in HTREE directory inode 24001: block #432 has bad min hash
+Problem in HTREE directory inode 24001: block #432 has bad max hash
+Problem in HTREE directory inode 24001: block #433 has bad min hash
+Problem in HTREE directory inode 24001: block #433 has bad max hash
+Problem in HTREE directory inode 24001: block #434 has bad min hash
+Problem in HTREE directory inode 24001: block #434 has bad max hash
+Problem in HTREE directory inode 24001: block #435 has bad min hash
+Problem in HTREE directory inode 24001: block #435 has bad max hash
+Problem in HTREE directory inode 24001: block #436 has bad min hash
+Problem in HTREE directory inode 24001: block #436 has bad max hash
+Problem in HTREE directory inode 24001: block #437 has bad min hash
+Problem in HTREE directory inode 24001: block #437 has bad max hash
+Problem in HTREE directory inode 24001: block #438 has bad min hash
+Problem in HTREE directory inode 24001: block #438 has bad max hash
+Problem in HTREE directory inode 24001: block #439 has bad min hash
+Problem in HTREE directory inode 24001: block #439 has bad max hash
+Problem in HTREE directory inode 24001: block #440 has bad min hash
+Problem in HTREE directory inode 24001: block #440 has bad max hash
+Problem in HTREE directory inode 24001: block #441 has bad min hash
+Problem in HTREE directory inode 24001: block #441 has bad max hash
+Problem in HTREE directory inode 24001: block #442 has bad min hash
+Problem in HTREE directory inode 24001: block #442 has bad max hash
+Problem in HTREE directory inode 24001: block #443 has bad min hash
+Problem in HTREE directory inode 24001: block #443 has bad max hash
+Problem in HTREE directory inode 24001: block #444 has bad min hash
+Problem in HTREE directory inode 24001: block #444 has bad max hash
+Problem in HTREE directory inode 24001: block #445 has bad min hash
+Problem in HTREE directory inode 24001: block #445 has bad max hash
+Problem in HTREE directory inode 24001: block #446 has bad min hash
+Problem in HTREE directory inode 24001: block #446 has bad max hash
+Problem in HTREE directory inode 24001: block #447 has bad min hash
+Problem in HTREE directory inode 24001: block #447 has bad max hash
+Problem in HTREE directory inode 24001: block #448 has bad min hash
+Problem in HTREE directory inode 24001: block #448 has bad max hash
+Problem in HTREE directory inode 24001: block #449 has bad min hash
+Problem in HTREE directory inode 24001: block #449 has bad max hash
+Problem in HTREE directory inode 24001: block #450 has bad min hash
+Problem in HTREE directory inode 24001: block #450 has bad max hash
+Problem in HTREE directory inode 24001: block #451 has bad min hash
+Problem in HTREE directory inode 24001: block #451 has bad max hash
+Problem in HTREE directory inode 24001: block #452 has bad min hash
+Problem in HTREE directory inode 24001: block #452 has bad max hash
+Problem in HTREE directory inode 24001: block #453 has bad min hash
+Problem in HTREE directory inode 24001: block #453 has bad max hash
+Problem in HTREE directory inode 24001: block #454 has bad min hash
+Problem in HTREE directory inode 24001: block #454 has bad max hash
+Problem in HTREE directory inode 24001: block #455 has bad min hash
+Problem in HTREE directory inode 24001: block #455 has bad max hash
+Problem in HTREE directory inode 24001: block #456 has bad min hash
+Problem in HTREE directory inode 24001: block #457 has bad min hash
+Problem in HTREE directory inode 24001: block #457 has bad max hash
+Problem in HTREE directory inode 24001: block #458 has bad min hash
+Problem in HTREE directory inode 24001: block #458 has bad max hash
+Problem in HTREE directory inode 24001: block #459 has bad min hash
+Problem in HTREE directory inode 24001: block #459 has bad max hash
+Problem in HTREE directory inode 24001: block #460 has bad min hash
+Problem in HTREE directory inode 24001: block #460 has bad max hash
+Problem in HTREE directory inode 24001: block #461 has bad min hash
+Problem in HTREE directory inode 24001: block #461 has bad max hash
+Problem in HTREE directory inode 24001: block #462 has bad min hash
+Problem in HTREE directory inode 24001: block #463 has bad min hash
+Problem in HTREE directory inode 24001: block #463 has bad max hash
+Problem in HTREE directory inode 24001: block #464 has bad min hash
+Problem in HTREE directory inode 24001: block #464 has bad max hash
+Problem in HTREE directory inode 24001: block #465 has bad min hash
+Problem in HTREE directory inode 24001: block #466 has bad min hash
+Problem in HTREE directory inode 24001: block #466 has bad max hash
+Problem in HTREE directory inode 24001: block #467 has bad min hash
+Problem in HTREE directory inode 24001: block #468 has bad min hash
+Problem in HTREE directory inode 24001: block #468 has bad max hash
+Problem in HTREE directory inode 24001: block #469 has bad min hash
+Problem in HTREE directory inode 24001: block #470 has bad max hash
+Problem in HTREE directory inode 24001: block #471 has bad min hash
+Problem in HTREE directory inode 24001: block #471 has bad max hash
+Problem in HTREE directory inode 24001: block #472 has bad min hash
+Problem in HTREE directory inode 24001: block #472 has bad max hash
+Problem in HTREE directory inode 24001: block #473 has bad min hash
Invalid HTREE directory inode 24001 (/test2). Clear HTree index? yes
Pass 3: Checking directory connectivity
diff --git a/tests/f_holedir2/expect.1 b/tests/f_holedir2/expect.1
new file mode 100644
index 0000000..5124f61
--- /dev/null
+++ b/tests/f_holedir2/expect.1
@@ -0,0 +1,24 @@
+Pass 1: Checking inodes, blocks, and sizes
+Inode 12, i_size is 0, should be 5120. Fix? yes
+
+Inode 13, i_size is 4096, should be 5120. Fix? yes
+
+Pass 2: Checking directory structure
+Directory inode 12 has an unallocated block #3. Allocate? yes
+
+Directory inode 13 has an unallocated block #1. Allocate? yes
+
+Pass 3: Checking directory connectivity
+Pass 3A: Optimizing directories
+Pass 4: Checking reference counts
+Pass 5: Checking group summary information
+Free blocks count wrong for group #0 (79, counted=77).
+Fix? yes
+
+Free blocks count wrong (79, counted=77).
+Fix? yes
+
+
+test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
+test_filesys: 13/16 files (7.7% non-contiguous), 23/100 blocks
+Exit status is 1
diff --git a/tests/f_bad_disconnected_inode/expect.2 b/tests/f_holedir2/expect.2
similarity index 77%
copy from tests/f_bad_disconnected_inode/expect.2
copy to tests/f_holedir2/expect.2
index 8dfeb70..636c6e9 100644
--- a/tests/f_bad_disconnected_inode/expect.2
+++ b/tests/f_holedir2/expect.2
@@ -3,5 +3,5 @@ Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
Pass 4: Checking reference counts
Pass 5: Checking group summary information
-test_filesys: 11/16 files (0.0% non-contiguous), 9/100 blocks
+test_filesys: 13/16 files (0.0% non-contiguous), 23/100 blocks
Exit status is 0
diff --git a/tests/f_holedir2/image.gz b/tests/f_holedir2/image.gz
new file mode 100644
index 0000000..63dda07
Binary files /dev/null and b/tests/f_holedir2/image.gz differ
diff --git a/tests/f_holedir2/name b/tests/f_holedir2/name
new file mode 100644
index 0000000..ec153f3
--- /dev/null
+++ b/tests/f_holedir2/name
@@ -0,0 +1,2 @@
+directories with holes and zero i_size
+
diff --git a/tests/f_illitable_flexbg/expect.1 b/tests/f_illitable_flexbg/expect.1
new file mode 100644
index 0000000..2d8bd0c
--- /dev/null
+++ b/tests/f_illitable_flexbg/expect.1
@@ -0,0 +1,27 @@
+../e2fsck/e2fsck: Group descriptors look bad... trying backup blocks...
+One or more block group descriptor checksums are invalid. Fix? yes
+
+Group descriptor 0 checksum is invalid. FIXED.
+Inode table for group 1 is not in group. (block 0)
+WARNING: SEVERE DATA LOSS POSSIBLE.
+Relocate? yes
+
+Group descriptor 1 checksum is invalid. FIXED.
+Group descriptor 2 checksum is invalid. FIXED.
+Group descriptor 3 checksum is invalid. FIXED.
+Pass 1: Checking inodes, blocks, and sizes
+Relocating group 1's inode table to 142...
+Restarting e2fsck from the beginning...
+Group descriptor 1 checksum is invalid. FIXED.
+Pass 1: Checking inodes, blocks, and sizes
+Pass 2: Checking directory structure
+Pass 3: Checking directory connectivity
+Pass 4: Checking reference counts
+Pass 5: Checking group summary information
+Inode bitmap differences: -(65--128)
+Fix? yes
+
+
+test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
+test_filesys: 12/256 files (0.0% non-contiguous), 31163/32768 blocks
+Exit status is 1
diff --git a/tests/f_badorphan/expect.2 b/tests/f_illitable_flexbg/expect.2
similarity index 77%
copy from tests/f_badorphan/expect.2
copy to tests/f_illitable_flexbg/expect.2
index 3d928eb..8ef43c2 100644
--- a/tests/f_badorphan/expect.2
+++ b/tests/f_illitable_flexbg/expect.2
@@ -3,5 +3,5 @@ Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
Pass 4: Checking reference counts
Pass 5: Checking group summary information
-test_filesys: 59/2048 files (22.0% non-contiguous), 1982/8192 blocks
+test_filesys: 12/256 files (0.0% non-contiguous), 31163/32768 blocks
Exit status is 0
diff --git a/tests/f_illitable_flexbg/image.gz b/tests/f_illitable_flexbg/image.gz
new file mode 100755
index 0000000..7fa1446
Binary files /dev/null and b/tests/f_illitable_flexbg/image.gz differ
diff --git a/tests/f_illitable_flexbg/name b/tests/f_illitable_flexbg/name
new file mode 100644
index 0000000..58b0850
--- /dev/null
+++ b/tests/f_illitable_flexbg/name
@@ -0,0 +1 @@
+illegal inode table with FLEX_BG
diff --git a/tests/f_resize_inode/expect b/tests/f_resize_inode/expect
index bd45575..3af16c3 100644
--- a/tests/f_resize_inode/expect
+++ b/tests/f_resize_inode/expect
@@ -3,6 +3,7 @@ Filesystem label=
OS type: Linux
Block size=1024 (log=0)
Fragment size=1024 (log=0)
+Stride=0 blocks, Stripe width=0 blocks
4096 inodes, 16384 blocks
819 blocks (5.00%) reserved for the super user
First data block=1
diff --git a/tests/f_salvage_dir/expect.1 b/tests/f_salvage_dir/expect.1
index fc37883..3286384 100644
--- a/tests/f_salvage_dir/expect.1
+++ b/tests/f_salvage_dir/expect.1
@@ -1,13 +1,13 @@
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
-Directory inode 13, block 0, offset 48: directory corrupted
+Directory inode 13, block #0, offset 48: directory corrupted
Salvage? yes
-Directory inode 12, block 1, offset 0: directory corrupted
+Directory inode 12, block #1, offset 0: directory corrupted
Salvage? yes
Setting filetype for entry 'c' in /test (12) to 1.
-Directory inode 12, block 1, offset 1016: directory corrupted
+Directory inode 12, block #1, offset 1016: directory corrupted
Salvage? yes
Pass 3: Checking directory connectivity
diff --git a/tests/m_dasd_bs/expect.1 b/tests/m_dasd_bs/expect.1
index 9bc8a85..808bc0e 100644
--- a/tests/m_dasd_bs/expect.1
+++ b/tests/m_dasd_bs/expect.1
@@ -2,6 +2,7 @@ Filesystem label=
OS type: Linux
Block size=2048 (log=1)
Fragment size=2048 (log=1)
+Stride=0 blocks, Stripe width=0 blocks
16384 inodes, 32768 blocks
1638 blocks (5.00%) reserved for the super user
First data block=0
diff --git a/tests/m_large_file/expect.1 b/tests/m_large_file/expect.1
index abf2d99..e4d0ea0 100644
--- a/tests/m_large_file/expect.1
+++ b/tests/m_large_file/expect.1
@@ -2,6 +2,7 @@ Filesystem label=
OS type: Linux
Block size=4096 (log=2)
Fragment size=4096 (log=2)
+Stride=0 blocks, Stripe width=0 blocks
64 inodes, 16384 blocks
819 blocks (5.00%) reserved for the super user
First data block=0
diff --git a/tests/m_meta_bg/expect.1 b/tests/m_meta_bg/expect.1
index d44be8c..c2df838 100644
--- a/tests/m_meta_bg/expect.1
+++ b/tests/m_meta_bg/expect.1
@@ -2,6 +2,7 @@ Filesystem label=
OS type: Linux
Block size=1024 (log=0)
Fragment size=1024 (log=0)
+Stride=0 blocks, Stripe width=0 blocks
32768 inodes, 131072 blocks
6553 blocks (5.00%) reserved for the super user
First data block=1
diff --git a/tests/m_no_opt/expect.1 b/tests/m_no_opt/expect.1
index faa565d..eac91b1 100644
--- a/tests/m_no_opt/expect.1
+++ b/tests/m_no_opt/expect.1
@@ -2,6 +2,7 @@ Filesystem label=
OS type: Linux
Block size=1024 (log=0)
Fragment size=1024 (log=0)
+Stride=0 blocks, Stripe width=0 blocks
16384 inodes, 65536 blocks
3276 blocks (5.00%) reserved for the super user
First data block=1
diff --git a/tests/m_raid_opt/expect.1 b/tests/m_raid_opt/expect.1
index 181534d..88d2484 100644
--- a/tests/m_raid_opt/expect.1
+++ b/tests/m_raid_opt/expect.1
@@ -2,6 +2,7 @@ Filesystem label=
OS type: Linux
Block size=1024 (log=0)
Fragment size=1024 (log=0)
+Stride=13 blocks, Stripe width=0 blocks
32768 inodes, 131072 blocks
6553 blocks (5.00%) reserved for the super user
First data block=1
diff --git a/tests/m_std/expect.1 b/tests/m_std/expect.1
index 4483578..e9599dc 100644
--- a/tests/m_std/expect.1
+++ b/tests/m_std/expect.1
@@ -2,6 +2,7 @@ Filesystem label=
OS type: Linux
Block size=1024 (log=0)
Fragment size=1024 (log=0)
+Stride=0 blocks, Stripe width=0 blocks
16384 inodes, 65536 blocks
3276 blocks (5.00%) reserved for the super user
First data block=1
diff --git a/tests/m_uninit/expect.1 b/tests/m_uninit/expect.1
index 549aced..5fed62c 100644
--- a/tests/m_uninit/expect.1
+++ b/tests/m_uninit/expect.1
@@ -2,6 +2,7 @@ Filesystem label=
OS type: Linux
Block size=1024 (log=0)
Fragment size=1024 (log=0)
+Stride=0 blocks, Stripe width=0 blocks
32768 inodes, 131072 blocks
6553 blocks (5.00%) reserved for the super user
First data block=1
@@ -71,13 +72,13 @@ Group 1: (Blocks 8193-16384) [INODE_UNINIT, ITABLE_ZEROED]
Inode table at 8453-8708 (+260)
7676 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
Free blocks: 8709-16384
- Free inodes:
+ Free inodes: 2049-4096
Group 2: (Blocks 16385-24576) [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED]
Block bitmap at 16385 (+0), Inode bitmap at 16386 (+1)
Inode table at 16387-16642 (+2)
7934 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
- Free blocks:
- Free inodes:
+ Free blocks: 16385-24576
+ Free inodes: 4097-6144
Group 3: (Blocks 24577-32768) [INODE_UNINIT, ITABLE_ZEROED]
Backup superblock at 24577, Group descriptors at 24578-24578
Reserved GDT blocks at 24579-24834
@@ -85,13 +86,13 @@ Group 3: (Blocks 24577-32768) [INODE_UNINIT, ITABLE_ZEROED]
Inode table at 24837-25092 (+260)
7676 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
Free blocks: 25093-32768
- Free inodes:
+ Free inodes: 6145-8192
Group 4: (Blocks 32769-40960) [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED]
Block bitmap at 32769 (+0), Inode bitmap at 32770 (+1)
Inode table at 32771-33026 (+2)
7934 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
- Free blocks:
- Free inodes:
+ Free blocks: 32769-40960
+ Free inodes: 8193-10240
Group 5: (Blocks 40961-49152) [INODE_UNINIT, ITABLE_ZEROED]
Backup superblock at 40961, Group descriptors at 40962-40962
Reserved GDT blocks at 40963-41218
@@ -99,13 +100,13 @@ Group 5: (Blocks 40961-49152) [INODE_UNINIT, ITABLE_ZEROED]
Inode table at 41221-41476 (+260)
7676 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
Free blocks: 41477-49152
- Free inodes:
+ Free inodes: 10241-12288
Group 6: (Blocks 49153-57344) [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED]
Block bitmap at 49153 (+0), Inode bitmap at 49154 (+1)
Inode table at 49155-49410 (+2)
7934 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
- Free blocks:
- Free inodes:
+ Free blocks: 49153-57344
+ Free inodes: 12289-14336
Group 7: (Blocks 57345-65536) [INODE_UNINIT, ITABLE_ZEROED]
Backup superblock at 57345, Group descriptors at 57346-57346
Reserved GDT blocks at 57347-57602
@@ -113,13 +114,13 @@ Group 7: (Blocks 57345-65536) [INODE_UNINIT, ITABLE_ZEROED]
Inode table at 57605-57860 (+260)
7676 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
Free blocks: 57861-65536
- Free inodes:
+ Free inodes: 14337-16384
Group 8: (Blocks 65537-73728) [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED]
Block bitmap at 65537 (+0), Inode bitmap at 65538 (+1)
Inode table at 65539-65794 (+2)
7934 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
- Free blocks:
- Free inodes:
+ Free blocks: 65537-73728
+ Free inodes: 16385-18432
Group 9: (Blocks 73729-81920) [INODE_UNINIT, ITABLE_ZEROED]
Backup superblock at 73729, Group descriptors at 73730-73730
Reserved GDT blocks at 73731-73986
@@ -127,40 +128,40 @@ Group 9: (Blocks 73729-81920) [INODE_UNINIT, ITABLE_ZEROED]
Inode table at 73989-74244 (+260)
7676 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
Free blocks: 74245-81920
- Free inodes:
+ Free inodes: 18433-20480
Group 10: (Blocks 81921-90112) [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED]
Block bitmap at 81921 (+0), Inode bitmap at 81922 (+1)
Inode table at 81923-82178 (+2)
7934 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
- Free blocks:
- Free inodes:
+ Free blocks: 81921-90112
+ Free inodes: 20481-22528
Group 11: (Blocks 90113-98304) [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED]
Block bitmap at 90113 (+0), Inode bitmap at 90114 (+1)
Inode table at 90115-90370 (+2)
7934 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
- Free blocks:
- Free inodes:
+ Free blocks: 90113-98304
+ Free inodes: 22529-24576
Group 12: (Blocks 98305-106496) [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED]
Block bitmap at 98305 (+0), Inode bitmap at 98306 (+1)
Inode table at 98307-98562 (+2)
7934 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
- Free blocks:
- Free inodes:
+ Free blocks: 98305-106496
+ Free inodes: 24577-26624
Group 13: (Blocks 106497-114688) [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED]
Block bitmap at 106497 (+0), Inode bitmap at 106498 (+1)
Inode table at 106499-106754 (+2)
7934 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
- Free blocks:
- Free inodes:
+ Free blocks: 106497-114688
+ Free inodes: 26625-28672
Group 14: (Blocks 114689-122880) [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED]
Block bitmap at 114689 (+0), Inode bitmap at 114690 (+1)
Inode table at 114691-114946 (+2)
7934 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
- Free blocks:
- Free inodes:
+ Free blocks: 114689-122880
+ Free inodes: 28673-30720
Group 15: (Blocks 122881-131071) [INODE_UNINIT, ITABLE_ZEROED]
Block bitmap at 122881 (+0), Inode bitmap at 122882 (+1)
Inode table at 122883-123138 (+2)
7933 free blocks, 2048 free inodes, 0 directories, 2048 unused inodes
Free blocks: 123139-131071
- Free inodes:
+ Free inodes: 30721-32768
diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in
index 26f3671..0e28192 100644
--- a/tests/progs/Makefile.in
+++ b/tests/progs/Makefile.in
@@ -22,29 +22,29 @@ TEST_ICOUNT_OBJS= test_icount.o test_icount_cmds.o
SRCS= $(srcdir)/test_rel.c
LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR)
-DEPLIBS= $(LIBEXT2FS) $(DEPLIBSS) $(LIBCOM_ERR)
+DEPLIBS= $(LIBEXT2FS) $(DEPLIBSS) $(DEPLIBCOM_ERR)
.c.o:
- @echo " CC $<"
- @$(CC) -c $(ALL_CFLAGS) $< -o $@
+ $(E) " CC $<"
+ $(Q) $(CC) -c $(ALL_CFLAGS) $< -o $@
all:: $(PROGS)
test_rel: $(TEST_REL_OBJS) $(DEPLIBS)
- @echo " LD $@"
- @$(LD) $(ALL_LDFLAGS) -o test_rel $(TEST_REL_OBJS) $(LIBS)
+ $(E) " LD $@"
+ $(Q) $(LD) $(ALL_LDFLAGS) -o test_rel $(TEST_REL_OBJS) $(LIBS)
test_rel_cmds.c: test_rel_cmds.ct
- @echo " MK_CMDS $@"
- @$(MK_CMDS) $(srcdir)/test_rel_cmds.ct
+ $(E) " MK_CMDS $@"
+ $(Q) $(MK_CMDS) $(srcdir)/test_rel_cmds.ct
test_icount: $(TEST_ICOUNT_OBJS) $(DEPLIBS)
- @echo " LD $@"
- @$(LD) $(ALL_LDFLAGS) -o test_icount $(TEST_ICOUNT_OBJS) $(LIBS)
+ $(E) " LD $@"
+ $(Q) $(LD) $(ALL_LDFLAGS) -o test_icount $(TEST_ICOUNT_OBJS) $(LIBS)
test_icount_cmds.c: test_icount_cmds.ct
- @echo " MK_CMDS $@"
- @$(MK_CMDS) $(srcdir)/test_icount_cmds.ct
+ $(E) " MK_CMDS $@"
+ $(Q) $(MK_CMDS) $(srcdir)/test_icount_cmds.ct
clean:
$(RM) -f $(PROGS) test_rel_cmds.c test_icount_cmds.c \
diff --git a/tests/test_script.in b/tests/test_script.in
index bd3cc3e..aac28fb 100644
--- a/tests/test_script.in
+++ b/tests/test_script.in
@@ -10,6 +10,11 @@ case "$1" in
--valgrind)
export USE_VALGRIND="valgrind -q --sim-hints=lax-ioctls"
shift;
+ ;;
+ --valgrind-leakcheck)
+ export USE_VALGRIND="valgrind --sim-hints=lax-ioctls --leak-check=full --show-reachable=yes --log-file=/tmp/valgrind-%p.log"
+ shift;
+ ;;
esac
if test "$1"x = x ; then
diff --git a/util/Makefile.in b/util/Makefile.in
index 4c3d07c..4ad769f 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -14,25 +14,25 @@ SRCS = $(srcdir)/subst.c
@MCONFIG@
.c.o:
- @echo " CC $<"
- @$(BUILD_CC) -c $(BUILD_CFLAGS) $< -o $@
+ $(E) " CC $<"
+ $(Q) $(BUILD_CC) -c $(BUILD_CFLAGS) $< -o $@
PROGS= subst
all:: $(PROGS) gen-tarball
subst: subst.o
- @echo " LD $@"
- @$(BUILD_CC) $(BUILD_LDFLAGS) -o subst subst.o
+ $(E) " LD $@"
+ $(Q) $(BUILD_CC) $(BUILD_LDFLAGS) -o subst subst.o
copy_sparse: copy_sparse.o
- @echo " LD $@"
- @$(BUILD_CC) $(BUILD_LDFLAGS) -o copy_sparse copy_sparse.o
+ $(E) " LD $@"
+ $(Q) $(BUILD_CC) $(BUILD_LDFLAGS) -o copy_sparse copy_sparse.o
gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status
- @echo " CONFIG.STATUS $@"
- @cd $(top_builddir); CONFIG_FILES=util/gen-tarball ./config.status
- @chmod +x gen-tarball
+ $(E) " CONFIG.STATUS $@"
+ $(Q) cd $(top_builddir); CONFIG_FILES=util/gen-tarball ./config.status
+ $(Q) chmod +x gen-tarball
tarballs: gen-tarball
sh gen-tarball debian
diff --git a/version.h b/version.h
index 96d13c1..84218c5 100644
--- a/version.h
+++ b/version.h
@@ -7,5 +7,5 @@
* redistributed under the GNU Public License.
*/
-#define E2FSPROGS_VERSION "1.41.6"
-#define E2FSPROGS_DATE "30-May-2009"
+#define E2FSPROGS_VERSION "1.41.10"
+#define E2FSPROGS_DATE "10-Feb-2009"
--
Repository for maintaining lidskfsprogs
More information about the Pkg-lustre-svn-commit
mailing list