diff -Nru quota-4.04/aclocal.m4 quota-4.05/aclocal.m4 --- quota-4.04/aclocal.m4 2017-09-05 14:53:12.000000000 +0000 +++ quota-4.05/aclocal.m4 2019-03-29 10:50:34.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.13.4 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,32 +20,63 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29.2]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) @@ -67,18 +98,19 @@ PKG_CONFIG="" fi fi[]dnl -])# PKG_PROG_PKG_CONFIG +])dnl PKG_PROG_PKG_CONFIG -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ @@ -88,8 +120,10 @@ $3])dnl fi]) -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. m4_define([_PKG_CONFIG], [if test -n "$$1"; then pkg_cv_[]$1="$$1" @@ -101,10 +135,11 @@ else pkg_failed=untried fi[]dnl -])# _PKG_CONFIG +])dnl _PKG_CONFIG -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -112,26 +147,24 @@ else _pkg_short_errors_supported=no fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +])dnl _PKG_SHORT_ERRORS_SUPPORTED -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac AC_DEFUN([PKG_CHECK_MODULES], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -141,11 +174,11 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -162,7 +195,7 @@ _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -178,16 +211,40 @@ AC_MSG_RESULT([yes]) $3 fi[]dnl -])# PKG_CHECK_MODULES +])dnl PKG_CHECK_MODULES -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. AC_DEFUN([PKG_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -198,16 +255,18 @@ AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR +])dnl PKG_INSTALLDIR -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. AC_DEFUN([PKG_NOARCH_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -218,13 +277,15 @@ AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR +])dnl PKG_NOARCH_INSTALLDIR -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. AC_DEFUN([PKG_CHECK_VAR], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl @@ -233,9 +294,9 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR +])dnl PKG_CHECK_VAR -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -247,10 +308,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.4], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -266,12 +327,12 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.4])dnl +[AM_AUTOMAKE_VERSION([1.15.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# Copyright (C) 2011-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -291,7 +352,8 @@ : ${AR=ar} AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface], - [am_cv_ar_interface=ar + [AC_LANG_PUSH([C]) + am_cv_ar_interface=ar AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])], [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD' AC_TRY_EVAL([am_ar_try]) @@ -308,7 +370,7 @@ fi rm -f conftest.lib libconftest.a ]) - ]) + AC_LANG_POP([C])]) case $am_cv_ar_interface in ar) @@ -332,7 +394,7 @@ # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -384,7 +446,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -415,7 +477,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -606,7 +668,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -682,7 +744,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -691,6 +753,12 @@ # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -766,8 +834,8 @@ # # AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -799,6 +867,51 @@ AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. ]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not @@ -807,7 +920,6 @@ m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -829,7 +941,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -840,7 +952,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -850,7 +962,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -871,7 +983,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -921,7 +1033,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -960,7 +1072,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -989,9 +1101,73 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1072,7 +1248,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1132,7 +1308,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1160,7 +1336,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1179,7 +1355,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru quota-4.04/ar-lib quota-4.05/ar-lib --- quota-4.04/ar-lib 2017-09-05 13:55:57.000000000 +0000 +++ quota-4.05/ar-lib 2019-03-29 10:50:35.000000000 +0000 @@ -4,7 +4,7 @@ me=ar-lib scriptversion=2012-03-01.08; # UTC -# Copyright (C) 2010-2013 Free Software Foundation, Inc. +# Copyright (C) 2010-2017 Free Software Foundation, Inc. # Written by Peter Rosin . # # This program is free software; you can redistribute it and/or modify diff -Nru quota-4.04/bylabel.c quota-4.05/bylabel.c --- quota-4.04/bylabel.c 2013-03-27 07:38:47.000000000 +0000 +++ quota-4.05/bylabel.c 2019-03-29 10:39:33.000000000 +0000 @@ -20,6 +20,7 @@ #include #include #include +#include #include "bylabel.h" #include "common.h" @@ -37,32 +38,41 @@ #define EXT2_SUPER_MAGIC 0xEF53 struct ext2_super_block { - u_char s_dummy1[56]; - u_char s_magic[2]; - u_char s_dummy2[46]; - u_char s_uuid[16]; - u_char s_volume_name[16]; + uint8_t s_dummy1[56]; + uint8_t s_magic[2]; + uint8_t s_dummy2[46]; + uint8_t s_uuid[16]; + uint8_t s_volume_name[16]; }; -#define ext2magic(s) ((uint) s.s_magic[0] + (((uint) s.s_magic[1]) << 8)) +#define ext2magic(s) ((uint32_t) s.s_magic[0] + (((uint32_t) s.s_magic[1]) << 8)) #define XFS_SUPER_MAGIC "XFSB" #define XFS_SUPER_MAGIC2 "BSFX" +#define EXFS_SUPER_MAGIC "EXFS" struct xfs_super_block { - u_char s_magic[4]; - u_char s_dummy[28]; - u_char s_uuid[16]; - u_char s_dummy2[60]; - u_char s_fsname[12]; + uint8_t s_magic[4]; + uint8_t s_dummy[28]; + uint8_t s_uuid[16]; + uint8_t s_dummy2[60]; + uint8_t s_fsname[12]; }; #define REISER_SUPER_MAGIC "ReIsEr2Fs" struct reiserfs_super_block { - u_char s_dummy1[52]; - u_char s_magic[10]; - u_char s_dummy2[22]; - u_char s_uuid[16]; - u_char s_volume_name[16]; + uint8_t s_dummy1[52]; + uint8_t s_magic[10]; + uint8_t s_dummy2[22]; + uint8_t s_uuid[16]; + uint8_t s_volume_name[16]; +}; + +#define F2FS_SUPER_MAGIC "0xF2F52010" +struct f2fs_super_block { + uint8_t s_magic[8]; + uint8_t s_dummy[144]; + uint8_t s_uuid[16]; + uint8_t s_volume_name[512]; }; static inline unsigned short swapped(unsigned short a) @@ -81,6 +91,7 @@ struct ext2_super_block e2sb; struct xfs_super_block xfsb; struct reiserfs_super_block reisersb; + struct f2fs_super_block f2fssb; fd = open(device, O_RDONLY); if (fd < 0) @@ -98,7 +109,8 @@ else if (lseek(fd, 0, SEEK_SET) == 0 && read(fd, (char *)&xfsb, sizeof(xfsb)) == sizeof(xfsb) && (strncmp((char *)&xfsb.s_magic, XFS_SUPER_MAGIC, 4) == 0 || - strncmp((char *)&xfsb.s_magic, XFS_SUPER_MAGIC2, 4) == 0)) { + strncmp((char *)&xfsb.s_magic, XFS_SUPER_MAGIC2, 4) == 0 || + strncmp((char *)&xfsb.s_magic, EXFS_SUPER_MAGIC, 4) == 0)) { memcpy(uuid, xfsb.s_uuid, sizeof(xfsb.s_uuid)); namesize = sizeof(xfsb.s_fsname); *label = smalloc(namesize + 1); @@ -114,6 +126,15 @@ sstrncpy(*label, (char *)reisersb.s_volume_name, namesize); rv = 0; } + else if (lseek(fd, 65536, SEEK_SET) == 65536 + && read(fd, (char *)&f2fssb, sizeof(f2fssb)) == sizeof(f2fssb) + && !strncmp((char *)&f2fssb.s_magic, F2FS_SUPER_MAGIC, 8)) { + memcpy(uuid, f2fssb.s_uuid, sizeof(f2fssb.s_uuid)); + namesize = sizeof(f2fssb.s_volume_name); + *label = smalloc(namesize + 1); + sstrncpy(*label, (char *)f2fssb.s_volume_name, namesize); + rv = 0; + } close(fd); return rv; } @@ -222,7 +243,7 @@ return NULL; } -static u_char fromhex(char c) +static uint8_t fromhex(char c) { if (isdigit(c)) return (c - '0'); @@ -234,7 +255,7 @@ static char *get_spec_by_uuid(const char *s) { - u_char uuid[16]; + uint8_t uuid[16]; int i; if (strlen(s) != 36 || s[8] != '-' || s[13] != '-' || s[18] != '-' || s[23] != '-') diff -Nru quota-4.04/Changelog quota-4.05/Changelog --- quota-4.04/Changelog 2017-09-05 14:53:11.000000000 +0000 +++ quota-4.05/Changelog 2019-03-29 11:00:24.000000000 +0000 @@ -1,3 +1,35 @@ +Changes in quota-tools from 4.04 to 4.05 +* Use getrpcbynumber() instead of getrpcbynumber_r() (Jan Kara) +* configure.ac: fix pkg_check_modules calls (Fabrice Fontaine) +* Include to get loff_t definition (Fabrice Fontaine) +* Add missing include (Fabrice Fontaine) +* Use proper C99 integer types (Fabrice Fontaine) +* Disable quot tool (Jan Kara) +* Remove old disclaimers (Jan Kara) +* rpc.rquotad: Handle daemon(3) failure (Jan Kara) +* quota_nld: Check daemon() for failures (Petr Písař) +* xqmstats: Fix a file descriptor leak in main() (Petr Písař) +* quotackeck: Fix a directory descriptor leak in scan_dir() (Petr Písař) +* convertquota: Fix a file descriptor leak in convert_endian() (Petr Písař) +* quota(1): Distinguish between none quota limits and no allocated resources (Petr Písař) +* Merge warnquota CC handling fix. (Jan Kara) +* Fix warnquota Cc field being set incorrectly when using LDAP (Santiago Castro) +* Track COPYING file in git. (Jan Kara) +* Add quota_nld to .gitignore (Jan Kara) +* rpc: Fix wrong limit for space usage (Jan Kara) +* Listen on a TCP socket (Steve Dickson) +* Add HPE XFS support (Tinguely, Mark) +* warnquota: Fix comparing user name to non-null-terminated utmp.ut_user (Petr Písař) +* warnquota: Check snprintf() for overflows (Petr Písař) +* Add $(TIRPC_CFLAGS) globally to CFLAGS for RPC support, needed for libc 2.26 (Andreas K. Hüttel) +* Install rquota(3) only if RPC is enabled (Petr Písař) +* quotacheck: Fail check if quota file magic is invalid (Jan Kara) +* quotacheck: Report error when caching of quota file fails (Jan Kara) +* quotacheck: Avoid question in non-interactive mode (Jan Kara) +* repquota: Fix output when user -2 exists (Jan Kara) +* Implement manual choice of output unit (Jan Kara) +* f2fs: support f2fs's quota sysfile (Jaegeuk Kim) + Changes in quota-tools from 4.03 to 4.04 * Use TI-RPC for RPC client communication (Jan Kara) * rpc.rquotad: IPv6 support (Jan Kara) diff -Nru quota-4.04/common.c quota-4.05/common.c --- quota-4.04/common.c 2015-01-05 15:07:09.000000000 +0000 +++ quota-4.05/common.c 2018-01-10 08:23:17.000000000 +0000 @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -138,3 +139,41 @@ return 1; return 0; } + +static enum s2s_unit unitstring2unit(char *opt) +{ + char unitchar; + char *unitstring = "kmgt"; + int i, len; + + len = strlen(opt); + if (!len) + return S2S_NONE; + if (len > 1) + return S2S_INVALID; + unitchar = tolower(*opt); + for (i = 0; i < strlen(unitstring); i++) + if (unitchar == unitstring[i]) + break; + if (i >= strlen(unitstring)) + return S2S_INVALID; + return S2S_KB + i; +} + +int unitopt2unit(char *opt, enum s2s_unit *space_unit, enum s2s_unit *inode_unit) +{ + char *sep; + + sep = strchr(opt, ','); + if (!sep) + return -1; + *sep = 0; + *space_unit = unitstring2unit(opt); + if (*space_unit == S2S_INVALID) + return -1; + *inode_unit = unitstring2unit(sep + 1); + if (*inode_unit == S2S_INVALID) + return -1; + return 0; +} + diff -Nru quota-4.04/common.h quota-4.05/common.h --- quota-4.04/common.h 2015-01-05 15:07:41.000000000 +0000 +++ quota-4.05/common.h 2018-01-10 08:22:24.000000000 +0000 @@ -46,7 +46,21 @@ /* Print version string */ void version(void); +/* Desired output unit */ +enum s2s_unit { + S2S_NONE = 0, + S2S_KB, + S2S_MB, + S2S_GB, + S2S_TB, + S2S_AUTO, + S2S_INVALID +}; + /* Compare two times */ int timespec_cmp(struct timespec *a, struct timespec *b); +/* Convert command line option to desired output unit */ +int unitopt2unit(char *opt, enum s2s_unit *space_unit, enum s2s_unit *inode_unit); + #endif /* GUARD_COMMON_H */ diff -Nru quota-4.04/compile quota-4.05/compile --- quota-4.04/compile 1970-01-01 00:00:00.000000000 +0000 +++ quota-4.05/compile 2019-03-29 10:50:35.000000000 +0000 @@ -0,0 +1,348 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2016-01-11.22; # UTC + +# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC0" +# time-stamp-end: "; # UTC" +# End: diff -Nru quota-4.04/config.guess quota-4.05/config.guess --- quota-4.04/config.guess 2017-09-05 13:55:57.000000000 +0000 +++ quota-4.05/config.guess 2019-03-29 10:50:35.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2017-05-27' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2017 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ;; esac @@ -178,19 +178,29 @@ # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-${VENDOR}-unknown + ;; + *) machine=${UNAME_MACHINE_ARCH}-${VENDOR}-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. + # to ELF recently (or will in the future) and ABI. case "${UNAME_MACHINE_ARCH}" in + earm*) + os=netbsdelf + ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -207,6 +217,13 @@ os=netbsd ;; esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -217,13 +234,13 @@ release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "${machine}-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -233,6 +250,10 @@ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE} exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo ${UNAME_MACHINE_ARCH}-${VENDOR}-libertybsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE} exit ;; @@ -245,6 +266,9 @@ *:MirBSD:*:*) echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE} exit ;; + *:Sortix:*:*) + echo ${UNAME_MACHINE}-${VENDOR}-sortix + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -261,42 +285,42 @@ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -369,16 +393,16 @@ exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build - SUN_ARCH="i386" + SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH="x86_64" + SUN_ARCH=x86_64 fi fi echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` @@ -403,7 +427,7 @@ exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) echo m68k-sun-sunos${UNAME_RELEASE} @@ -589,8 +613,9 @@ else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -627,13 +652,13 @@ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi @@ -672,11 +697,11 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if [ ${HP_ARCH} = hppa2.0w ] then eval $set_cc_for_build @@ -689,12 +714,12 @@ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} @@ -799,14 +824,14 @@ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -822,10 +847,11 @@ UNAME_PROCESSOR=`/usr/bin/uname -p` case ${UNAME_PROCESSOR} in amd64) - echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; esac + echo ${UNAME_PROCESSOR}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -836,7 +862,7 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -888,7 +914,7 @@ exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -911,7 +937,7 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; arc:Linux:*:* | arceb:Linux:*:*) @@ -942,6 +968,9 @@ crisv32:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + exit ;; frv:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; @@ -954,6 +983,9 @@ ia64:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; + k1om:Linux:*:*) + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; @@ -979,10 +1011,13 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) + mips64el:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; - or32:Linux:*:*) + openrisc*:Linux:*:*) + echo or1k-${VENDOR}-linux-${LIBC} + exit ;; + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1011,6 +1046,9 @@ ppcle:Linux:*:*) echo powerpcle-${VENDOR}-linux-${LIBC} exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; @@ -1030,7 +1068,7 @@ echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} @@ -1109,7 +1147,7 @@ # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1258,6 +1296,9 @@ SX-8R:SUPER-UX:*:*) echo sx8r-nec-superux${UNAME_RELEASE} exit ;; + SX-ACE:SUPER-UX:*:*) + echo sxace-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1270,22 +1311,39 @@ if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi @@ -1294,15 +1352,18 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; - NEO-?:NONSTOP_KERNEL:*:*) + NEO-*:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; - NSR-?:NONSTOP_KERNEL:*:*) + NSR-*:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit ;; + NSX-*:NONSTOP_KERNEL:*:*) + echo nsx-tandem-nsk${UNAME_RELEASE} + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux exit ;; @@ -1316,7 +1377,7 @@ # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" @@ -1358,7 +1419,7 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` exit ;; i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos @@ -1369,171 +1430,25 @@ x86_64:VMkernel:*:*) echo ${UNAME_MACHINE}-${VENDOR}-esx exit ;; -esac - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd + amd64:Isilon\ OneFS:*:*) + echo x86_64-${VENDOR}-onefs exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi +esac cat >&2 < in order to provide the needed -information to handle your system. +If $0 has already been updated, send the following data and any +information you think might be pertinent to config-patches@gnu.org to +provide the necessary information to handle your system. config.guess timestamp = $timestamp diff -Nru quota-4.04/config.h quota-4.05/config.h --- quota-4.04/config.h 2017-09-05 14:53:14.000000000 +0000 +++ quota-4.05/config.h 2019-03-29 10:50:53.000000000 +0000 @@ -73,7 +73,7 @@ #define PACKAGE_NAME "quota" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "quota 4.04" +#define PACKAGE_STRING "quota 4.05" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "quota" @@ -82,7 +82,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.04" +#define PACKAGE_VERSION "4.05" /* Support for RPC */ #define RPC 1 @@ -122,7 +122,7 @@ /* Version number of package */ -#define VERSION "4.04" +#define VERSION "4.05" /* Assume quota mount options for root filesystem */ /* #undef XFS_ROOTHACK */ diff -Nru quota-4.04/config.sub quota-4.05/config.sub --- quota-4.04/config.sub 2017-09-05 13:55:57.000000000 +0000 +++ quota-4.05/config.sub 2019-03-29 10:50:35.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2013-04-24' +timestamp='2017-04-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ # of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -53,8 +53,7 @@ me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. @@ -68,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2017 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -117,8 +116,8 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -255,16 +254,18 @@ | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ + | ba \ | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ - | i370 | i860 | i960 | ia64 \ + | i370 | i860 | i960 | ia16 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -282,8 +283,10 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -295,14 +298,15 @@ | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -310,6 +314,8 @@ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ + | wasm32 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -324,7 +330,10 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -369,18 +378,20 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | ba-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ + | e2k-* | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -400,8 +411,10 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -413,16 +426,19 @@ | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ + | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile*-* \ @@ -430,6 +446,8 @@ | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ + | wasm32-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -506,6 +524,9 @@ basic_machine=i386-pc os=-aros ;; + asmjs) + basic_machine=asmjs-unknown + ;; aux) basic_machine=m68k-apple os=-aux @@ -626,6 +647,14 @@ basic_machine=m68k-bull os=-sysv3 ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + os=$os"spe" + ;; ebmon29k) basic_machine=a29k-amd os=-ebmon @@ -767,6 +796,9 @@ basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -794,7 +826,7 @@ os=-mingw64 ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -822,6 +854,10 @@ basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -830,7 +866,7 @@ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -914,6 +950,9 @@ nsr-tandem) basic_machine=nsr-tandem ;; + nsx-tandem) + basic_machine=nsx-tandem + ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf @@ -998,7 +1037,7 @@ ppc-* | ppcbe-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppcle | powerpclittle | ppc-le | powerpc-little) + ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) @@ -1008,7 +1047,7 @@ ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) @@ -1039,12 +1078,18 @@ rtpc | rtpc-*) basic_machine=romp-ibm ;; - s390 | s390-*) + s390) basic_machine=s390-ibm ;; - s390x | s390x-*) + s390-*) + basic_machine=s390-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + s390x) basic_machine=s390x-ibm ;; + s390x-*) + basic_machine=s390x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sa29200) basic_machine=a29k-amd os=-udi @@ -1209,6 +1254,9 @@ basic_machine=a29k-wrs os=-vxworks ;; + wasm32) + basic_machine=wasm32-unknown + ;; w65*) basic_machine=w65-wdc os=-none @@ -1354,27 +1402,28 @@ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1506,6 +1555,8 @@ ;; -nacl*) ;; + -ios) + ;; -none) ;; *) @@ -1546,6 +1597,9 @@ c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf ;; @@ -1589,9 +1643,6 @@ mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; @@ -1601,6 +1652,9 @@ sparc-* | *-sun) os=-sunos4.1.1 ;; + pru-*) + os=-elf + ;; *-be) os=-beos ;; diff -Nru quota-4.04/configure quota-4.05/configure --- quota-4.04/configure 2017-09-05 14:53:13.000000000 +0000 +++ quota-4.05/configure 2019-03-29 10:50:34.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for quota 4.04. +# Generated by GNU Autoconf 2.69 for quota 4.05. # # Report bugs to . # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='quota' PACKAGE_TARNAME='quota' -PACKAGE_VERSION='4.04' -PACKAGE_STRING='quota 4.04' +PACKAGE_VERSION='4.05' +PACKAGE_STRING='quota 4.05' PACKAGE_BUGREPORT='jack@suse.cz' PACKAGE_URL='' @@ -1338,7 +1338,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures quota 4.04 to adapt to many kinds of systems. +\`configure' configures quota 4.05 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1408,7 +1408,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of quota 4.04:";; + short | recursive ) echo "Configuration of quota 4.05:";; esac cat <<\_ACEOF @@ -1545,7 +1545,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -quota configure 4.04 +quota configure 4.05 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1914,7 +1914,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by quota $as_me 4.04, which was +It was created by quota $as_me 4.05, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2265,7 +2265,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version='1.13' +am__api_version='1.15' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2486,7 +2486,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -2780,7 +2780,7 @@ # Define the identity of the package. PACKAGE='quota' - VERSION='4.04' + VERSION='4.05' cat >>confdefs.h <<_ACEOF @@ -2814,8 +2814,8 @@ # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -2831,6 +2831,48 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -3729,6 +3771,65 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +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 whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +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 + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -4627,7 +4728,13 @@ if ${am_cv_ar_interface+:} false; then : $as_echo_n "(cached) " >&6 else - am_cv_ar_interface=ar + 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 + + am_cv_ar_interface=ar cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int some_variable = 0; @@ -4658,6 +4765,11 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + 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 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5 @@ -5027,6 +5139,65 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +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 whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +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 + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -7330,8 +7501,8 @@ build_ext2direct="yes" pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for COM_ERR" >&5 -$as_echo_n "checking for COM_ERR... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for com_err" >&5 +$as_echo_n "checking for com_err... " >&6; } if test -n "$COM_ERR_CFLAGS"; then pkg_cv_COM_ERR_CFLAGS="$COM_ERR_CFLAGS" @@ -7371,7 +7542,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -7396,7 +7567,7 @@ fi elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } build_ext2direct="no" @@ -7411,12 +7582,12 @@ COM_ERR_LIBS=$pkg_cv_COM_ERR_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - + CFLAGS="$CFLAGS $COM_ERR_CFLAGS" LIBS="$LIBS $COMM_ERR_LIBS" fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXT2FS" >&5 -$as_echo_n "checking for EXT2FS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ext2fs" >&5 +$as_echo_n "checking for ext2fs... " >&6; } if test -n "$EXT2FS_CFLAGS"; then pkg_cv_EXT2FS_CFLAGS="$EXT2FS_CFLAGS" @@ -7456,7 +7627,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -7481,7 +7652,7 @@ fi elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } build_ext2direct="no" @@ -7496,7 +7667,7 @@ EXT2FS_LIBS=$pkg_cv_EXT2FS_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - + CFLAGS="$CFLAGS $EXT2FS_CFLAGS" LIBS="$LIBS $EXT2FS_LIBS" fi if test "x$build_ext2direct" != "xno"; then : @@ -7533,8 +7704,8 @@ build_netlink="yes" pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 -$as_echo_n "checking for DBUS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-1" >&5 +$as_echo_n "checking for dbus-1... " >&6; } if test -n "$DBUS_CFLAGS"; then pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" @@ -7574,7 +7745,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -7599,7 +7770,7 @@ fi elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } build_netlink="no" @@ -7614,12 +7785,12 @@ DBUS_LIBS=$pkg_cv_DBUS_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - + CFLAGS="$CFLAGS $DBUS_CFLAGS" LIBS="$LIBS $DBUS_LIBS" fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL3" >&5 -$as_echo_n "checking for LIBNL3... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnl-3.0 >= 3.1 libnl-genl-3.0" >&5 +$as_echo_n "checking for libnl-3.0 >= 3.1 libnl-genl-3.0... " >&6; } if test -n "$LIBNL3_CFLAGS"; then pkg_cv_LIBNL3_CFLAGS="$LIBNL3_CFLAGS" @@ -7659,7 +7830,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -7684,7 +7855,7 @@ fi elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } build_netlink="no" @@ -7699,7 +7870,7 @@ LIBNL3_LIBS=$pkg_cv_LIBNL3_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - + CFLAGS="$CFLAGS $LIBNL3_CFLAGS" LIBS="$LIBS $LIBNL3_LIBS" fi else @@ -7841,8 +8012,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIRPC" >&5 -$as_echo_n "checking for TIRPC... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libtirpc" >&5 +$as_echo_n "checking for libtirpc... " >&6; } if test -n "$TIRPC_CFLAGS"; then pkg_cv_TIRPC_CFLAGS="$TIRPC_CFLAGS" @@ -7882,7 +8053,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -7912,7 +8083,7 @@ build_rpc="no" elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if test x"$enable_rpc" = "xyes"; then : @@ -7932,7 +8103,7 @@ TIRPC_LIBS=$pkg_cv_TIRPC_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - + CFLAGS="$CFLAGS $TIRPC_CFLAGS" LIBS="$LIBS $TIRPC_LIBS" fi if test x"$build_rpc" != "xno"; then : @@ -8578,7 +8749,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by quota $as_me 4.04, which was +This file was extended by quota $as_me 4.05, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8644,7 +8815,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -quota config.status 4.04 +quota config.status 4.05 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru quota-4.04/configure.ac quota-4.05/configure.ac --- quota-4.04/configure.ac 2017-09-05 14:53:11.000000000 +0000 +++ quota-4.05/configure.ac 2019-03-29 10:50:28.000000000 +0000 @@ -6,7 +6,7 @@ # Version informations # ==================== m4_define([quota_version_major],[4]) -m4_define([quota_version_minor],[04]) +m4_define([quota_version_minor],[05]) m4_define([quota_version],[quota_version_major.quota_version_minor]) # ============= @@ -104,13 +104,13 @@ ) AS_IF([test "x$enable_ext2direct" != "xno"], [ build_ext2direct="yes" - PKG_CHECK_MODULES([COM_ERR],[com_err], [], [ + PKG_CHECK_MODULES([COM_ERR],[com_err], [CFLAGS="$CFLAGS $COM_ERR_CFLAGS" LIBS="$LIBS $COMM_ERR_LIBS"], [ build_ext2direct="no" AS_IF([test "x$enable_ext2direct" = "xyes"], [ AC_MSG_ERROR([Ext2direct requested but required com_err library not found]) ]) ]) - PKG_CHECK_MODULES([EXT2FS],[ext2fs], [], [ + PKG_CHECK_MODULES([EXT2FS],[ext2fs], [CFLAGS="$CFLAGS $EXT2FS_CFLAGS" LIBS="$LIBS $EXT2FS_LIBS"], [ build_ext2direct="no" AS_IF([test "x$enable_ext2direct" = "xyes"], [ AC_MSG_ERROR([Ext2direct requested but required ext2fs library not found]) @@ -138,13 +138,13 @@ ) AS_IF([test "x$enable_netlink" != "xno"], [ build_netlink="yes" - PKG_CHECK_MODULES([DBUS], [dbus-1], [], [ + PKG_CHECK_MODULES([DBUS], [dbus-1], [CFLAGS="$CFLAGS $DBUS_CFLAGS" LIBS="$LIBS $DBUS_LIBS"], [ build_netlink="no" AS_IF([test "x$enable_netlink" = "xyes"] , [ AC_MSG_ERROR([Required dbus libraries for quota netlink daemon not found.]) ]) ]) - PKG_CHECK_MODULES([LIBNL3], [libnl-3.0 >= 3.1 libnl-genl-3.0], [], [ + PKG_CHECK_MODULES([LIBNL3], [libnl-3.0 >= 3.1 libnl-genl-3.0], [CFLAGS="$CFLAGS $LIBNL3_CFLAGS" LIBS="$LIBS $LIBNL3_LIBS"], [ build_netlink="no" AS_IF([test "x$enable_netlink" = "xyes"] , [ AC_MSG_ERROR([Required libnl3 libraries for quota netlink daemon not found.]) @@ -207,7 +207,7 @@ build_rpc="no" ]) - PKG_CHECK_MODULES([TIRPC], [libtirpc], [], [ + PKG_CHECK_MODULES([TIRPC], [libtirpc], [CFLAGS="$CFLAGS $TIRPC_CFLAGS" LIBS="$LIBS $TIRPC_LIBS"], [ AS_IF([test x"$enable_rpc" = "xyes"], [ AC_MSG_ERROR([could not locate required libtirpc]) ], [ diff -Nru quota-4.04/convertquota.c quota-4.05/convertquota.c --- quota-4.04/convertquota.c 2014-12-02 09:39:52.000000000 +0000 +++ quota-4.05/convertquota.c 2019-03-29 10:39:28.000000000 +0000 @@ -363,6 +363,7 @@ } ret = endian_scan_structures(ofd, type); end_io(qn); + close(ofd); if (ret < 0) return ret; diff -Nru quota-4.04/COPYING quota-4.05/COPYING --- quota-4.04/COPYING 2013-08-15 08:52:31.000000000 +0000 +++ quota-4.05/COPYING 2019-03-29 10:39:28.000000000 +0000 @@ -1,8 +1,5 @@ This package, the quota tools, are made available under the GNU Public License -version 2, with the exception of files quota.c, quotaio_v1.c, quotaon.c, -quotaops.c, quot.c, and quot.h which are made available under the BSD license -(see headers of these files for details). - +version 2. ---------------------------------------------------------------------- GNU GENERAL PUBLIC LICENSE diff -Nru quota-4.04/debian/changelog quota-4.05/debian/changelog --- quota-4.04/debian/changelog 2018-11-10 12:54:38.000000000 +0000 +++ quota-4.05/debian/changelog 2019-04-09 08:12:04.000000000 +0000 @@ -1,16 +1,9 @@ -quota (4.04-2ubuntu2) disco; urgency=medium +quota (4.05-1) unstable; urgency=medium - * No-change rebuild against latest libtirpc + * New upstream version 4.05 + * Bumped Standards-Version to 4.3.0, no changes needed. - -- Jeremy Bicha Sat, 10 Nov 2018 07:54:38 -0500 - -quota (4.04-2ubuntu1) cosmic; urgency=medium - - * d/p/lp-1774431-fix-Listen-on-a-TCP-socket.patch: avoid issues with TCP - sockets hogging quota at 100% cpu (LP: #1774431 Can be dropped next - release >4.04 as the patch is upstream already). - - -- Christian Ehrhardt Mon, 04 Jun 2018 09:13:16 +0200 + -- Michael Meskes Tue, 09 Apr 2019 10:12:04 +0200 quota (4.04-2) unstable; urgency=medium diff -Nru quota-4.04/debian/control quota-4.05/debian/control --- quota-4.04/debian/control 2018-06-04 07:13:16.000000000 +0000 +++ quota-4.05/debian/control 2019-04-09 08:12:04.000000000 +0000 @@ -1,13 +1,12 @@ Source: quota Section: admin Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Michael Meskes +Maintainer: Michael Meskes Build-Depends: debhelper (>= 11), gettext, libwrap0-dev, e2fslibs-dev, po-debconf (>= 0.5.0), libldap2-dev, quilt (>= 0.46-7), libnl-3-dev, libnl-genl-3-dev, libdbus-1-dev, libtirpc-dev -Standards-Version: 4.1.3 +Standards-Version: 4.3.0 Homepage: http://sourceforge.net/projects/linuxquota Package: quota @@ -20,4 +19,3 @@ or soft limits with adjustable grace periods on block or inode usage for users and groups. It allows users to check their quota status, integrates with LDAP, and supports quotas on remote machines via NFS. - diff -Nru quota-4.04/debian/patches/loop.diff quota-4.05/debian/patches/loop.diff --- quota-4.04/debian/patches/loop.diff 2018-06-04 07:06:19.000000000 +0000 +++ quota-4.05/debian/patches/loop.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -#Description: Prevent quotacheck from going into en endless loop. -#Author: Christoph Biedl ---- a/quotacheck_v2.c -+++ b/quotacheck_v2.c -@@ -363,7 +363,7 @@ - "specified on command line (%d). Quota file header " - "may be corrupted.\n"), - le32toh(head.dqh_version), version); -- if (!ask_yn(_("Continue checking assuming version from command line?"), 1)) -+ if ((flags & FL_INTERACTIVE) && !ask_yn(_("Continue checking assuming version from command line?"), 1)) - return -1; - detected_versions[type] = version; - } else - diff -Nru quota-4.04/debian/patches/lp-1774431-fix-Listen-on-a-TCP-socket.patch quota-4.05/debian/patches/lp-1774431-fix-Listen-on-a-TCP-socket.patch --- quota-4.04/debian/patches/lp-1774431-fix-Listen-on-a-TCP-socket.patch 2018-06-04 07:13:08.000000000 +0000 +++ quota-4.05/debian/patches/lp-1774431-fix-Listen-on-a-TCP-socket.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -From 31ecd29b3b3f51145fd78f63087c10e9fcadf999 Mon Sep 17 00:00:00 2001 -From: Steve Dickson -Date: Tue, 22 May 2018 12:41:59 +0200 -Subject: [PATCH] Listen on a TCP socket -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -rpc.rquotad spins in libtirpc's rendezvous_request() on accepting TCP -connections because the polled TCP socket is not listening: - -poll([{fd=4, events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=5, - events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=6, - events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=7, - events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}], 4, -1) = 2 ([{fd=5, - revents=POLLHUP}, {fd=7, revents=POLLHUP}]) -accept(5, 0x7ffe61698700, [128]) = -1 EINVAL (Invalid argument) -accept(7, 0x7ffe61698700, [128]) = -1 EINVAL (Invalid argument) - -The polled descriptors are: - -rpc.rquot 21981 root 4u IPv4 80449159 0t0 UDP *:rquotad -rpc.rquot 21981 root 5u sock 0,9 0t0 80449162 protocol: TCP -rpc.rquot 21981 root 6u IPv6 80449165 0t0 UDP *:rquotad -rpc.rquot 21981 root 7u sock 0,9 0t0 80449168 protocol: TCPv6 - -That results into a high CPU usage just after staring rpc.rquotad -process. - -This patch adds a listen() call to svc_create_sock() -routine which is needed with libtirpc version of svc_tli_create() -as well as a needed IPv6 setsockopt(). - -Signed-off-by: Petr Písař - -Author: Christian Ehrhardt -Original-Author: Steve Dickson -Origin: backport, https://sourceforge.net/p/linuxquota/code/ci/77440bd389425a9a79265f52783e6d39535f199f/ -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1774431 -Last-Update: 2018-06-03 - ---- - svc_socket.c | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/svc_socket.c b/svc_socket.c -index 8a44604..d2e3abf 100644 ---- a/svc_socket.c -+++ b/svc_socket.c -@@ -118,6 +118,15 @@ static int svc_create_sock(struct addrinfo *ai) - return -1; - } - -+ if (ai->ai_family == AF_INET6) { -+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, -+ &optval, sizeof(optval)) < 0) { -+ errstr(_("Cannot set IPv6 socket options: %s\n"), strerror(errno)); -+ close(fd); -+ return -1; -+ } -+ } -+ - if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)) < 0) { - errstr(_("Cannot set socket options: %s\n"), strerror(errno)); - close(fd); -@@ -129,6 +138,15 @@ static int svc_create_sock(struct addrinfo *ai) - close(fd); - return -1; - } -+ -+ if (ai->ai_protocol == IPPROTO_TCP) { -+ if (listen(fd, SOMAXCONN) < 0) { -+ errstr(_("Cannot listen to address: %s\n"), strerror(errno)); -+ close(fd); -+ return -1; -+ } -+ } -+ - return fd; - } - --- -2.14.3 - diff -Nru quota-4.04/debian/patches/series quota-4.05/debian/patches/series --- quota-4.04/debian/patches/series 2018-06-04 07:10:50.000000000 +0000 +++ quota-4.05/debian/patches/series 2019-04-09 08:12:04.000000000 +0000 @@ -1,4 +1,2 @@ editor.diff -loop.diff -lp-1774431-fix-Listen-on-a-TCP-socket.patch diff -Nru quota-4.04/depcomp quota-4.05/depcomp --- quota-4.04/depcomp 2017-09-05 13:55:57.000000000 +0000 +++ quota-4.05/depcomp 2019-03-29 10:50:35.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2013-05-30.07; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -786,6 +786,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru quota-4.04/dqblk_v2.h quota-4.05/dqblk_v2.h --- quota-4.04/dqblk_v2.h 2013-03-27 07:38:47.000000000 +0000 +++ quota-4.05/dqblk_v2.h 2019-03-29 10:39:33.000000000 +0000 @@ -8,6 +8,7 @@ #define GUARD_DQBLK_V2_H #include +#include #include "quota_tree.h" #define Q_V2_GETQUOTA 0x0D00 /* Get limits and usage */ diff -Nru quota-4.04/install-sh quota-4.05/install-sh --- quota-4.04/install-sh 2017-09-05 13:55:57.000000000 +0000 +++ quota-4.05/install-sh 2019-03-29 10:50:35.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2016-01-11.22; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,74 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +370,51 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +449,12 @@ # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +467,24 @@ # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 @@ -522,6 +496,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru quota-4.04/Makefile.am quota-4.05/Makefile.am --- quota-4.04/Makefile.am 2017-09-05 14:04:16.000000000 +0000 +++ quota-4.05/Makefile.am 2019-03-29 10:39:28.000000000 +0000 @@ -25,9 +25,7 @@ quotasync.1 \ quotatab.5 \ quota.1 \ - quot.8 \ repquota.8 \ - rquota.3 \ setquota.8 \ warnquota.conf.5 \ warnquota.8 \ @@ -51,6 +49,8 @@ noinst_LIBRARIES = libquota.a if WITH_RPC +CFLAGS += $(TIRPC_CFLAGS) + rpcsvcdir = $(includedir)/rpcsvc rpcsvc_DATA = \ rquota.h \ @@ -69,7 +69,10 @@ RPCLIBS = librpcclient.a BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c CLEANFILES = rquota.c rquota.h rquota_clnt.c -man_MANS += rpc.rquotad.8 +man_MANS += \ + rpc.rquotad.8 \ + rquota.3 + endif libquota_a_SOURCES = \ @@ -100,8 +103,6 @@ mntopt.h \ pot.c \ pot.h -libquota_a_CFLAGS = \ - $(TIRPC_CFLAGS) libquota_a_LIBADD = \ $(RPCLIBS) @@ -112,7 +113,6 @@ sbin_PROGRAMS = \ quotacheck \ quotaon \ - quot \ repquota \ warnquota \ quotastats \ @@ -171,14 +171,6 @@ $(RPCLIBS) \ $(TIRPC_LIBS) -quot_SOURCES = \ - quot.c \ - quot.h -quot_LDADD = \ - libquota.a \ - $(RPCLIBS) \ - $(TIRPC_LIBS) - repquota_SOURCES = repquota.c repquota_LDADD = \ libquota.a \ @@ -235,7 +227,6 @@ rquota_server.c \ rquota_svc.c \ svc_socket.c -rpc_rquotad_CFLAGS = $(TIRPC_CFLAGS) rpc_rquotad_LDADD = \ libquota.a \ $(WRAP_LIBS) \ diff -Nru quota-4.04/Makefile.in quota-4.05/Makefile.in --- quota-4.04/Makefile.in 2017-09-05 14:53:13.000000000 +0000 +++ quota-4.05/Makefile.in 2019-03-29 10:50:35.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,7 +17,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -81,24 +91,24 @@ build_triplet = @build@ host_triplet = @host@ @WITH_NETLINK_TRUE@am__append_1 = quota_nld.8 -@WITH_RPC_TRUE@am__append_2 = librpcclient.a -@WITH_RPC_TRUE@am__append_3 = rpc.rquotad.8 -bin_PROGRAMS = quota$(EXEEXT) quotasync$(EXEEXT) -sbin_PROGRAMS = quotacheck$(EXEEXT) quotaon$(EXEEXT) quot$(EXEEXT) \ - repquota$(EXEEXT) warnquota$(EXEEXT) quotastats$(EXEEXT) \ - xqmstats$(EXEEXT) edquota$(EXEEXT) setquota$(EXEEXT) \ - convertquota$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) +@WITH_RPC_TRUE@am__append_2 = $(TIRPC_CFLAGS) +@WITH_RPC_TRUE@am__append_3 = librpcclient.a @WITH_RPC_TRUE@am__append_4 = \ +@WITH_RPC_TRUE@ rpc.rquotad.8 \ +@WITH_RPC_TRUE@ rquota.3 + +bin_PROGRAMS = quota$(EXEEXT) quotasync$(EXEEXT) +sbin_PROGRAMS = quotacheck$(EXEEXT) quotaon$(EXEEXT) repquota$(EXEEXT) \ + warnquota$(EXEEXT) quotastats$(EXEEXT) xqmstats$(EXEEXT) \ + edquota$(EXEEXT) setquota$(EXEEXT) convertquota$(EXEEXT) \ + $(am__EXEEXT_1) $(am__EXEEXT_2) +@WITH_RPC_TRUE@am__append_5 = \ @WITH_RPC_TRUE@ rpc.rquotad -@WITH_NETLINK_TRUE@am__append_5 = \ +@WITH_NETLINK_TRUE@am__append_6 = \ @WITH_NETLINK_TRUE@ quota_nld subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in mkinstalldirs depcomp ABOUT-NLS COPYING \ - ar-lib config.guess config.rpath config.sub install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -107,6 +117,8 @@ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -121,16 +133,12 @@ am__v_AR_1 = libquota_a_AR = $(AR) $(ARFLAGS) libquota_a_DEPENDENCIES = $(RPCLIBS) -am_libquota_a_OBJECTS = libquota_a-quotaio.$(OBJEXT) \ - libquota_a-quotaio_v1.$(OBJEXT) \ - libquota_a-quotaio_v2.$(OBJEXT) \ - libquota_a-quotaio_tree.$(OBJEXT) \ - libquota_a-quotaio_rpc.$(OBJEXT) \ - libquota_a-quotaio_xfs.$(OBJEXT) \ - libquota_a-quotaio_meta.$(OBJEXT) \ - libquota_a-quotaio_generic.$(OBJEXT) \ - libquota_a-bylabel.$(OBJEXT) libquota_a-common.$(OBJEXT) \ - libquota_a-quotasys.$(OBJEXT) libquota_a-pot.$(OBJEXT) +am_libquota_a_OBJECTS = quotaio.$(OBJEXT) quotaio_v1.$(OBJEXT) \ + quotaio_v2.$(OBJEXT) quotaio_tree.$(OBJEXT) \ + quotaio_rpc.$(OBJEXT) quotaio_xfs.$(OBJEXT) \ + quotaio_meta.$(OBJEXT) quotaio_generic.$(OBJEXT) \ + bylabel.$(OBJEXT) common.$(OBJEXT) quotasys.$(OBJEXT) \ + pot.$(OBJEXT) libquota_a_OBJECTS = $(am_libquota_a_OBJECTS) librpcclient_a_AR = $(AR) $(ARFLAGS) librpcclient_a_LIBADD = @@ -157,9 +165,6 @@ am_edquota_OBJECTS = edquota.$(OBJEXT) quotaops.$(OBJEXT) edquota_OBJECTS = $(am_edquota_OBJECTS) edquota_DEPENDENCIES = libquota.a $(RPCLIBS) $(am__DEPENDENCIES_1) -am_quot_OBJECTS = quot.$(OBJEXT) -quot_OBJECTS = $(am_quot_OBJECTS) -quot_DEPENDENCIES = libquota.a $(RPCLIBS) $(am__DEPENDENCIES_1) am_quota_OBJECTS = quota.$(OBJEXT) quotaops.$(OBJEXT) quota_OBJECTS = $(am_quota_OBJECTS) quota_DEPENDENCIES = libquota.a $(RPCLIBS) $(am__DEPENDENCIES_1) @@ -193,16 +198,12 @@ repquota_DEPENDENCIES = libquota.a $(RPCLIBS) $(am__DEPENDENCIES_1) am__rpc_rquotad_SOURCES_DIST = rquota_server.c rquota_svc.c \ svc_socket.c -@WITH_RPC_TRUE@am_rpc_rquotad_OBJECTS = \ -@WITH_RPC_TRUE@ rpc_rquotad-rquota_server.$(OBJEXT) \ -@WITH_RPC_TRUE@ rpc_rquotad-rquota_svc.$(OBJEXT) \ -@WITH_RPC_TRUE@ rpc_rquotad-svc_socket.$(OBJEXT) +@WITH_RPC_TRUE@am_rpc_rquotad_OBJECTS = rquota_server.$(OBJEXT) \ +@WITH_RPC_TRUE@ rquota_svc.$(OBJEXT) svc_socket.$(OBJEXT) rpc_rquotad_OBJECTS = $(am_rpc_rquotad_OBJECTS) @WITH_RPC_TRUE@rpc_rquotad_DEPENDENCIES = libquota.a \ @WITH_RPC_TRUE@ $(am__DEPENDENCIES_1) $(RPCLIBS) \ @WITH_RPC_TRUE@ $(am__DEPENDENCIES_1) -rpc_rquotad_LINK = $(CCLD) $(rpc_rquotad_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ am_setquota_OBJECTS = setquota.$(OBJEXT) quotaops.$(OBJEXT) setquota_OBJECTS = $(am_setquota_OBJECTS) setquota_DEPENDENCIES = libquota.a $(RPCLIBS) $(am__DEPENDENCIES_1) @@ -247,16 +248,16 @@ am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libquota_a_SOURCES) $(librpcclient_a_SOURCES) \ - $(convertquota_SOURCES) $(edquota_SOURCES) $(quot_SOURCES) \ - $(quota_SOURCES) $(quota_nld_SOURCES) $(quotacheck_SOURCES) \ - $(quotaon_SOURCES) $(quotastats_SOURCES) $(quotasync_SOURCES) \ - $(repquota_SOURCES) $(rpc_rquotad_SOURCES) $(setquota_SOURCES) \ + $(convertquota_SOURCES) $(edquota_SOURCES) $(quota_SOURCES) \ + $(quota_nld_SOURCES) $(quotacheck_SOURCES) $(quotaon_SOURCES) \ + $(quotastats_SOURCES) $(quotasync_SOURCES) $(repquota_SOURCES) \ + $(rpc_rquotad_SOURCES) $(setquota_SOURCES) \ $(warnquota_SOURCES) $(xqmstats_SOURCES) DIST_SOURCES = $(libquota_a_SOURCES) \ $(am__librpcclient_a_SOURCES_DIST) $(convertquota_SOURCES) \ - $(edquota_SOURCES) $(quot_SOURCES) $(quota_SOURCES) \ - $(quota_nld_SOURCES) $(quotacheck_SOURCES) $(quotaon_SOURCES) \ - $(quotastats_SOURCES) $(quotasync_SOURCES) $(repquota_SOURCES) \ + $(edquota_SOURCES) $(quota_SOURCES) $(quota_nld_SOURCES) \ + $(quotacheck_SOURCES) $(quotaon_SOURCES) $(quotastats_SOURCES) \ + $(quotasync_SOURCES) $(repquota_SOURCES) \ $(am__rpc_rquotad_SOURCES_DIST) $(setquota_SOURCES) \ $(warnquota_SOURCES) $(xqmstats_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ @@ -336,6 +337,9 @@ CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + ABOUT-NLS COPYING ar-lib compile config.guess config.rpath \ + config.sub depcomp install-sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -388,7 +392,7 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ $(am__append_2) COM_ERR_CFLAGS = @COM_ERR_CFLAGS@ COM_ERR_LIBS = @COM_ERR_LIBS@ CPP = @CPP@ @@ -522,9 +526,9 @@ quotagrpadmins man_MANS = convertquota.8 edquota.8 quotagrpadmins.5 quotacheck.8 \ - quotaon.8 quotastats.8 quotasync.1 quotatab.5 quota.1 quot.8 \ - repquota.8 rquota.3 setquota.8 warnquota.conf.5 warnquota.8 \ - xqmstats.8 $(am__append_1) $(am__append_3) + quotaon.8 quotastats.8 quotasync.1 quotatab.5 quota.1 \ + repquota.8 setquota.8 warnquota.conf.5 warnquota.8 xqmstats.8 \ + $(am__append_1) $(am__append_4) SUBDIRS = po EXTRA_DIST = \ $(sysconf_DATA) \ @@ -535,7 +539,7 @@ Changelog \ ldap-scripts -noinst_LIBRARIES = libquota.a $(am__append_2) +noinst_LIBRARIES = libquota.a $(am__append_3) @WITH_RPC_TRUE@rpcsvcdir = $(includedir)/rpcsvc @WITH_RPC_TRUE@rpcsvc_DATA = \ @WITH_RPC_TRUE@ rquota.h \ @@ -581,9 +585,6 @@ pot.c \ pot.h -libquota_a_CFLAGS = \ - $(TIRPC_CFLAGS) - libquota_a_LIBADD = \ $(RPCLIBS) @@ -633,15 +634,6 @@ $(RPCLIBS) \ $(TIRPC_LIBS) -quot_SOURCES = \ - quot.c \ - quot.h - -quot_LDADD = \ - libquota.a \ - $(RPCLIBS) \ - $(TIRPC_LIBS) - repquota_SOURCES = repquota.c repquota_LDADD = \ libquota.a \ @@ -700,7 +692,6 @@ @WITH_RPC_TRUE@ rquota_svc.c \ @WITH_RPC_TRUE@ svc_socket.c -@WITH_RPC_TRUE@rpc_rquotad_CFLAGS = $(TIRPC_CFLAGS) @WITH_RPC_TRUE@rpc_rquotad_LDADD = \ @WITH_RPC_TRUE@ libquota.a \ @WITH_RPC_TRUE@ $(WRAP_LIBS) \ @@ -739,7 +730,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -760,8 +750,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -879,10 +869,6 @@ @rm -f edquota$(EXEEXT) $(AM_V_CCLD)$(LINK) $(edquota_OBJECTS) $(edquota_LDADD) $(LIBS) -quot$(EXEEXT): $(quot_OBJECTS) $(quot_DEPENDENCIES) $(EXTRA_quot_DEPENDENCIES) - @rm -f quot$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(quot_OBJECTS) $(quot_LDADD) $(LIBS) - quota$(EXEEXT): $(quota_OBJECTS) $(quota_DEPENDENCIES) $(EXTRA_quota_DEPENDENCIES) @rm -f quota$(EXEEXT) $(AM_V_CCLD)$(LINK) $(quota_OBJECTS) $(quota_LDADD) $(LIBS) @@ -913,7 +899,7 @@ rpc.rquotad$(EXEEXT): $(rpc_rquotad_OBJECTS) $(rpc_rquotad_DEPENDENCIES) $(EXTRA_rpc_rquotad_DEPENDENCIES) @rm -f rpc.rquotad$(EXEEXT) - $(AM_V_CCLD)$(rpc_rquotad_LINK) $(rpc_rquotad_OBJECTS) $(rpc_rquotad_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(rpc_rquotad_OBJECTS) $(rpc_rquotad_LDADD) $(LIBS) setquota$(EXEEXT): $(setquota_OBJECTS) $(setquota_DEPENDENCIES) $(EXTRA_setquota_DEPENDENCIES) @rm -f setquota$(EXEEXT) @@ -933,42 +919,39 @@ distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bylabel.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convertquota.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edquota.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libquota_a-bylabel.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libquota_a-common.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libquota_a-pot.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libquota_a-quotaio.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libquota_a-quotaio_generic.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libquota_a-quotaio_meta.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libquota_a-quotaio_rpc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libquota_a-quotaio_tree.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libquota_a-quotaio_v1.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libquota_a-quotaio_v2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libquota_a-quotaio_xfs.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libquota_a-quotasys.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librpcclient_a-rquota.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librpcclient_a-rquota_client.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librpcclient_a-rquota_clnt.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pot.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quot.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quota.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quota_nld-quota_nld.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotacheck-quotacheck.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotacheck-quotacheck_v1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotacheck-quotacheck_v2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotacheck-quotaops.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotaio.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotaio_generic.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotaio_meta.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotaio_rpc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotaio_tree.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotaio_v1.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotaio_v2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotaio_xfs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotaon.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotaon_xfs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotaops.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotastats.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotasync.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotasys.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/repquota.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpc_rquotad-rquota_server.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpc_rquotad-rquota_svc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpc_rquotad-svc_socket.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rquota_server.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rquota_svc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setquota.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svc_socket.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/warnquota.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xqmstats.Po@am__quote@ @@ -977,182 +960,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` - -libquota_a-quotaio.o: quotaio.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-quotaio.o -MD -MP -MF $(DEPDIR)/libquota_a-quotaio.Tpo -c -o libquota_a-quotaio.o `test -f 'quotaio.c' || echo '$(srcdir)/'`quotaio.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-quotaio.Tpo $(DEPDIR)/libquota_a-quotaio.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='quotaio.c' object='libquota_a-quotaio.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-quotaio.o `test -f 'quotaio.c' || echo '$(srcdir)/'`quotaio.c - -libquota_a-quotaio.obj: quotaio.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-quotaio.obj -MD -MP -MF $(DEPDIR)/libquota_a-quotaio.Tpo -c -o libquota_a-quotaio.obj `if test -f 'quotaio.c'; then $(CYGPATH_W) 'quotaio.c'; else $(CYGPATH_W) '$(srcdir)/quotaio.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-quotaio.Tpo $(DEPDIR)/libquota_a-quotaio.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='quotaio.c' object='libquota_a-quotaio.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-quotaio.obj `if test -f 'quotaio.c'; then $(CYGPATH_W) 'quotaio.c'; else $(CYGPATH_W) '$(srcdir)/quotaio.c'; fi` - -libquota_a-quotaio_v1.o: quotaio_v1.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-quotaio_v1.o -MD -MP -MF $(DEPDIR)/libquota_a-quotaio_v1.Tpo -c -o libquota_a-quotaio_v1.o `test -f 'quotaio_v1.c' || echo '$(srcdir)/'`quotaio_v1.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-quotaio_v1.Tpo $(DEPDIR)/libquota_a-quotaio_v1.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='quotaio_v1.c' object='libquota_a-quotaio_v1.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-quotaio_v1.o `test -f 'quotaio_v1.c' || echo '$(srcdir)/'`quotaio_v1.c - -libquota_a-quotaio_v1.obj: quotaio_v1.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-quotaio_v1.obj -MD -MP -MF $(DEPDIR)/libquota_a-quotaio_v1.Tpo -c -o libquota_a-quotaio_v1.obj `if test -f 'quotaio_v1.c'; then $(CYGPATH_W) 'quotaio_v1.c'; else $(CYGPATH_W) '$(srcdir)/quotaio_v1.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-quotaio_v1.Tpo $(DEPDIR)/libquota_a-quotaio_v1.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='quotaio_v1.c' object='libquota_a-quotaio_v1.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-quotaio_v1.obj `if test -f 'quotaio_v1.c'; then $(CYGPATH_W) 'quotaio_v1.c'; else $(CYGPATH_W) '$(srcdir)/quotaio_v1.c'; fi` - -libquota_a-quotaio_v2.o: quotaio_v2.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-quotaio_v2.o -MD -MP -MF $(DEPDIR)/libquota_a-quotaio_v2.Tpo -c -o libquota_a-quotaio_v2.o `test -f 'quotaio_v2.c' || echo '$(srcdir)/'`quotaio_v2.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-quotaio_v2.Tpo $(DEPDIR)/libquota_a-quotaio_v2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='quotaio_v2.c' object='libquota_a-quotaio_v2.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-quotaio_v2.o `test -f 'quotaio_v2.c' || echo '$(srcdir)/'`quotaio_v2.c - -libquota_a-quotaio_v2.obj: quotaio_v2.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-quotaio_v2.obj -MD -MP -MF $(DEPDIR)/libquota_a-quotaio_v2.Tpo -c -o libquota_a-quotaio_v2.obj `if test -f 'quotaio_v2.c'; then $(CYGPATH_W) 'quotaio_v2.c'; else $(CYGPATH_W) '$(srcdir)/quotaio_v2.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-quotaio_v2.Tpo $(DEPDIR)/libquota_a-quotaio_v2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='quotaio_v2.c' object='libquota_a-quotaio_v2.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-quotaio_v2.obj `if test -f 'quotaio_v2.c'; then $(CYGPATH_W) 'quotaio_v2.c'; else $(CYGPATH_W) '$(srcdir)/quotaio_v2.c'; fi` - -libquota_a-quotaio_tree.o: quotaio_tree.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-quotaio_tree.o -MD -MP -MF $(DEPDIR)/libquota_a-quotaio_tree.Tpo -c -o libquota_a-quotaio_tree.o `test -f 'quotaio_tree.c' || echo '$(srcdir)/'`quotaio_tree.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-quotaio_tree.Tpo $(DEPDIR)/libquota_a-quotaio_tree.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='quotaio_tree.c' object='libquota_a-quotaio_tree.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-quotaio_tree.o `test -f 'quotaio_tree.c' || echo '$(srcdir)/'`quotaio_tree.c - -libquota_a-quotaio_tree.obj: quotaio_tree.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-quotaio_tree.obj -MD -MP -MF $(DEPDIR)/libquota_a-quotaio_tree.Tpo -c -o libquota_a-quotaio_tree.obj `if test -f 'quotaio_tree.c'; then $(CYGPATH_W) 'quotaio_tree.c'; else $(CYGPATH_W) '$(srcdir)/quotaio_tree.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-quotaio_tree.Tpo $(DEPDIR)/libquota_a-quotaio_tree.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='quotaio_tree.c' object='libquota_a-quotaio_tree.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-quotaio_tree.obj `if test -f 'quotaio_tree.c'; then $(CYGPATH_W) 'quotaio_tree.c'; else $(CYGPATH_W) '$(srcdir)/quotaio_tree.c'; fi` - -libquota_a-quotaio_rpc.o: quotaio_rpc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-quotaio_rpc.o -MD -MP -MF $(DEPDIR)/libquota_a-quotaio_rpc.Tpo -c -o libquota_a-quotaio_rpc.o `test -f 'quotaio_rpc.c' || echo '$(srcdir)/'`quotaio_rpc.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-quotaio_rpc.Tpo $(DEPDIR)/libquota_a-quotaio_rpc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='quotaio_rpc.c' object='libquota_a-quotaio_rpc.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-quotaio_rpc.o `test -f 'quotaio_rpc.c' || echo '$(srcdir)/'`quotaio_rpc.c - -libquota_a-quotaio_rpc.obj: quotaio_rpc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-quotaio_rpc.obj -MD -MP -MF $(DEPDIR)/libquota_a-quotaio_rpc.Tpo -c -o libquota_a-quotaio_rpc.obj `if test -f 'quotaio_rpc.c'; then $(CYGPATH_W) 'quotaio_rpc.c'; else $(CYGPATH_W) '$(srcdir)/quotaio_rpc.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-quotaio_rpc.Tpo $(DEPDIR)/libquota_a-quotaio_rpc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='quotaio_rpc.c' object='libquota_a-quotaio_rpc.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-quotaio_rpc.obj `if test -f 'quotaio_rpc.c'; then $(CYGPATH_W) 'quotaio_rpc.c'; else $(CYGPATH_W) '$(srcdir)/quotaio_rpc.c'; fi` - -libquota_a-quotaio_xfs.o: quotaio_xfs.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-quotaio_xfs.o -MD -MP -MF $(DEPDIR)/libquota_a-quotaio_xfs.Tpo -c -o libquota_a-quotaio_xfs.o `test -f 'quotaio_xfs.c' || echo '$(srcdir)/'`quotaio_xfs.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-quotaio_xfs.Tpo $(DEPDIR)/libquota_a-quotaio_xfs.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='quotaio_xfs.c' object='libquota_a-quotaio_xfs.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-quotaio_xfs.o `test -f 'quotaio_xfs.c' || echo '$(srcdir)/'`quotaio_xfs.c - -libquota_a-quotaio_xfs.obj: quotaio_xfs.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-quotaio_xfs.obj -MD -MP -MF $(DEPDIR)/libquota_a-quotaio_xfs.Tpo -c -o libquota_a-quotaio_xfs.obj `if test -f 'quotaio_xfs.c'; then $(CYGPATH_W) 'quotaio_xfs.c'; else $(CYGPATH_W) '$(srcdir)/quotaio_xfs.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-quotaio_xfs.Tpo $(DEPDIR)/libquota_a-quotaio_xfs.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='quotaio_xfs.c' object='libquota_a-quotaio_xfs.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-quotaio_xfs.obj `if test -f 'quotaio_xfs.c'; then $(CYGPATH_W) 'quotaio_xfs.c'; else $(CYGPATH_W) '$(srcdir)/quotaio_xfs.c'; fi` - -libquota_a-quotaio_meta.o: quotaio_meta.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-quotaio_meta.o -MD -MP -MF $(DEPDIR)/libquota_a-quotaio_meta.Tpo -c -o libquota_a-quotaio_meta.o `test -f 'quotaio_meta.c' || echo '$(srcdir)/'`quotaio_meta.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-quotaio_meta.Tpo $(DEPDIR)/libquota_a-quotaio_meta.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='quotaio_meta.c' object='libquota_a-quotaio_meta.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-quotaio_meta.o `test -f 'quotaio_meta.c' || echo '$(srcdir)/'`quotaio_meta.c - -libquota_a-quotaio_meta.obj: quotaio_meta.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-quotaio_meta.obj -MD -MP -MF $(DEPDIR)/libquota_a-quotaio_meta.Tpo -c -o libquota_a-quotaio_meta.obj `if test -f 'quotaio_meta.c'; then $(CYGPATH_W) 'quotaio_meta.c'; else $(CYGPATH_W) '$(srcdir)/quotaio_meta.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-quotaio_meta.Tpo $(DEPDIR)/libquota_a-quotaio_meta.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='quotaio_meta.c' object='libquota_a-quotaio_meta.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-quotaio_meta.obj `if test -f 'quotaio_meta.c'; then $(CYGPATH_W) 'quotaio_meta.c'; else $(CYGPATH_W) '$(srcdir)/quotaio_meta.c'; fi` - -libquota_a-quotaio_generic.o: quotaio_generic.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-quotaio_generic.o -MD -MP -MF $(DEPDIR)/libquota_a-quotaio_generic.Tpo -c -o libquota_a-quotaio_generic.o `test -f 'quotaio_generic.c' || echo '$(srcdir)/'`quotaio_generic.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-quotaio_generic.Tpo $(DEPDIR)/libquota_a-quotaio_generic.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='quotaio_generic.c' object='libquota_a-quotaio_generic.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-quotaio_generic.o `test -f 'quotaio_generic.c' || echo '$(srcdir)/'`quotaio_generic.c - -libquota_a-quotaio_generic.obj: quotaio_generic.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-quotaio_generic.obj -MD -MP -MF $(DEPDIR)/libquota_a-quotaio_generic.Tpo -c -o libquota_a-quotaio_generic.obj `if test -f 'quotaio_generic.c'; then $(CYGPATH_W) 'quotaio_generic.c'; else $(CYGPATH_W) '$(srcdir)/quotaio_generic.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-quotaio_generic.Tpo $(DEPDIR)/libquota_a-quotaio_generic.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='quotaio_generic.c' object='libquota_a-quotaio_generic.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-quotaio_generic.obj `if test -f 'quotaio_generic.c'; then $(CYGPATH_W) 'quotaio_generic.c'; else $(CYGPATH_W) '$(srcdir)/quotaio_generic.c'; fi` - -libquota_a-bylabel.o: bylabel.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-bylabel.o -MD -MP -MF $(DEPDIR)/libquota_a-bylabel.Tpo -c -o libquota_a-bylabel.o `test -f 'bylabel.c' || echo '$(srcdir)/'`bylabel.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-bylabel.Tpo $(DEPDIR)/libquota_a-bylabel.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='bylabel.c' object='libquota_a-bylabel.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-bylabel.o `test -f 'bylabel.c' || echo '$(srcdir)/'`bylabel.c - -libquota_a-bylabel.obj: bylabel.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-bylabel.obj -MD -MP -MF $(DEPDIR)/libquota_a-bylabel.Tpo -c -o libquota_a-bylabel.obj `if test -f 'bylabel.c'; then $(CYGPATH_W) 'bylabel.c'; else $(CYGPATH_W) '$(srcdir)/bylabel.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-bylabel.Tpo $(DEPDIR)/libquota_a-bylabel.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='bylabel.c' object='libquota_a-bylabel.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-bylabel.obj `if test -f 'bylabel.c'; then $(CYGPATH_W) 'bylabel.c'; else $(CYGPATH_W) '$(srcdir)/bylabel.c'; fi` - -libquota_a-common.o: common.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-common.o -MD -MP -MF $(DEPDIR)/libquota_a-common.Tpo -c -o libquota_a-common.o `test -f 'common.c' || echo '$(srcdir)/'`common.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-common.Tpo $(DEPDIR)/libquota_a-common.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common.c' object='libquota_a-common.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-common.o `test -f 'common.c' || echo '$(srcdir)/'`common.c - -libquota_a-common.obj: common.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-common.obj -MD -MP -MF $(DEPDIR)/libquota_a-common.Tpo -c -o libquota_a-common.obj `if test -f 'common.c'; then $(CYGPATH_W) 'common.c'; else $(CYGPATH_W) '$(srcdir)/common.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-common.Tpo $(DEPDIR)/libquota_a-common.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common.c' object='libquota_a-common.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-common.obj `if test -f 'common.c'; then $(CYGPATH_W) 'common.c'; else $(CYGPATH_W) '$(srcdir)/common.c'; fi` - -libquota_a-quotasys.o: quotasys.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-quotasys.o -MD -MP -MF $(DEPDIR)/libquota_a-quotasys.Tpo -c -o libquota_a-quotasys.o `test -f 'quotasys.c' || echo '$(srcdir)/'`quotasys.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-quotasys.Tpo $(DEPDIR)/libquota_a-quotasys.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='quotasys.c' object='libquota_a-quotasys.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-quotasys.o `test -f 'quotasys.c' || echo '$(srcdir)/'`quotasys.c - -libquota_a-quotasys.obj: quotasys.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-quotasys.obj -MD -MP -MF $(DEPDIR)/libquota_a-quotasys.Tpo -c -o libquota_a-quotasys.obj `if test -f 'quotasys.c'; then $(CYGPATH_W) 'quotasys.c'; else $(CYGPATH_W) '$(srcdir)/quotasys.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-quotasys.Tpo $(DEPDIR)/libquota_a-quotasys.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='quotasys.c' object='libquota_a-quotasys.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-quotasys.obj `if test -f 'quotasys.c'; then $(CYGPATH_W) 'quotasys.c'; else $(CYGPATH_W) '$(srcdir)/quotasys.c'; fi` - -libquota_a-pot.o: pot.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-pot.o -MD -MP -MF $(DEPDIR)/libquota_a-pot.Tpo -c -o libquota_a-pot.o `test -f 'pot.c' || echo '$(srcdir)/'`pot.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-pot.Tpo $(DEPDIR)/libquota_a-pot.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pot.c' object='libquota_a-pot.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-pot.o `test -f 'pot.c' || echo '$(srcdir)/'`pot.c - -libquota_a-pot.obj: pot.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -MT libquota_a-pot.obj -MD -MP -MF $(DEPDIR)/libquota_a-pot.Tpo -c -o libquota_a-pot.obj `if test -f 'pot.c'; then $(CYGPATH_W) 'pot.c'; else $(CYGPATH_W) '$(srcdir)/pot.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libquota_a-pot.Tpo $(DEPDIR)/libquota_a-pot.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pot.c' object='libquota_a-pot.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libquota_a_CFLAGS) $(CFLAGS) -c -o libquota_a-pot.obj `if test -f 'pot.c'; then $(CYGPATH_W) 'pot.c'; else $(CYGPATH_W) '$(srcdir)/pot.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` librpcclient_a-rquota.o: rquota.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(librpcclient_a_CFLAGS) $(CFLAGS) -MT librpcclient_a-rquota.o -MD -MP -MF $(DEPDIR)/librpcclient_a-rquota.Tpo -c -o librpcclient_a-rquota.o `test -f 'rquota.c' || echo '$(srcdir)/'`rquota.c @@ -1265,48 +1080,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='quotaops.c' object='quotacheck-quotaops.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(quotacheck_CFLAGS) $(CFLAGS) -c -o quotacheck-quotaops.obj `if test -f 'quotaops.c'; then $(CYGPATH_W) 'quotaops.c'; else $(CYGPATH_W) '$(srcdir)/quotaops.c'; fi` - -rpc_rquotad-rquota_server.o: rquota_server.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpc_rquotad_CFLAGS) $(CFLAGS) -MT rpc_rquotad-rquota_server.o -MD -MP -MF $(DEPDIR)/rpc_rquotad-rquota_server.Tpo -c -o rpc_rquotad-rquota_server.o `test -f 'rquota_server.c' || echo '$(srcdir)/'`rquota_server.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rpc_rquotad-rquota_server.Tpo $(DEPDIR)/rpc_rquotad-rquota_server.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rquota_server.c' object='rpc_rquotad-rquota_server.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpc_rquotad_CFLAGS) $(CFLAGS) -c -o rpc_rquotad-rquota_server.o `test -f 'rquota_server.c' || echo '$(srcdir)/'`rquota_server.c - -rpc_rquotad-rquota_server.obj: rquota_server.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpc_rquotad_CFLAGS) $(CFLAGS) -MT rpc_rquotad-rquota_server.obj -MD -MP -MF $(DEPDIR)/rpc_rquotad-rquota_server.Tpo -c -o rpc_rquotad-rquota_server.obj `if test -f 'rquota_server.c'; then $(CYGPATH_W) 'rquota_server.c'; else $(CYGPATH_W) '$(srcdir)/rquota_server.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rpc_rquotad-rquota_server.Tpo $(DEPDIR)/rpc_rquotad-rquota_server.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rquota_server.c' object='rpc_rquotad-rquota_server.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpc_rquotad_CFLAGS) $(CFLAGS) -c -o rpc_rquotad-rquota_server.obj `if test -f 'rquota_server.c'; then $(CYGPATH_W) 'rquota_server.c'; else $(CYGPATH_W) '$(srcdir)/rquota_server.c'; fi` - -rpc_rquotad-rquota_svc.o: rquota_svc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpc_rquotad_CFLAGS) $(CFLAGS) -MT rpc_rquotad-rquota_svc.o -MD -MP -MF $(DEPDIR)/rpc_rquotad-rquota_svc.Tpo -c -o rpc_rquotad-rquota_svc.o `test -f 'rquota_svc.c' || echo '$(srcdir)/'`rquota_svc.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rpc_rquotad-rquota_svc.Tpo $(DEPDIR)/rpc_rquotad-rquota_svc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rquota_svc.c' object='rpc_rquotad-rquota_svc.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpc_rquotad_CFLAGS) $(CFLAGS) -c -o rpc_rquotad-rquota_svc.o `test -f 'rquota_svc.c' || echo '$(srcdir)/'`rquota_svc.c - -rpc_rquotad-rquota_svc.obj: rquota_svc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpc_rquotad_CFLAGS) $(CFLAGS) -MT rpc_rquotad-rquota_svc.obj -MD -MP -MF $(DEPDIR)/rpc_rquotad-rquota_svc.Tpo -c -o rpc_rquotad-rquota_svc.obj `if test -f 'rquota_svc.c'; then $(CYGPATH_W) 'rquota_svc.c'; else $(CYGPATH_W) '$(srcdir)/rquota_svc.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rpc_rquotad-rquota_svc.Tpo $(DEPDIR)/rpc_rquotad-rquota_svc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rquota_svc.c' object='rpc_rquotad-rquota_svc.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpc_rquotad_CFLAGS) $(CFLAGS) -c -o rpc_rquotad-rquota_svc.obj `if test -f 'rquota_svc.c'; then $(CYGPATH_W) 'rquota_svc.c'; else $(CYGPATH_W) '$(srcdir)/rquota_svc.c'; fi` - -rpc_rquotad-svc_socket.o: svc_socket.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpc_rquotad_CFLAGS) $(CFLAGS) -MT rpc_rquotad-svc_socket.o -MD -MP -MF $(DEPDIR)/rpc_rquotad-svc_socket.Tpo -c -o rpc_rquotad-svc_socket.o `test -f 'svc_socket.c' || echo '$(srcdir)/'`svc_socket.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rpc_rquotad-svc_socket.Tpo $(DEPDIR)/rpc_rquotad-svc_socket.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='svc_socket.c' object='rpc_rquotad-svc_socket.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpc_rquotad_CFLAGS) $(CFLAGS) -c -o rpc_rquotad-svc_socket.o `test -f 'svc_socket.c' || echo '$(srcdir)/'`svc_socket.c - -rpc_rquotad-svc_socket.obj: svc_socket.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpc_rquotad_CFLAGS) $(CFLAGS) -MT rpc_rquotad-svc_socket.obj -MD -MP -MF $(DEPDIR)/rpc_rquotad-svc_socket.Tpo -c -o rpc_rquotad-svc_socket.obj `if test -f 'svc_socket.c'; then $(CYGPATH_W) 'svc_socket.c'; else $(CYGPATH_W) '$(srcdir)/svc_socket.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rpc_rquotad-svc_socket.Tpo $(DEPDIR)/rpc_rquotad-svc_socket.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='svc_socket.c' object='rpc_rquotad-svc_socket.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rpc_rquotad_CFLAGS) $(CFLAGS) -c -o rpc_rquotad-svc_socket.obj `if test -f 'svc_socket.c'; then $(CYGPATH_W) 'svc_socket.c'; else $(CYGPATH_W) '$(srcdir)/svc_socket.c'; fi` install-man1: $(man_MANS) @$(NORMAL_INSTALL) @list1=''; \ @@ -1714,7 +1487,7 @@ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 @@ -1728,11 +1501,17 @@ $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -1750,7 +1529,7 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -1760,22 +1539,23 @@ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -1978,6 +1758,8 @@ uninstall-man5 uninstall-man8 uninstall-rpcsvcDATA \ uninstall-sbinPROGRAMS uninstall-sysconfDATA +.PRECIOUS: Makefile + # ------------------ # Rpcgen conversions diff -Nru quota-4.04/missing quota-4.05/missing --- quota-4.04/missing 2017-09-05 13:55:57.000000000 +0000 +++ quota-4.05/missing 2019-03-29 10:50:35.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) @@ -210,6 +210,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru quota-4.04/mkinstalldirs quota-4.05/mkinstalldirs --- quota-4.04/mkinstalldirs 2017-09-05 13:55:57.000000000 +0000 +++ quota-4.05/mkinstalldirs 2019-03-29 10:50:35.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy -scriptversion=2009-04-28.21; # UTC +scriptversion=2016-01-11.22; # UTC # Original author: Noah Friedman # Created: 1993-05-16 @@ -157,6 +157,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru quota-4.04/mntopt.h quota-4.05/mntopt.h --- quota-4.04/mntopt.h 2016-03-30 08:15:09.000000000 +0000 +++ quota-4.05/mntopt.h 2018-05-09 14:50:25.000000000 +0000 @@ -7,6 +7,7 @@ #define MNTTYPE_EXT2 "ext2" /* 2nd Extended file system */ #define MNTTYPE_EXT3 "ext3" /* ext2 + journaling */ #define MNTTYPE_EXT4 "ext4" /* ext4 filesystem */ +#define MNTTYPE_F2FS "f2fs" /* f2fs filesystem */ #define MNTTYPE_NEXT3 "next3" /* next3 filesystem */ #define MNTTYPE_EXT4DEV "ext4dev"/* ext4dev filesystem */ #define MNTTYPE_MINIX "minix" /* MINIX file system */ @@ -14,6 +15,7 @@ #define MNTTYPE_UDF "udf" /* OSTA UDF file system */ #define MNTTYPE_REISER "reiserfs" /* Reiser file system */ #define MNTTYPE_XFS "xfs" /* SGI XFS file system */ +#define MNTTYPE_EXFS "exfs" /* HPE EXFS file system */ #define MNTTYPE_AUTOFS "autofs" /* Automount mountpoint */ #define MNTTYPE_JFS "jfs" /* JFS file system */ #define MNTTYPE_NFS4 "nfs4" /* NFSv4 filesystem */ Binary files /tmp/tmpeemP7p/v7BeTqs21S/quota-4.04/po/cs.gmo and /tmp/tmpeemP7p/VdYLEKvDrH/quota-4.05/po/cs.gmo differ diff -Nru quota-4.04/po/cs.po quota-4.05/po/cs.po --- quota-4.04/po/cs.po 2017-09-05 14:53:15.000000000 +0000 +++ quota-4.05/po/cs.po 2019-03-29 10:53:18.000000000 +0000 @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: quota-tools 4.01\n" "Report-Msgid-Bugs-To: jack@suse.cz\n" -"POT-Creation-Date: 2017-09-05 16:53+0200\n" +"POT-Creation-Date: 2019-03-29 11:53+0100\n" "PO-Revision-Date: 2012-09-10 16:55+0200\n" "Last-Translator: Petr Pisar \n" "Language-Team: Czech \n" @@ -25,12 +25,12 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: bylabel.c:253 +#: bylabel.c:274 #, c-format msgid "Found an invalid UUID: %s\n" msgstr "Nalezeno neplatné UUID: %s\n" -#: bylabel.c:273 +#: bylabel.c:294 #, c-format msgid "Error checking device name: %s\n" msgstr "Chyba při kontrole názvu zařízení: %s\n" @@ -64,8 +64,8 @@ "-V, --version zobrazí informace o verzi a skončí\n" "\n" -#: convertquota.c:48 warnquota.c:1028 quotacheck.c:314 repquota.c:68 -#: common.c:126 +#: convertquota.c:48 warnquota.c:1046 quotacheck.c:314 repquota.c:73 +#: common.c:127 #, c-format msgid "Bugs to %s\n" msgstr "Chyby hlaste na <%s>\n" @@ -74,8 +74,8 @@ msgid "You have to specify source and target format of conversion.\n" msgstr "Musíte zadat zdrojový a cílový formát převodu.\n" -#: convertquota.c:112 quotacheck.c:400 quotasync.c:88 repquota.c:154 -#: quotaon.c:143 setquota.c:264 +#: convertquota.c:112 quotacheck.c:400 quotasync.c:88 repquota.c:163 +#: quotaon.c:113 setquota.c:264 msgid "Bad number of arguments.\n" msgstr "Špatný počet argumentů.\n" @@ -112,7 +112,7 @@ msgid "Cannot get name of new quotafile.\n" msgstr "Nelze získat název nového souboru s kvótami.\n" -#: convertquota.c:302 quotacheck.c:764 +#: convertquota.c:302 quotacheck.c:765 #, c-format msgid "Cannot rename new quotafile %s to name %s: %s\n" msgstr "Nový kvótový soubor %s nelze přejmenovat na %s: %s\n" @@ -132,7 +132,7 @@ msgid "Cannot open old quota file on %s: %s\n" msgstr "Nelze otevřít starý kvótový soubor na %s: %s\n" -#: convertquota.c:380 +#: convertquota.c:381 msgid "Unknown action should be performed.\n" msgstr "Provedena by měla být neznámá akce.\n" @@ -267,37 +267,44 @@ msgid "Could not setup ldap connection.\n" msgstr "Spojení LDAP nelze nastavit.\n" -#: warnquota.c:422 +#: warnquota.c:417 +#, c-format +msgid "" +"Could not format LDAP search filter for %s user and %s search attribute due " +"to excessive length.\n" +msgstr "" + +#: warnquota.c:428 #, c-format msgid "Error with %s.\n" msgstr "Chyba u %s.\n" -#: warnquota.c:423 +#: warnquota.c:429 #, c-format msgid "ldap_search_ext_s() failed: %s\n" msgstr "" -#: warnquota.c:429 +#: warnquota.c:435 #, fuzzy, c-format msgid "Multiple entries found for client %s (%d).\n" msgstr "Nalezeno více záznamů pro klienta %s (%d). E-mail nebude odeslán.\n" -#: warnquota.c:433 +#: warnquota.c:439 #, fuzzy, c-format msgid "Entry not found for client %s.\n" msgstr "Záznam pro klienta %s nenalezen. E-mail nebude odeslán.\n" -#: warnquota.c:443 +#: warnquota.c:449 #, c-format msgid "Could not get values for %s.\n" msgstr "Hodnoty pro %s nebylo možné získat.\n" -#: warnquota.c:489 +#: warnquota.c:495 #, c-format msgid "Administrator for a group %s not found. Cancelling mail.\n" msgstr "Správce skupiny %s nenalezen. E-mail zrušen.\n" -#: warnquota.c:541 +#: warnquota.c:547 #, c-format msgid "" "\n" @@ -306,23 +313,23 @@ "\n" " Limity bloků Limity souborů\n" -#: warnquota.c:542 +#: warnquota.c:548 #, c-format msgid "" "Filesystem used soft hard grace used soft hard grace\n" msgstr "" "Souborový systém užito měkký pevný odklad užito měkký pevný odklad\n" -#: warnquota.c:582 +#: warnquota.c:588 #, c-format msgid "Cannot wait for mailer: %s\n" msgstr "Nelze se dočkat dokončení odeslání pošty: %s\n" -#: warnquota.c:584 +#: warnquota.c:590 msgid "Warning: Mailer exitted abnormally.\n" msgstr "Pozor: Odesílání pošty skončilo mimořádně.\n" -#: warnquota.c:641 +#: warnquota.c:647 #, c-format msgid "" "Cannot open %s: %s\n" @@ -331,17 +338,17 @@ "%s nelze otevřít: %s\n" "Použijí se názvy zařízení.\n" -#: warnquota.c:664 +#: warnquota.c:670 #, c-format msgid "Cannot parse line %d in quotatab (missing ':')\n" msgstr "V souboru quotatab nelze rozebrat řádek %d (chybí „:“)\n" -#: warnquota.c:678 +#: warnquota.c:684 #, c-format msgid "Cannot stat device %s (maybe typo in quotatab)\n" msgstr "O zařízení %s nelze získat údaje (možná překlep v souboru quotatab)\n" -#: warnquota.c:698 +#: warnquota.c:704 #, c-format msgid "" "Incorrect format string for variable %s.\n" @@ -350,36 +357,41 @@ "Nesprávný formátovací řetězec proměnné %s.\n" "Nerozpoznaný výraz %%%c.\n" -#: warnquota.c:749 +#: warnquota.c:755 #, c-format msgid "Cannot open %s: %s\n" msgstr "%s nelze otevřít: %s\n" -#: warnquota.c:769 +#: warnquota.c:775 #, c-format msgid "Line %d too long. Truncating.\n" msgstr "Řádek %d je příliš dlouhý. Bude zkrácen.\n" -#: warnquota.c:835 +#: warnquota.c:841 #, c-format msgid "Cannot parse time at CC_BEFORE variable (line %d).\n" msgstr "Čas v proměnné CC_BEFORE nelze rozebrat (řádek %d).\n" -#: warnquota.c:885 +#: warnquota.c:891 #, c-format msgid "Error in config file (line %d), ignoring\n" msgstr "Chyba v konfiguračním souboru (řádek %d), ignoruje se.\n" -#: warnquota.c:888 +#: warnquota.c:894 #, c-format msgid "Possible error in config file (line %d), ignoring\n" msgstr "Možná chyba v konfiguračním souboru (řádek %d), ignoruje se.\n" -#: warnquota.c:891 +#: warnquota.c:897 msgid "Unterminated last line, ignoring\n" msgstr "Neukončený poslední řádek, ignoruje se.\n" -#: warnquota.c:897 +#: warnquota.c:905 +#, c-format +msgid "Could not format LDAP URI because it's longer than %d bytes.\n" +msgstr "" + +#: warnquota.c:910 #, c-format msgid "" "LDAP library version >= 2.3 detected. Please use LDAP_URI instead of " @@ -390,28 +402,29 @@ "názvu stroje a portu.\n" "Vytvořené URI: %s\n" -#: warnquota.c:919 +#: warnquota.c:932 #, c-format msgid "Cannot open file with group administrators: %s\n" msgstr "Soubor se správci skupin nelze otevřít: %s\n" -#: warnquota.c:934 +#: warnquota.c:947 #, c-format msgid "Parse error at line %d. Cannot find end of group name.\n" msgstr "Chyba při rozboru řádku %d. Nelze nalézt konec názvu skupiny.\n" -#: warnquota.c:943 +#: warnquota.c:956 #, c-format msgid "Parse error at line %d. Cannot find administrators name.\n" msgstr "Chyba při rozboru řádku %d. Nelze nalézt jméno správce.\n" -#: warnquota.c:953 +#: warnquota.c:966 #, c-format msgid "" "Parse error at line %d. Trailing characters after administrators name.\n" msgstr "Chyba při rozboru řádku %d. Přebytečné znaky za jménem správce.\n" -#: warnquota.c:1016 +#: warnquota.c:1029 +#, fuzzy msgid "" "Usage:\n" " warnquota [-ugsid] [-F quotaformat] [-c configfile] [-q quotatabfile] [-a " @@ -419,8 +432,16 @@ "\n" "-u, --user warn users\n" "-g, --group warn groups\n" -"-s, --human-readable send information in more human friendly " -"units\n" +"-s, --human-readable[=units] display numbers in human friendly units " +"(MB,\n" +" GB, ...). Units can be also specified\n" +" explicitely by an optional argument in " +"format\n" +" [kgt],[kgt] where the first character " +"specifies\n" +" space units and the second character " +"specifies\n" +" inode units\n" "-i, --no-autofs avoid autofs mountpoints\n" "-d, --no-details do not send quota information itself\n" "-F, --format=formatname use quotafiles of specific format\n" @@ -450,7 +471,12 @@ "-v, --version zobrazí údaje o verzi a skončí\n" "\n" -#: warnquota.c:1097 +#: warnquota.c:1102 repquota.c:134 quota.c:343 +#, c-format +msgid "Bad output format units for human readable output: %s\n" +msgstr "" + +#: warnquota.c:1119 #, c-format msgid "Cannot get host name: %s\n" msgstr "Nelze získat název stroje: %s\n" @@ -598,21 +624,21 @@ "Bylo by lepší, kdybyste nejprve spustili fsck!\n" "Končí se…\n" -#: quotacheck.c:550 +#: quotacheck.c:551 #, c-format msgid "pushd %s/%s\n" msgstr "pushd %s/%s\n" -#: quotacheck.c:566 +#: quotacheck.c:567 #, c-format msgid "\tAdding %s size %lld ino %d links %d uid %u gid %u\n" msgstr "\tPřidává se %s: velikost %lld iuzel %d odkazů %d, UID %u GID %u\n" -#: quotacheck.c:576 +#: quotacheck.c:577 msgid "Scanning stored directories from directory stack\n" msgstr "Prohledávají se adresáře uložené na zásobníku adresářů\n" -#: quotacheck.c:580 +#: quotacheck.c:581 #, c-format msgid "" "popd %s\n" @@ -621,19 +647,19 @@ "popd %s\n" "Vstupuje se do adresáře %s\n" -#: quotacheck.c:592 +#: quotacheck.c:593 #, c-format msgid "Leaving %s\n" msgstr "Opouští se %s\n" # FIXME: I18n first argument -#: quotacheck.c:632 +#: quotacheck.c:633 #, c-format msgid "Going to check %s quota file of %s\n" msgstr "Bude se kontrolovat %s kvótový soubor systému %s\n" # FIXME: I18n first argument -#: quotacheck.c:638 +#: quotacheck.c:639 #, c-format msgid "" "Quota for %ss is enabled on mountpoint %s so quotacheck might damage the " @@ -642,16 +668,16 @@ "Kvóta pro %s je na systému %s zapnuta,\n" "takže quotacheck by mohl daný soubor poškodit.\n" -#: quotacheck.c:639 quotacheck.c:957 +#: quotacheck.c:640 quotacheck.c:967 msgid "Should I continue?" msgstr "Má se pokračovat?" -#: quotacheck.c:640 quotacheck.c:958 +#: quotacheck.c:641 quotacheck.c:968 #, c-format msgid "As you wish... Canceling check of this file.\n" msgstr "Jak si přejete. Kontrola tohoto souboru se ruší.\n" -#: quotacheck.c:645 +#: quotacheck.c:646 #, c-format msgid "" "Quota for %ss is enabled on mountpoint %s so quotacheck might damage the " @@ -662,129 +688,129 @@ "takže quotacheck by mohl daný soubor poškodit. Prosím, kvóty vypněte,\n" "nebo kontrolu vynuťte přepínačem „-f“.\n" -#: quotacheck.c:652 +#: quotacheck.c:653 #, c-format msgid "Error while syncing quotas on %s: %s\n" msgstr "Chyba při synchronizaci kvót na %s: %s\n" -#: quotacheck.c:657 +#: quotacheck.c:658 #, c-format msgid "Cannot get quotafile name for %s\n" msgstr "Nelze získat název kvótového souboru pro %s\n" -#: quotacheck.c:662 quotaio.c:150 quotasys.c:820 +#: quotacheck.c:663 quotaio.c:151 quotasys.c:843 #, c-format msgid "Cannot open quotafile %s: %s\n" msgstr "Kvótový soubor %s nelze otevřít: %s\n" -#: quotacheck.c:702 +#: quotacheck.c:703 msgid "Renaming new files to proper names.\n" msgstr "Nové soubory se přejmenovávají na správné názvy.\n" -#: quotacheck.c:704 +#: quotacheck.c:705 #, c-format msgid "Cannot get name of old quotafile on %s.\n" msgstr "Nelze zjistit název starého kvótového souboru na %s.\n" -#: quotacheck.c:707 +#: quotacheck.c:708 msgid "Old file not found.\n" msgstr "Starý kvótový soubor nenalezen.\n" -#: quotacheck.c:710 +#: quotacheck.c:711 #, c-format msgid "Error while searching for old quota file %s: %s\n" msgstr "Chyba při hledávání starého kvótového souboru %s: %s\n" -#: quotacheck.c:719 +#: quotacheck.c:720 msgid "Old file found removed during check!\n" msgstr "Starý soubor byl během kontroly odstraněn!\n" -#: quotacheck.c:722 +#: quotacheck.c:723 #, c-format msgid "Error while opening old quota file %s: %s\n" msgstr "Chyba při otevírání starého kvótového souboru %s: %s\n" -#: quotacheck.c:728 +#: quotacheck.c:729 #, c-format msgid "EXT2_IOC_GETFLAGS failed: %s\n" msgstr "Volání EXT2_IOC_GETFLAGS selhalo: %s\n" -#: quotacheck.c:732 +#: quotacheck.c:733 #, c-format msgid "Quota file %s has IMMUTABLE flag set. Clearing.\n" msgstr "" "Kvótový soubor %s má nastaven příznak\n" "NEMĚNITELNOSTI (immutable). Příznak odebrán.\n" -#: quotacheck.c:735 +#: quotacheck.c:736 #, c-format msgid "Failed to remove IMMUTABLE flag from quota file %s: %s\n" msgstr "Odebrání příznaku NEMĚNITELNOSTI z kvótového souboru %s selhalo: %s\n" -#: quotacheck.c:744 +#: quotacheck.c:745 #, c-format msgid "Renaming old quotafile to %s~\n" msgstr "Starý kvótový soubor se přejmenovává na %s~\n" -#: quotacheck.c:750 +#: quotacheck.c:751 #, c-format msgid "Name of quota file too long. Contact %s.\n" msgstr "Název kvótového souboru je příliš dlouhý. Kontaktujte %s.\n" -#: quotacheck.c:752 +#: quotacheck.c:753 #, c-format msgid "Cannot rename old quotafile %s to %s: %s\n" msgstr "Starý kvótový soubor %s nelze přejmenovat na %s: %s\n" -#: quotacheck.c:758 +#: quotacheck.c:759 msgid "Renaming new quotafile\n" msgstr "Přejmenovává se nový kvótový soubor\n" -#: quotacheck.c:770 +#: quotacheck.c:771 #, c-format msgid "Cannot change permission of %s: %s\n" msgstr "Nelze změnit práva souboru %s: %s\n" -#: quotacheck.c:777 +#: quotacheck.c:778 #, c-format msgid "Cannot open new quota file %s: %s\n" msgstr "Nový kvótový soubor %s nelze otevřít: %s\n" -#: quotacheck.c:782 +#: quotacheck.c:783 #, c-format msgid "Warning: Cannot set EXT2 flags on %s: %s\n" msgstr "Pozor: Příznak EXT2 nelze u %s nastavit: %s\n" -#: quotacheck.c:802 +#: quotacheck.c:803 #, c-format msgid "Dumping gathered data for %ss.\n" msgstr "Zapisují se data nasbíraná pro třídu %s.\n" -#: quotacheck.c:805 +#: quotacheck.c:806 #, c-format msgid "Cannot initialize IO on xfs/gfs2 quotafile: %s\n" msgstr "Nelze inicializovat I/O na kvótovém souboru XFS/GFS2: %s\n" -#: quotacheck.c:811 +#: quotacheck.c:812 #, c-format msgid "Cannot initialize IO on new quotafile: %s\n" msgstr "Nelze inicializovat I/O na novém kvótovém souboru: %s\n" -#: quotacheck.c:838 +#: quotacheck.c:839 #, c-format msgid "Cannot finish IO on new quotafile: %s\n" msgstr "Nelze dokončit I/O na novém kvótovém souboru: %s\n" -#: quotacheck.c:841 +#: quotacheck.c:842 msgid "Data dumped.\n" msgstr "Data zapsána.\n" -#: quotacheck.c:849 +#: quotacheck.c:850 #, c-format msgid "Cannot find checked quota file for %ss on %s!\n" msgstr "Nelze najít kontrolovaný kvótový soubor pro třídu %s na %s!\n" -#: quotacheck.c:853 +#: quotacheck.c:854 #, c-format msgid "" "Cannot turn %s quotas off on %s: %s\n" @@ -793,7 +819,7 @@ "Kvóty pro třídu %s na %s nelze vypnout: %s\n" "Jádro se nedozví o změnách, které nástroj quotacheck provedl.\n" -#: quotacheck.c:866 +#: quotacheck.c:867 #, c-format msgid "" "Cannot turn %s quotas on on %s: %s\n" @@ -802,26 +828,26 @@ "Kvóty pro třídu %s na %s nelze zapnout: %s\n" "Jádro se nedozví o změnách, které nástroj quotacheck provedl.\n" -#: quotacheck.c:892 +#: quotacheck.c:893 #, c-format msgid "Substracting space used by old %s quota file.\n" msgstr "Odečítá se místo zabrané starým kvótovým souborem pro třídu %s.\n" -#: quotacheck.c:894 +#: quotacheck.c:895 #, c-format msgid "" "Old %s file name could not been determined. Usage will not be subtracted.\n" msgstr "" "Název starého souboru pro třídu %s nemohl být určen. Místo nebude odečteno.\n" -#: quotacheck.c:899 +#: quotacheck.c:900 #, c-format msgid "Cannot stat old %s quota file %s: %s. Usage will not be subtracted.\n" msgstr "" "Nebylo možné zjistit údaje o starém kvótovém souboru %2$s pro třídu %1$s:\n" "%3$s. Místo nebude odečteno.\n" -#: quotacheck.c:911 +#: quotacheck.c:912 #, c-format msgid "" "Quota structure for %s owning quota file not present! Something is really " @@ -831,22 +857,22 @@ "přítomna! Něco se opravdu pokazilo.\n" # FIXME: plural -#: quotacheck.c:916 +#: quotacheck.c:917 #, c-format msgid "Substracted %lu bytes.\n" msgstr "Odečteno %'lu bajtů.\n" -#: quotacheck.c:929 +#: quotacheck.c:931 #, c-format msgid "Cannot stat mountpoint %s: %s\n" msgstr "Nelze získat údaje o přípojném bodu %s: %s\n" -#: quotacheck.c:931 +#: quotacheck.c:933 #, c-format msgid "Mountpoint %s is not a directory?!\n" msgstr "Přípojný bod %s není adresářem?!\n" -#: quotacheck.c:956 +#: quotacheck.c:966 #, c-format msgid "" "Cannot remount filesystem mounted on %s read-only. Counted values might not " @@ -855,7 +881,7 @@ "Souborový systém připojený do %s nelze přepojit\n" "jen pro čtení. Vypočtené hodnoty nemusí být správné.\n" -#: quotacheck.c:964 +#: quotacheck.c:974 #, c-format msgid "" "Cannot remount filesystem mounted on %s read-only so counted values might " @@ -868,26 +894,26 @@ "Prosím, zastavte všechny programy zapisující do souborového systému, nebo\n" "kontrolu vynuťte přepínačem -m.\n" -#: quotacheck.c:972 +#: quotacheck.c:982 msgid "Filesystem remounted read-only\n" msgstr "Systém souborů přepojen jen pro čtení\n" -#: quotacheck.c:975 +#: quotacheck.c:985 #, c-format msgid "Scanning %s [%s] " msgstr "Prohledává se %s [%s] " -#: quotacheck.c:995 +#: quotacheck.c:1011 msgid "done\n" msgstr "hotovo\n" # FIXME: plurals -#: quotacheck.c:1004 +#: quotacheck.c:1020 #, c-format msgid "Checked %d directories and %d files\n" msgstr "Zkontrolováno %d adresářů a %d souborů\n" -#: quotacheck.c:1008 +#: quotacheck.c:1024 #, c-format msgid "" "Cannot remount filesystem %s read-write. cannot write new quota files.\n" @@ -895,27 +921,27 @@ "Systém souborů %s nelze přepojit pro zápis. Nový soubor\n" "s kvótami nelze zapsat.\n" -#: quotacheck.c:1009 +#: quotacheck.c:1025 msgid "Filesystem remounted RW.\n" msgstr "Systém souborů přepojen pro zápis.\n" -#: quotacheck.c:1052 +#: quotacheck.c:1069 #, c-format msgid "Cannot find quota option on filesystem %s with quotas!\n" msgstr "U souborového systému %s s kvótami nelze nalézt kvótový parametr!\n" -#: quotacheck.c:1058 +#: quotacheck.c:1075 #, c-format msgid "Cannot detect quota format for journalled quota on %s\n" msgstr "U žurnálované kvóty na %s nelze určit formát\n" -#: quotacheck.c:1124 +#: quotacheck.c:1141 #, c-format msgid "Cannot get system info: %s\n" msgstr "Nelze získat údaje o systému: %s\n" #  FXIME: msgid misses new lines. -#: quotacheck.c:1144 +#: quotacheck.c:1161 msgid "" "Your kernel probably supports journaled quota but you are not using it. " "Consider switching to journaled quota to avoid running quotacheck after an " @@ -925,16 +951,16 @@ "Zvažte použití žurnálovaných kvót, což umožňuje se vyhnout pouštění\n" "quotacheck po nečistém vypnutí systému.\n" -#: quotacheck.c:1158 quotasys.c:910 +#: quotacheck.c:1175 quotasys.c:933 msgid "Cannot initialize mountpoint scan.\n" msgstr "Prohledávání bodu připojení nelze inicializovat.\n" -#: quotacheck.c:1163 +#: quotacheck.c:1180 #, c-format msgid "Skipping %s [%s]\n" msgstr "Přeskakuje se %s [%s]\n" -#: quotacheck.c:1180 +#: quotacheck.c:1197 #, c-format msgid "" "Cannot guess format from filename on %s. Please specify format on " @@ -943,12 +969,12 @@ "Z názvu souboru na %s nelze uhádnout formát.\n" "Prosím, zadejte formát na příkazovém řádku.\n" -#: quotacheck.c:1185 +#: quotacheck.c:1202 #, c-format msgid "Detected quota format %s\n" msgstr "Zjištěn formát kvóty %s\n" -#: quotacheck.c:1206 +#: quotacheck.c:1223 msgid "" "Cannot find filesystem to check or filesystem not mounted with quota " "option.\n" @@ -957,7 +983,7 @@ "připojen s kvótovým parametrem.\n" # FIXME: plurals -#: quotacheck.c:1224 +#: quotacheck.c:1241 #, c-format msgid "" "Allocated %d bytes memory\n" @@ -968,57 +994,57 @@ "Uvolněno %'d bajtů\n" "Ztraceno %'d bajtů\n" -#: quot.c:81 +#: quot.c:82 #, c-format msgid "Usage: %s [-acfugvViTq] [filesystem...]\n" msgstr "Použití: %s [-acfugvViTq] [SYSTÉM_SOUBORŮ…]\n" -#: quot.c:178 +#: quot.c:180 #, c-format msgid "%s (%s):\n" msgstr "%s (%s):\n" -#: quot.c:182 quot.c:186 +#: quot.c:184 quot.c:188 #, c-format msgid "%d\t%llu\t%llu\n" msgstr "%d\t%llu\t%llu\n" -#: quot.c:195 +#: quot.c:197 #, c-format msgid "%s (%s) %ss:\n" msgstr "%s (%s) objekty třídy %s:\n" -#: quot.c:203 quot.c:205 +#: quot.c:205 quot.c:207 #, c-format msgid "%8llu " msgstr "%8llu " -#: quot.c:208 +#: quot.c:210 #, c-format msgid "%s" msgstr "%s" -#: quot.c:210 +#: quot.c:212 #, c-format msgid "%-8.8s" msgstr "%-8.8s" -#: quot.c:212 +#: quot.c:214 #, c-format msgid "#%-7d" msgstr "č%-7d" -#: quot.c:214 +#: quot.c:216 #, c-format msgid " %8llu %8llu %8llu" msgstr " %8llu %8llu %8llu" -#: quot.c:362 +#: quot.c:364 #, c-format msgid "cannot open %s: %s\n" msgstr "%s nelze otevřít: %s\n" -#: quot.c:382 +#: quot.c:384 #, c-format msgid "XFS_IOC_FSBULKSTAT ioctl failed: %s\n" msgstr "IOCTL XFS_IOC_FSBULKSTAT selhalo: %s\n" @@ -1072,21 +1098,21 @@ msgstr "synchronizace kvóty %s na %s selhala: %s\n" # kvótový soubor pro třídu %s -#: quota.h:22 +#: quota.h:23 msgid "user" msgstr "uživatel" # kvótový soubor pro třídu %s -#: quota.h:23 +#: quota.h:24 msgid "group" msgstr "skupina" -#: quota.h:24 +#: quota.h:25 msgid "project" msgstr "" # kvótový soubor pro třídu %s -#: quota.h:25 +#: quota.h:26 msgid "undefined" msgstr "neurčeno" @@ -1163,124 +1189,129 @@ msgid "Cannot connect to system DBUS: %s\n" msgstr "Nelze se připojit k systémové sběrnici D-bus: %s\n" -#: quota_nld.c:289 +#: quota_nld.c:292 #, c-format msgid "Failed to find tty of user %llu to report warning to.\n" msgstr "" "Nebylo možné nalézt TTY uživatele %llu, kam by se mělo vypsat upozornění.\n" -#: quota_nld.c:294 +#: quota_nld.c:297 #, c-format msgid "Failed to open tty %s of user %llu to report warning.\n" msgstr "" "Otevření TTY %s uživatele %llu, kam by se mělo vypsat upozornění, selhalo.\n" -#: quota_nld.c:300 +#: quota_nld.c:303 msgid "Warning" msgstr "Pozor" -#: quota_nld.c:303 +#: quota_nld.c:306 msgid "Error" msgstr "Chyba" -#: quota_nld.c:305 +#: quota_nld.c:308 msgid "Info" msgstr "Na vědomí" -#: quota_nld.c:308 +#: quota_nld.c:311 msgid "file limit reached" msgstr "limit na soubory dosažen" -#: quota_nld.c:311 +#: quota_nld.c:314 msgid "file quota exceeded too long" msgstr "kvóta na soubory překročena příliš dlouho" -#: quota_nld.c:314 +#: quota_nld.c:317 msgid "file quota exceeded" msgstr "Kvóta na soubory překročena" -#: quota_nld.c:317 +#: quota_nld.c:320 msgid "block limit reached" msgstr "limit na bloky dosažen" -#: quota_nld.c:320 +#: quota_nld.c:323 msgid "block quota exceeded too long" msgstr "kvóta na bloky překročena příliš dlouho" -#: quota_nld.c:323 +#: quota_nld.c:326 msgid "block quota exceeded" msgstr "kvóta na bloky překročena" -#: quota_nld.c:326 +#: quota_nld.c:329 msgid "got below file limit" msgstr "počet souborů klesl pod limit" -#: quota_nld.c:329 +#: quota_nld.c:332 msgid "got below file quota" msgstr "počet souborů klesl pod kvótu" -#: quota_nld.c:332 +#: quota_nld.c:335 msgid "got below block limit" msgstr "počet bloků klesl pod limit" -#: quota_nld.c:335 +#: quota_nld.c:338 msgid "got below block quota" msgstr "počet bloků klesl pod kvótu" -#: quota_nld.c:338 +#: quota_nld.c:341 msgid "unknown quota warning" msgstr "neznámé upozornění kvóty" -#: quota_nld.c:342 +#: quota_nld.c:345 #, c-format msgid "Failed to write quota message for user %llu to %s: %s\n" msgstr "Zápis zprávy o kvótě pro uživatele %llu na %s selhal: %s\n" -#: quota_nld.c:355 +#: quota_nld.c:358 msgid "Cannot create DBUS message: No enough memory.\n" msgstr "Zprávu D-bus nelze vytvořit: Nedostatek paměti.\n" -#: quota_nld.c:373 +#: quota_nld.c:376 msgid "Failed to write message to dbus: No enough memory.\n" msgstr "Zprávu nelze zapsat do D-bus: Nedostatek paměti.\n" -#: quota_nld.c:389 +#: quota_nld.c:392 #, c-format msgid "Failed to read or parse quota netlink message: %s\n" msgstr "Netlinkovou zprávu kvóty nebylo možné přečíst nebo rozebrat: %s\n" -#: quota_nld.c:400 +#: quota_nld.c:403 msgid "Undefined program name.\n" msgstr "Název programu není určen.\n" -#: quota_nld.c:405 +#: quota_nld.c:408 msgid "Not enough memory to build PID file name.\n" msgstr "Nedostatek paměti pro tvorbu názvu souboru s PID.\n" -#: quota_nld.c:424 +#: quota_nld.c:427 #, c-format msgid "Could not open PID file '%s': %s\n" msgstr "Soubor s PID „%s“ nelze otevřít: %s\n" -#: quota_nld.c:430 +#: quota_nld.c:433 #, c-format msgid "Could not write daemon's PID into '%s'.\n" msgstr "PID démona nebylo možné zapsat do „%s“.\n" -#: quota_nld.c:437 +#: quota_nld.c:440 #, c-format msgid "Could not close PID file '%s'.\n" msgstr "Soubor s PID „%s“ nebylo možné uzavřít.\n" -#: quota_nld.c:467 +#: quota_nld.c:470 msgid "Could not register PID file removal on SIGTERM.\n" msgstr "Odebrání souboru s PID nebylo možné zaregistrovat na signál SIGTERM.\n" -#: quota_nld.c:469 +#: quota_nld.c:472 #, c-format msgid "Could not store my PID %jd.\n" msgstr "Nebylo možné uložit vlastní PID %jd.\n" +#: quota_nld.c:489 rquota_svc.c:537 +#, fuzzy, c-format +msgid "Failed to daemonize: %s\n" +msgstr "Odstranění kvóty selhalo: %s\n" + #: repquota.c:51 #, fuzzy, c-format msgid "" @@ -1289,24 +1320,31 @@ "%s [-vugsi] [-c|C] [-t|n] [-F quotaformat] [-O (default | xml | csv)] (-a | " "mntpoint)\n" "\n" -"-v, --verbose display also users/groups without any usage\n" -"-u, --user display information about users\n" -"-g, --group display information about groups\n" -"-P, --project display information about projects\n" -"-s, --human-readable show numbers in human friendly units (MB, " -"GB, ...)\n" -"-t, --truncate-names truncate names to 9 characters\n" -"-p, --raw-grace print grace time in seconds since epoch\n" -"-n, --no-names do not translate uid/gid to name\n" -"-i, --no-autofs avoid autofs mountpoints\n" -"-c, --cache translate big number of ids at once\n" -"-C, --no-cache translate ids one by one\n" -"-F, --format=formatname report information for specific format\n" -"-O, --output=format format output as xml or csv\n" -"-a, --all report information for all mount points with " -"quotas\n" -"-h, --help display this help message and exit\n" -"-V, --version display version information and exit\n" +"-v, --verbose display also users/groups without any usage\n" +"-u, --user display information about users\n" +"-g, --group display information about groups\n" +"-P, --project display information about projects\n" +"-s, --human-readable[=units] display numbers in human friendly units (MB, " +"GB,\n" +" ...). Units can be also specified explicitely " +"by\n" +" an optional argument in format [kgt],[kgt] " +"where\n" +" the first character specifies space units and " +"the\n" +" second character specifies inode units\n" +"-t, --truncate-names truncate names to 9 characters\n" +"-p, --raw-grace print grace time in seconds since epoch\n" +"-n, --no-names do not translate uid/gid to name\n" +"-i, --no-autofs avoid autofs mountpoints\n" +"-c, --cache translate big number of ids at once\n" +"-C, --no-cache translate ids one by one\n" +"-F, --format=formatname report information for specific format\n" +"-O, --output=format format output as xml or csv\n" +"-a, --all report information for all mount points with\n" +" quotas\n" +"-h, --help display this help message and exit\n" +"-V, --version display version information and exit\n" "\n" msgstr "" "Nástroj pro hlášení kvót.\n" @@ -1331,53 +1369,53 @@ "-V, --version zobrazí údaje o verzi a skončí\n" "\n" -#: repquota.c:158 +#: repquota.c:167 msgid "Repquota cannot report through RPC calls.\n" msgstr "Repquota nedokáže pracovat přes volání RPC.\n" -#: repquota.c:162 +#: repquota.c:171 msgid "Specified both -n and -t but only one of them can be used.\n" msgstr "Zadány přepínače -n i -t, ale použít lze jen jeden z nich.\n" -#: repquota.c:366 +#: repquota.c:375 msgid "User" msgstr "Uživatel" -#: repquota.c:368 +#: repquota.c:377 msgid "Group" msgstr "Skupina" -#: repquota.c:370 +#: repquota.c:379 msgid "Project" msgstr "" # TODO: Internationalize first argument -#: repquota.c:373 +#: repquota.c:382 #, c-format msgid "*** Report for %s quotas on device %s\n" msgstr "*** Hlášení pro kvóty %s na zařízení %s\n" # This is first argument of `%s limits' header -#: repquota.c:382 +#: repquota.c:391 msgid "Space" msgstr "místa" # This is first argument of `%s limits' header -#: repquota.c:384 +#: repquota.c:393 msgid "Block" msgstr "bloků" -#: repquota.c:385 +#: repquota.c:394 #, c-format msgid "Block grace time: %s; Inode grace time: %s\n" msgstr "Doba odkladu bloků: %s, Doba odkladu i-uzlů: %s\n" -#: repquota.c:386 +#: repquota.c:395 #, c-format msgid " %s limits File limits\n" msgstr " Limity %s Limity souborů\n" -#: repquota.c:387 +#: repquota.c:396 #, c-format msgid "%-9s used soft hard grace used soft hard grace\n" msgstr "%-9s užito měkký pevný odklad užito měkký pevný odklad\n" @@ -1561,7 +1599,12 @@ msgid "WARNING - Quota file %s has corrupted headers\n" msgstr "POZOR – Kvótový soubor %s má poškozené hlavičky\n" -#: quotacheck_v2.c:362 +#: quotacheck_v2.c:361 +#, fuzzy +msgid "Continue checking assuming format from command line?" +msgstr "Pokračovat v kontrole předpokládaje verzi z příkazového řádku?" + +#: quotacheck_v2.c:365 #, c-format msgid "" "Quota file format version %d does not match the one specified on command " @@ -1570,33 +1613,33 @@ "Verze formátu kvótového souboru %d neodpovídá formátu uvedenému na\n" "příkazovém řádku (%d). Hlavička kvótového souboru může být poškozena.\n" -#: quotacheck_v2.c:366 +#: quotacheck_v2.c:370 msgid "Continue checking assuming version from command line?" msgstr "Pokračovat v kontrole předpokládaje verzi z příkazového řádku?" -#: quotacheck_v2.c:372 +#: quotacheck_v2.c:376 msgid "Headers checked.\n" msgstr "Hlavičky zkontrolovány.\n" -#: quotacheck_v2.c:388 +#: quotacheck_v2.c:392 #, c-format msgid "Do not know how to buffer format %d\n" msgstr "Neví se, jak bufferovat formát %d\n" -#: quotacheck_v2.c:398 +#: quotacheck_v2.c:402 #, c-format msgid "Headers of file %s checked. Going to load data...\n" msgstr "Hlavičky souboru %s zkontrolovány. Nyní se budou nahrávat data…\n" -#: quotacheck_v2.c:406 +#: quotacheck_v2.c:410 msgid "Cannot gather quota data. Tree root node corrupted.\n" msgstr "Nelze posbírat údaje o kvótách. Kořenový uzel stromu je poškozen.\n" -#: quotacheck_v2.c:414 +#: quotacheck_v2.c:418 msgid "WARNING - Some data might be changed due to corruption.\n" msgstr "POZOR – Některé údaje mohly být kvůli poškození pozměněny.\n" -#: quotacheck_v2.c:417 +#: quotacheck_v2.c:421 msgid "Not found any corrupted blocks. Congratulations.\n" msgstr "Nenalezeny žádné poškozené bloky. Blahopřejeme.\n" @@ -1612,42 +1655,42 @@ msgid "RPC quota format specified for non-NFS filesystem.\n" msgstr "Kvótový formát RPC zadán pro ne-NFS souborový systém.\n" -#: quotaio.c:84 +#: quotaio.c:85 msgid "Only XFS quota format is allowed on XFS filesystem.\n" msgstr "Pouze kvótový formát XFS je povolen na souborovém systému XFS.\n" -#: quotaio.c:95 +#: quotaio.c:96 msgid "XFS quota allowed only on XFS filesystem.\n" msgstr "XFS kvóty jsou povoleny pouze na souborovém systému XFS.\n" -#: quotaio.c:109 +#: quotaio.c:110 msgid "Quota not supported by the filesystem.\n" msgstr "Kvóta není souborovým systémem podporována.\n" -#: quotaio.c:129 +#: quotaio.c:130 msgid "Cannot find any quota file to work on.\n" msgstr "Nenalezeny žádné kvótové souboru ke zpracování.\n" -#: quotaio.c:134 +#: quotaio.c:135 msgid "Quota file not found or has wrong format.\n" msgstr "Kvótový soubor nenalezen nebo má chybný formát.\n" -#: quotaio.c:144 +#: quotaio.c:145 #, c-format msgid "Cannot sync quotas on device %s: %s\n" msgstr "Kvóty na zařízení %s nelze synchronizovat: %s\n" -#: quotaio.c:175 +#: quotaio.c:176 #, c-format msgid "Cannot initialize quota on %s: %s\n" msgstr "Kvóty na %s nelze inicializovat: %s\n" -#: quotaio.c:202 +#: quotaio.c:203 #, c-format msgid "Creation of %s quota format is not supported.\n" msgstr "Tvorba formátu kvóty %s není podporována.\n" -#: quotaio.c:212 +#: quotaio.c:213 #, c-format msgid "" "Quota on %s is stored in system files and must be manipulated by fs tools.\n" @@ -1655,18 +1698,18 @@ "Kvóta na %s je uložena v souborovém systému, a musí se s ní\n" "zacházet pomocí nástrojů souborového systému.\n" -#: quotaio.c:222 +#: quotaio.c:223 #, c-format msgid "Cannot create new quotafile %s: %s\n" msgstr "Nový kvótový soubor %s nelze vytvořit: %s\n" -#: quotaio.c:296 +#: quotaio.c:297 #, c-format msgid "" "Trying to set quota limits out of range supported by quota format on %s.\n" msgstr "Pokus nastavit limit mimo rozsah podporovaný formátem kvóty na %s.\n" -#: quotaio.c:302 +#: quotaio.c:303 #, c-format msgid "" "Trying to set quota usage out of range supported by quota format on %s.\n" @@ -1705,7 +1748,7 @@ "Funkce metadat init_io zavolána, když jádro nepodporuje obecné rozhraní\n" "pro kvóty!\n" -#: quotaio_rpc.c:76 quotaio_v1.c:308 quotaio_v2.c:464 +#: quotaio_rpc.c:77 quotaio_v1.c:278 quotaio_v2.c:464 #, c-format msgid "Trying to write quota to readonly quotafile on %s\n" msgstr "Pokus zapsat kvótu do kvótového souboru, který jen pro čtení, na %s\n" @@ -1764,7 +1807,7 @@ "Kvótový soubor je pravděpodobně poškozen.\n" "Prosím, spusťte quotacheck(8) a zkuste to znovu.\n" -#: quotaio_v1.c:214 +#: quotaio_v1.c:184 #, c-format msgid "Trying to write info to readonly quotafile on %s.\n" msgstr "" @@ -1800,40 +1843,40 @@ "Záznamů: %u\n" "Průměrně použito: %f\n" -#: quotaio_xfs.c:260 +#: quotaio_xfs.c:265 #, c-format msgid "*** Status for %s quotas on device %s\n" msgstr "*** Stav kvót %s na zařízení %s\n" -#: quotaio_xfs.c:262 quotaio_xfs.c:281 +#: quotaio_xfs.c:267 quotaio_xfs.c:286 msgid "ON" msgstr "ZAPNUTO" -#: quotaio_xfs.c:262 quotaio_xfs.c:281 +#: quotaio_xfs.c:267 quotaio_xfs.c:286 msgid "OFF" msgstr "VYPNUTO" -#: quotaio_xfs.c:264 quotaio_xfs.c:268 quotaio_xfs.c:272 +#: quotaio_xfs.c:269 quotaio_xfs.c:273 quotaio_xfs.c:277 #, c-format msgid "Accounting: %s; Enforcement: %s\n" msgstr "Účtování: %s; Vynucení: %s\n" -#: quotaio_xfs.c:284 quotaio_xfs.c:288 quotaio_xfs.c:292 +#: quotaio_xfs.c:289 quotaio_xfs.c:293 quotaio_xfs.c:297 #, c-format msgid "Accounting [ondisk]: %s; Enforcement [ondisk]: %s\n" msgstr "Účtování [ondisk]: %s; Vynucení [ondisk]: %s\n" -#: quotaio_xfs.c:301 quotaio_xfs.c:310 quotaio_xfs.c:323 +#: quotaio_xfs.c:306 quotaio_xfs.c:315 quotaio_xfs.c:328 #, c-format msgid "Inode: none\n" msgstr "Iuzel: žádný\n" -#: quotaio_xfs.c:303 quotaio_xfs.c:312 quotaio_xfs.c:325 +#: quotaio_xfs.c:308 quotaio_xfs.c:317 quotaio_xfs.c:330 #, c-format msgid "Inode: #%llu (%llu blocks, %u extents)\n" msgstr "Iuzel: č. %llu (%'llu bloků, %'u rozsahů)\n" -#: quotaon.c:67 +#: quotaon.c:37 #, fuzzy, c-format msgid "" "Usage:\n" @@ -1867,128 +1910,128 @@ "-h, --help zobrazí tuto nápovědu a skončí\n" "-V, --version zobrazí údaje o verzi a skončí\n" -#: quotaon.c:81 +#: quotaon.c:51 msgid "turn quotas off for all filesystems" msgstr "vypne kvóty na všech souborových systémech" -#: quotaon.c:82 +#: quotaon.c:52 msgid "turn quotas on for all filesystems" msgstr "zapne kvóty na všech souborových systémech" -#: quotaon.c:147 +#: quotaon.c:117 msgid "Cannot turn on/off quotas via RPC.\n" msgstr "Kvóty nelze přes RPC zapnout/vypnout.\n" -#: quotaon.c:194 +#: quotaon.c:164 #, c-format msgid "set root_squash on %s: %s\n" msgstr "nastavení root_squash na %s: %s\n" -#: quotaon.c:198 +#: quotaon.c:168 #, c-format msgid "%s: %s root_squash turned off\n" msgstr "%s: root_squash na %s vypnuto\n" -#: quotaon.c:200 +#: quotaon.c:170 #, c-format msgid "%s: %s root_squash turned on\n" msgstr "%s: root_squash na %s zapnuto\n" -#: quotaon.c:218 +#: quotaon.c:188 #, c-format msgid "quotactl on %s [%s]: %s\n" msgstr "quotactl na %s [%s]: %s\n" # TODO: quotas attribute -#: quotaon.c:221 +#: quotaon.c:191 #, c-format msgid "%s [%s]: %s quotas turned off\n" msgstr "%s [%s]: kvóty pro %s vypnuty\n" -#: quotaon.c:234 +#: quotaon.c:204 #, c-format msgid "cannot find %s on %s [%s]\n" msgstr "%s nelze na %s [%s] nalézt\n" -#: quotaon.c:236 +#: quotaon.c:206 #, c-format msgid "using %s on %s [%s]: %s\n" msgstr "použití %s na %s [%s]: %s\n" -#: quotaon.c:238 +#: quotaon.c:208 msgid "Maybe create new quota files with quotacheck(8)?\n" msgstr "Možná vytvořit nové kvótové soubory pomocí quotacheck(8)?\n" -#: quotaon.c:240 +#: quotaon.c:210 msgid "Quota format not supported in kernel.\n" msgstr "Formát kvóty není podporován jádrem.\n" # TODO: quotas attribute -#: quotaon.c:243 +#: quotaon.c:213 #, c-format msgid "%s [%s]: %s quotas turned on\n" msgstr "%s [%s]: kvóty %s zapnuty\n" -#: quotaon.c:283 +#: quotaon.c:253 msgid "Cannot change state of GFS2 quota.\n" msgstr "Stav kvóty GFS2 nelze změnit.\n" -#: quotaon.c:287 +#: quotaon.c:258 msgid "Cannot change state of XFS quota. It's not compiled in kernel.\n" msgstr "Stav kvóty XFS nelze změnit. Není zakompilováno do jádra.\n" -#: quotaon.c:312 +#: quotaon.c:283 #, c-format msgid "Cannot find quota file on %s [%s] to turn quotas on/off.\n" msgstr "" "Pro vypnutí/zapnutí kvót je třeba kvótový soubor, který nelze na %s [%s] " "nalézt.\n" -#: quotaon.c:317 +#: quotaon.c:288 #, c-format msgid "Quota file on %s [%s] does not exist or has wrong format.\n" msgstr "Kvótový soubor na %s [%s] neexistuje nebo má špatný formát.\n" # kvóta je, změní stav kvót na -#: quotaon.c:346 quotaon.c:362 +#: quotaon.c:318 quotaon.c:334 msgid "off" msgstr "vypnuto" -#: quotaon.c:348 +#: quotaon.c:320 #, fuzzy msgid "on (accounting)" msgstr "a účtování" -#: quotaon.c:350 +#: quotaon.c:322 msgid "on (enforced)" msgstr "" # kvóta je, změní stav kvót na -#: quotaon.c:362 +#: quotaon.c:334 msgid "on" msgstr "zapnuto" # TODO: quota attribute -#: quotaon.c:364 +#: quotaon.c:336 #, c-format msgid "%s quota on %s (%s) is %s\n" msgstr "Kvóta %s na %s (%s) je %s\n" -#: quotaon.c:381 +#: quotaon.c:353 #, c-format msgid "Name must be quotaon or quotaoff not %s\n" msgstr "Název musí být quotaon nebo quotaoff, ne %s\n" -#: quotaon.c:387 +#: quotaon.c:359 #, c-format msgid "Required format %s not supported by kernel.\n" msgstr "Požadovaný formát %s není podporován jádrem.\n" -#: quotaon.c:389 +#: quotaon.c:361 msgid "Warning: No quota format detected in the kernel.\n" msgstr "Pozor: Žádný formát kvóty nebyl v jádře rozpoznán.\n" -#: quotaon.c:396 +#: quotaon.c:368 #, c-format msgid "%s: Quota cannot be turned on on NFS filesystem\n" msgstr "%s: Kvótu nelze souborovém systému NFS zapnout.\n" @@ -2111,83 +2154,83 @@ msgid "Invalid argument \"%s\"\n" msgstr "Neplatný argument „%s“\n" -#: quotaops.c:112 +#: quotaops.c:82 #, c-format msgid "%s (uid %d): Permission denied\n" msgstr "%s (UID %d): Povolení zamítnuto\n" -#: quotaops.c:124 +#: quotaops.c:94 #, c-format msgid "%s (gid %d): gid set allocation (%d): %s\n" msgstr "%s (GID %d): alokace množiny GID (%d): %s\n" -#: quotaops.c:135 +#: quotaops.c:105 #, c-format msgid "%s (gid %d): error while trying getgroups(): %s\n" msgstr "%s (GID %d): volání getgroups() skončilo chybou: %s\n" -#: quotaops.c:146 +#: quotaops.c:116 #, c-format msgid "%s (gid %d): Permission denied\n" msgstr "%s (GID %d): Povolení zamítnuto\n" -#: quotaops.c:162 +#: quotaops.c:132 #, c-format msgid "error while getting quota from %s for %s (id %u): %s\n" msgstr "chyba při zjišťování kvóty z %s pro %s (ID %u): %s\n" -#: quotaops.c:187 +#: quotaops.c:157 #, c-format msgid "Cannot write quota for %u on %s: %s\n" msgstr "Kvótu pro %u nelze na %s zapsat: %s\n" # TODO: quota attribute -#: quotaops.c:222 quotaops.c:224 +#: quotaops.c:192 quotaops.c:194 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "synchronizace kvóty %s selhala: %s\n" -#: quotaops.c:238 +#: quotaops.c:208 msgid "Too many parameters to editor.\n" msgstr "Příliš mnoho parametrů editoru.\n" -#: quotaops.c:246 +#: quotaops.c:216 #, c-format msgid "Cannot exec %s\n" msgstr "%s nelze spustit\n" -#: quotaops.c:263 +#: quotaops.c:233 #, fuzzy, c-format msgid "Cannot truncate a file: %s\n" msgstr "O souboru s kvótami %s nelze zjistit údaje: %s\n" -#: quotaops.c:265 +#: quotaops.c:235 #, fuzzy, c-format msgid "Cannot reset a file offset: %s\n" msgstr "Nelze načíst soubor se statistikou %s: %s\n" -#: quotaops.c:267 +#: quotaops.c:237 #, fuzzy, c-format msgid "Cannot duplicate a file descriptor: %s\n" msgstr "Deskriptor nelze zdvojit: %s\n" -#: quotaops.c:269 +#: quotaops.c:239 #, fuzzy, c-format msgid "Cannot open a stream to write to: %s\n" msgstr "Dočasný soubor nelze znovu otevřít: %s\n" -#: quotaops.c:270 +#: quotaops.c:240 #, fuzzy, c-format msgid "Cannot open a stream to read from: %s\n" msgstr "Dočasný soubor nelze znovu otevřít: %s\n" # TODO: internationalize first argument -#: quotaops.c:286 +#: quotaops.c:256 #, c-format msgid "Disk quotas for %s %s (%cid %d):\n" msgstr "Diskové kvóty pro %s %s (%cid %d):\n" -#: quotaops.c:290 +#: quotaops.c:260 #, c-format msgid "" " Filesystem blocks soft hard inodes " @@ -2196,21 +2239,21 @@ " Souborový systém bloků měkký pevný iuzlů " "měkký pevný\n" -#: quotaops.c:323 +#: quotaops.c:293 #, c-format msgid "WARNING - %s: cannot change current block allocation\n" msgstr "POZOR – %s: množství alokovaných bloků nelze změnit\n" -#: quotaops.c:326 +#: quotaops.c:296 #, c-format msgid "WARNING - %s: cannot change current inode allocation\n" msgstr "POZOR – %s: množství alokovaných iuzlů nelze změnit\n" -#: quotaops.c:352 +#: quotaops.c:322 msgid "Bad format: two title lines assumed\n" msgstr "" -#: quotaops.c:363 +#: quotaops.c:333 #, c-format msgid "" "Bad format:\n" @@ -2221,53 +2264,53 @@ # FIXME: First argument is continuation of sentence. This is not localizable # correctly. -#: quotaops.c:369 +#: quotaops.c:339 #, fuzzy, c-format msgid "Bad block usage: %s: %s\n" msgstr "Špatná hodtnota: %s: %s\n" -#: quotaops.c:376 +#: quotaops.c:346 #, fuzzy, c-format msgid "Bad block soft limit: %s: %s\n" msgstr "Chybný měkký limit bloků" -#: quotaops.c:383 +#: quotaops.c:353 #, fuzzy, c-format msgid "Bad block hard limit: %s: %s\n" msgstr "Chybný pevný limit bloků" # FIXME: First argument is continuation of sentence. This is not localizable # correctly. -#: quotaops.c:390 +#: quotaops.c:360 #, fuzzy, c-format msgid "Bad inode usage: %s: %s\n" msgstr "Špatná hodtnota: %s: %s\n" -#: quotaops.c:397 +#: quotaops.c:367 #, fuzzy, c-format msgid "Bad inode soft limit: %s: %s\n" msgstr "Chybný měkký limit iuzlů" -#: quotaops.c:404 +#: quotaops.c:374 #, fuzzy, c-format msgid "Bad inode hard limit: %s: %s\n" msgstr "Chybný pevný limit iuzlů" # TODO: internationalize first argument -#: quotaops.c:457 +#: quotaops.c:427 #, c-format msgid "Times to enforce softlimit for %s %s (%cid %d):\n" msgstr "Časy vynucení měkkého limitu pro %s %s (%cid %d):\n" # XXX: Keep this message on one line because parser expects exact line numbers -#: quotaops.c:459 quotaops.c:562 +#: quotaops.c:429 quotaops.c:532 #, c-format msgid "Time units may be: days, hours, minutes, or seconds\n" msgstr "" "Jednotky času smí být: days (dny), hours (hodiny), minutes (minuty) nebo " "seconds (sekundy)\n" -#: quotaops.c:461 +#: quotaops.c:431 #, c-format msgid "" " Filesystem block grace inode grace\n" @@ -2275,26 +2318,26 @@ " Souborový systém odklad pro bloky odklad pro " "iuzly\n" -#: quotaops.c:466 quotaops.c:472 quotaops.c:517 quotaops.c:530 setquota.c:288 +#: quotaops.c:436 quotaops.c:442 quotaops.c:487 quotaops.c:500 setquota.c:288 #: setquota.c:294 msgid "unset" msgstr "nenastaveno" -#: quotaops.c:468 quotaops.c:474 +#: quotaops.c:438 quotaops.c:444 msgid "0seconds" msgstr "0sekund" # TODO: Pluralize -#: quotaops.c:470 quotaops.c:476 quotasys.c:503 +#: quotaops.c:440 quotaops.c:446 quotasys.c:503 #, c-format msgid "%useconds" msgstr "%usekund" -#: quotaops.c:503 quotaops.c:602 +#: quotaops.c:473 quotaops.c:572 msgid "Bad format: three title lines assumed\n" msgstr "" -#: quotaops.c:513 quotaops.c:610 +#: quotaops.c:483 quotaops.c:580 #, c-format msgid "" "bad format:\n" @@ -2303,18 +2346,18 @@ "chybný formát:\n" "%s\n" -#: quotaops.c:524 quotaops.c:616 +#: quotaops.c:494 quotaops.c:586 msgid "Bad time units. Units are 'second', 'minute', 'hour', and 'day'.\n" msgstr "" "Chybné jednotky času. Jednotky jsou „second“, „minute“, „hour“ a „day“.\n" # TODO: Internationalize argumentargumentargumentargumentargument -#: quotaops.c:560 +#: quotaops.c:530 #, c-format msgid "Grace period before enforcing soft limits for %ss:\n" msgstr "Perioda odkladu před vynucením měkkého limitu pro %s:\n" -#: quotaops.c:563 +#: quotaops.c:533 #, c-format msgid " Filesystem Block grace period Inode grace period\n" msgstr "" @@ -2462,7 +2505,7 @@ "-V, --version zobrazí údaje o verzi a skončí\n" "\n" -#: setquota.c:84 edquota.c:104 quota.c:114 +#: setquota.c:84 edquota.c:104 quota.c:90 #, c-format msgid "Bugs to: %s\n" msgstr "" @@ -2650,7 +2693,7 @@ # FIXME: context # None limit # None grace -#: quotasys.c:459 quota.c:297 +#: quotasys.c:459 quota.c:278 msgid "none" msgstr "žádný" @@ -2723,116 +2766,116 @@ msgid "days" msgstr "dnů" -#: quotasys.c:573 +#: quotasys.c:582 msgid "Integer overflow while parsing space number." msgstr "" -#: quotasys.c:575 +#: quotasys.c:584 msgid "K" msgstr "" -#: quotasys.c:577 +#: quotasys.c:586 msgid "M" msgstr "" -#: quotasys.c:579 +#: quotasys.c:588 msgid "G" msgstr "" -#: quotasys.c:581 +#: quotasys.c:590 msgid "T" msgstr "" -#: quotasys.c:584 +#: quotasys.c:593 msgid "Unknown space binary unit. Valid units are K, M, G, T." msgstr "" -#: quotasys.c:588 +#: quotasys.c:597 msgid "Integer overflow while interpreting space unit." msgstr "" -#: quotasys.c:628 +#: quotasys.c:650 msgid "Integer overflow while parsing number." msgstr "" -#: quotasys.c:632 +#: quotasys.c:654 msgid "k" msgstr "" -#: quotasys.c:634 +#: quotasys.c:656 msgid "m" msgstr "" -#: quotasys.c:636 +#: quotasys.c:658 msgid "g" msgstr "" -#: quotasys.c:638 +#: quotasys.c:660 msgid "t" msgstr "" -#: quotasys.c:641 +#: quotasys.c:663 msgid "Unknown decimal unit. Valid units are k, m, g, t." msgstr "" -#: quotasys.c:645 +#: quotasys.c:667 msgid "Integer overflow while interpreting decimal unit." msgstr "" -#: quotasys.c:803 +#: quotasys.c:826 #, c-format msgid "Cannot stat quota file %s: %s\n" msgstr "O souboru s kvótami %s nelze zjistit údaje: %s\n" -#: quotasys.c:949 +#: quotasys.c:974 msgid "Not all specified mountpoints are using quota.\n" msgstr "Ne všechny použité přípojné body používají kvótu.\n" -#: quotasys.c:963 +#: quotasys.c:988 #, c-format msgid "Error while releasing file on %s\n" msgstr "Chyba při uvolňování souboru na %s\n" -#: quotasys.c:1022 +#: quotasys.c:1047 #, c-format msgid "Cannot create set for sigaction(): %s\n" msgstr "Nelze vytvořit množinu pro sigaction(): %s\n" -#: quotasys.c:1025 +#: quotasys.c:1050 #, c-format msgid "Cannot set signal handler: %s\n" msgstr "Nelze nastavit obsluhu signálu: %s\n" -#: quotasys.c:1080 +#: quotasys.c:1106 #, c-format msgid "Cannot reset signal handler: %s\n" msgstr "Nelze znovu nastavit obsluhu signálu: %s\n" -#: quotasys.c:1235 +#: quotasys.c:1261 msgid "Cannot open any file with mount points.\n" msgstr "Žádný soubor s body připojení nelze otevřít.\n" -#: quotasys.c:1253 +#: quotasys.c:1279 #, c-format msgid "Cannot get device name for %s\n" msgstr "Nelze získat název zařízení pro %s\n" -#: quotasys.c:1313 +#: quotasys.c:1339 #, c-format msgid "Cannot resolve mountpoint path %s: %s\n" msgstr "Nelze přeložit cestu k bodu připojení %s: %s\n" -#: quotasys.c:1319 +#: quotasys.c:1345 #, c-format msgid "Cannot statfs() %s: %s\n" msgstr "Nelze vykonat statfs() nad %s: %s\n" -#: quotasys.c:1331 +#: quotasys.c:1357 #, c-format msgid "Cannot stat() mounted device %s: %s\n" msgstr "Nelze získat údaje o připojeném zařízení %s: %s\n" -#: quotasys.c:1336 +#: quotasys.c:1362 #, c-format msgid "" "Device (%s) filesystem is mounted on unsupported device type. Skipping.\n" @@ -2840,12 +2883,12 @@ "Souborový systém ze zařízení (%s) je připojen na nepodporovaném druhu\n" "zařízení. Přeskakuje se.\n" -#: quotasys.c:1346 +#: quotasys.c:1372 #, c-format msgid "Cannot stat() mountpoint %s: %s\n" msgstr "Nad bodem připojení %s nelze zavolat stat(): %s\n" -#: quotasys.c:1415 +#: quotasys.c:1441 #, c-format msgid "" "Cannot find a device with %s.\n" @@ -2854,7 +2897,7 @@ "Zařízení s %s nelze nalézt.\n" "Přeskakuje se…\n" -#: quotasys.c:1419 +#: quotasys.c:1445 #, c-format msgid "" "Cannot stat() a mountpoint with %s: %s\n" @@ -2863,7 +2906,7 @@ "Nad bodem připojení s %s nelze zavolat stat(): %s\n" "Přeskakuje se…\n" -#: quotasys.c:1427 +#: quotasys.c:1453 #, c-format msgid "" "Cannot stat() given mountpoint %s: %s\n" @@ -2872,31 +2915,31 @@ "Nad zadaným bodem připojení %s nelze zavolat stat(): %s\n" "Přeskakuje se…\n" -#: quotasys.c:1437 +#: quotasys.c:1463 #, c-format msgid "Cannot find a filesystem mountpoint for directory %s\n" msgstr "K adresáři %s nelze přiřadit bod připojení souborového systému.\n" -#: quotasys.c:1443 +#: quotasys.c:1469 #, c-format msgid "Cannot resolve path %s: %s\n" msgstr "Cestu %s nelze přeložit: %s\n" -#: quotasys.c:1454 +#: quotasys.c:1480 #, c-format msgid "Cannot find mountpoint for device %s\n" msgstr "K zařízení %s nelze přiřadit bod připojení.\n" -#: quotasys.c:1460 +#: quotasys.c:1486 #, c-format msgid "Specified path %s is not directory nor device.\n" msgstr "Zadaná cesta %s není ani adresářem ani zařízením.\n" -#: quotasys.c:1468 +#: quotasys.c:1494 msgid "No correct mountpoint specified.\n" msgstr "Nezadán žádný správný bod připojení.\n" -#: quotasys.c:1523 +#: quotasys.c:1549 #, c-format msgid "Mountpoint (or device) %s not found or has no quota enabled.\n" msgstr "Bod připojení (nebo zařízení) %s nenalezen nebo nemá zapnuté kvóty.\n" @@ -3018,7 +3061,7 @@ msgid "Unable to register (RQUOTAPROG, EXT_RQUOTAVERS, %s).\n" msgstr "nelze zaregistrovat (RQUOTAPROG, EXT_RQUOTAVERS, UDP).\n" -#: rquota_svc.c:539 +#: rquota_svc.c:542 msgid "svc_run returned\n" msgstr "Funkce svc_run() se vrátila.\n" @@ -3072,66 +3115,76 @@ msgid "Error creating socket: %s\n" msgstr "Socket nelze vytvořit: %s\n" -#: svc_socket.c:122 +#: svc_socket.c:124 +#, fuzzy, c-format +msgid "Cannot set IPv6 socket options: %s\n" +msgstr "Socketu nelze nastavit parametry: %s\n" + +#: svc_socket.c:131 #, c-format msgid "Cannot set socket options: %s\n" msgstr "Socketu nelze nastavit parametry: %s\n" -#: svc_socket.c:128 +#: svc_socket.c:137 #, fuzzy, c-format msgid "Cannot bind to address: %s\n" msgstr "Na zadanou adresu se nelze přilepit: %s\n" +#: svc_socket.c:144 +#, fuzzy, c-format +msgid "Cannot listen to address: %s\n" +msgstr "Na zadanou adresu se nelze přilepit: %s\n" + #: xqmstats.c:32 xqmstats.c:37 msgid "The running kernel does not support XFS\n" msgstr "Bežící jádro nepodporuje XFS\n" -#: xqmstats.c:49 +#: xqmstats.c:50 #, c-format msgid "XFS Quota Manager dquot statistics\n" msgstr "Statistika quot Správce kvót XFS\n" -#: xqmstats.c:50 +#: xqmstats.c:51 #, c-format msgid " reclaims: %u\n" msgstr " uvolnění: %u\n" -#: xqmstats.c:51 +#: xqmstats.c:52 #, c-format msgid " missed reclaims: %u\n" msgstr " nenalezená uvolnění: %u\n" -#: xqmstats.c:52 +#: xqmstats.c:53 #, c-format msgid " dquot dups: %u\n" msgstr " duplikací dquot: %u\n" -#: xqmstats.c:53 +#: xqmstats.c:54 #, c-format msgid " cache misses: %u\n" msgstr " nenalezení v keši: %u\n" -#: xqmstats.c:54 +#: xqmstats.c:55 #, c-format msgid " cache hits: %u\n" msgstr " zásahů v keši: %u\n" -#: xqmstats.c:55 +#: xqmstats.c:56 #, c-format msgid " dquot wants: %u\n" msgstr " požadavků na dquot: %u\n" -#: xqmstats.c:56 +#: xqmstats.c:57 #, c-format msgid " shake reclaims: %u\n" msgstr " uvolnění setřesením: %u\n" -#: xqmstats.c:57 +#: xqmstats.c:58 #, c-format msgid " inact reclaims: %u\n" msgstr " uvolnění neaktivních: %u\n" -#: xqmstats.c:62 +#: xqmstats.c:63 #, c-format msgid "Maximum %u dquots (currently %u incore, %u on freelist)\n" msgstr "Maximum %u dquot (nyní %u v jádře, %u na seznamu volných)\n" @@ -3284,52 +3337,61 @@ msgid "Cannot read quotas from file.\n" msgstr "Kvóty nelze ze souboru.\n" -#: quota.c:87 +#: quota.c:58 #, fuzzy msgid "Usage: quota [-guPqvswim] [-l | [-Q | -A]] [-F quotaformat]\n" msgstr "Použití: quota [-guqvswim] [-l | [-Q | -A]] [-f FORMÁT]\n" -#: quota.c:88 +#: quota.c:59 msgid "\tquota [-qvswim] [-l | [-Q | -A]] [-F quotaformat] -u username ...\n" msgstr "\tquota [-qvswim] [-l | [-Q | -A]] [-F FORMÁT] -u UŽIVATEL…\n" -#: quota.c:89 +#: quota.c:60 msgid "\tquota [-qvswim] [-l | [-Q | -A]] [-F quotaformat] -g groupname ...\n" msgstr "\tquota [-qvswim] [-l | [-Q | -A]] [-F FORMÁT] -g SKUPINA…\n" -#: quota.c:90 +#: quota.c:61 #, fuzzy msgid "\tquota [-qvswugPQm] [-F quotaformat] -f filesystem ...\n" msgstr "\tquota [-qvswugQm] [-F FORMÁT] -f SOUBOROVÝ_SYSTÉM…\n" -#: quota.c:91 +#: quota.c:62 #, fuzzy msgid "" "\n" -"-u, --user display quota for user\n" -"-g, --group display quota for group\n" -"-P, --project display quota for project\n" -"-q, --quiet print more terse message\n" -"-v, --verbose print more verbose message\n" -"-s, --human-readable display numbers in human friendly units (MB, " -"GB...)\n" -" --always-resolve always try to translate name to id, even if it is\n" -"\t\t\t composed of only digits\n" -"-w, --no-wrap do not wrap long lines\n" -"-p, --raw-grace print grace time in seconds since epoch\n" -"-l, --local-only do not query NFS filesystems\n" -"-Q, --quiet-refuse do not print error message when NFS server does\n" -" not respond\n" -"-i, --no-autofs do not query autofs mountpoints\n" -"-F, --format=formatname display quota of a specific format\n" -"-f, --filesystem-list display quota information only for given " -"filesystems\n" -"-A, --all-nfs display quota for all NFS mountpoints\n" -"-m, --no-mixed-pathnames trim leading slashes from NFSv4 mountpoints\n" -" --show-mntpoint show mount point of the file system in output\n" -" --hide-device do not show file system device in output\n" -"-h, --help display this help message and exit\n" -"-V, --version display version information and exit\n" +"-u, --user display quota for user\n" +"-g, --group display quota for group\n" +"-P, --project display quota for project\n" +"-q, --quiet print more terse message\n" +"-v, --verbose print more verbose message\n" +"-s, --human-readable[=units] display numbers in human friendly units (MB, " +"GB,\n" +" ...). Units can be also specified explicitely " +"by\n" +" an optional argument in format [kgt],[kgt] " +"where\n" +" the first character specifies space units and " +"the\n" +" second character specifies inode units\n" +" --always-resolve always try to translate name to id, even if it " +"is\n" +"\t\t\t composed of only digits\n" +"-w, --no-wrap do not wrap long lines\n" +"-p, --raw-grace print grace time in seconds since epoch\n" +"-l, --local-only do not query NFS filesystems\n" +"-Q, --quiet-refuse do not print error message when NFS server " +"does\n" +" not respond\n" +"-i, --no-autofs do not query autofs mountpoints\n" +"-F, --format=formatname display quota of a specific format\n" +"-f, --filesystem-list display quota information only for given\n" +" filesystems\n" +"-A, --all-nfs display quota for all NFS mountpoints\n" +"-m, --no-mixed-pathnames trim leading slashes from NFSv4 mountpoints\n" +" --show-mntpoint show mount point of the file system in output\n" +" --hide-device do not show file system device in output\n" +"-h, --help display this help message and exit\n" +"-V, --version display version information and exit\n" "\n" msgstr "" "\n" @@ -3360,100 +3422,104 @@ "-V, --version zobrazí údaje o verzi a skončí\n" "\n" -#: quota.c:123 +#: quota.c:99 msgid "space" msgstr "místo" -#: quota.c:125 +#: quota.c:101 msgid "blocks" msgstr "bloky" # FIXME: third argument is first character of first argument # (user/group → u/g-id). This is not localizable. -#: quota.c:127 +#: quota.c:103 #, c-format msgid "Disk quotas for %s %s (%cid %u): %s\n" msgstr "Diskové kvóty pro %s %s (%cid %u): %s\n" # FIXME: printf(3) counts bytes, not columns -#: quota.c:130 +#: quota.c:106 msgid "Filesystem" msgstr "Souborovy system" # FIXME: printf(3) counts bytes, not columns -#: quota.c:131 quota.c:132 +#: quota.c:107 quota.c:108 msgid "quota" msgstr "kvota" # FIXME: printf(3) counts bytes, not columns -#: quota.c:131 quota.c:132 +#: quota.c:107 quota.c:108 msgid "limit" msgstr "limit" # FIXME: printf(3) counts bytes, not columns -#: quota.c:131 quota.c:132 +#: quota.c:107 quota.c:108 msgid "grace" msgstr "odklad" # FIXME: printf(3) counts bytes, not columns -#: quota.c:132 +#: quota.c:108 msgid "files" msgstr "souboru" -#: quota.c:208 +#: quota.c:189 msgid "File limit reached on" msgstr "Omezení počtu souborů dosaženo na" -#: quota.c:214 +#: quota.c:195 msgid "In file grace period on" msgstr "V periodě odkladu počtu souborů na" -#: quota.c:218 +#: quota.c:199 msgid "Over file quota on" msgstr "Kvóta na počet souborů přesažena na" -#: quota.c:224 +#: quota.c:205 msgid "Block limit reached on" msgstr "Omezení na počet bloků dosaženo na" -#: quota.c:230 +#: quota.c:211 msgid "In block grace period on" msgstr "V periodě odkladu počtu bloků na" -#: quota.c:234 +#: quota.c:215 msgid "Over block quota on" msgstr "Kvóta na počet bloků překročena na" -#: quota.c:408 +#: quota.c:278 +msgid "no limited resources used" +msgstr "" + +#: quota.c:393 #, c-format msgid "Warning: Ignoring -%c when filesystem list specified.\n" msgstr "Pozor: Je-li zadán seznam souborových systémů, -%c bude ignorován.\n" -#: quota.c:415 +#: quota.c:400 msgid "No filesystem specified.\n" msgstr "Nezadán žádný systém souborů.\n" -#: quota.c:423 +#: quota.c:408 #, c-format msgid "Gid set allocation (%d): %s\n" msgstr "Alokace množiny GID (%d): %s\n" -#: quota.c:429 +#: quota.c:414 #, c-format msgid "getgroups(): %s\n" msgstr "getgroups(): %s\n" -#: quota.c:434 +#: quota.c:419 #, fuzzy msgid "Project reports not supported without project name\n" msgstr "Formát kvóty není podporován jádrem.\n" -#: common.c:124 +#: common.c:125 #, c-format msgid "Quota utilities version %s.\n" msgstr "Kvótové nástroje (quota-tools) verze %s.\n" -#: common.c:125 +#: common.c:126 #, c-format msgid "Compiled with:%s\n" msgstr "Přeloženo s:%s\n" Binary files /tmp/tmpeemP7p/v7BeTqs21S/quota-4.04/po/de.gmo and /tmp/tmpeemP7p/VdYLEKvDrH/quota-4.05/po/de.gmo differ diff -Nru quota-4.04/po/de.po quota-4.05/po/de.po --- quota-4.04/po/de.po 2017-09-05 14:53:15.000000000 +0000 +++ quota-4.05/po/de.po 2019-03-29 10:53:18.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: quota-tools\n" "Report-Msgid-Bugs-To: jack@suse.cz\n" -"POT-Creation-Date: 2017-09-05 16:53+0200\n" +"POT-Creation-Date: 2019-03-29 11:53+0100\n" "PO-Revision-Date: 2010-02-21 13:10+0100\n" "Last-Translator: Michael Bunk \n" "Language-Team: German \n" @@ -18,12 +18,12 @@ "X-Poedit-Language: German\n" "X-Poedit-Country: GERMANY\n" -#: bylabel.c:253 +#: bylabel.c:274 #, c-format msgid "Found an invalid UUID: %s\n" msgstr "Ungültige UUID gefunden: %s\n" -#: bylabel.c:273 +#: bylabel.c:294 #, c-format msgid "Error checking device name: %s\n" msgstr "Fehler bei Prüfung des Gerätenamens: %s\n" @@ -58,8 +58,8 @@ "beenden\n" "\n" -#: convertquota.c:48 warnquota.c:1028 quotacheck.c:314 repquota.c:68 -#: common.c:126 +#: convertquota.c:48 warnquota.c:1046 quotacheck.c:314 repquota.c:73 +#: common.c:127 #, c-format msgid "Bugs to %s\n" msgstr "Fehler an %s\n" @@ -69,8 +69,8 @@ msgstr "" "Für Konvertierungen müssen Sie das Quell- und das Zielformat angeben.\n" -#: convertquota.c:112 quotacheck.c:400 quotasync.c:88 repquota.c:154 -#: quotaon.c:143 setquota.c:264 +#: convertquota.c:112 quotacheck.c:400 quotasync.c:88 repquota.c:163 +#: quotaon.c:113 setquota.c:264 msgid "Bad number of arguments.\n" msgstr "Falsche Anzahl an Argumenten.\n" @@ -107,7 +107,7 @@ msgid "Cannot get name of new quotafile.\n" msgstr "Kann Namen der Quotadatei im neuen Format nicht bekommen.\n" -#: convertquota.c:302 quotacheck.c:764 +#: convertquota.c:302 quotacheck.c:765 #, c-format msgid "Cannot rename new quotafile %s to name %s: %s\n" msgstr "Kann neue Quotadatei %s nicht in %s umbenennen: %s\n" @@ -127,7 +127,7 @@ msgid "Cannot open old quota file on %s: %s\n" msgstr "Kann Quotadatei im alten Format auf %s nicht öffnen: %s\n" -#: convertquota.c:380 +#: convertquota.c:381 msgid "Unknown action should be performed.\n" msgstr "Unbekannte Aktion sollte ausgeführt werden.\n" @@ -270,40 +270,47 @@ msgid "Could not setup ldap connection.\n" msgstr "Konnte LDAP-Verbindung nicht herstellen, kehre zurück.\n" -#: warnquota.c:422 +#: warnquota.c:417 +#, c-format +msgid "" +"Could not format LDAP search filter for %s user and %s search attribute due " +"to excessive length.\n" +msgstr "" + +#: warnquota.c:428 #, c-format msgid "Error with %s.\n" msgstr "Fehler mit %s.\n" -#: warnquota.c:423 +#: warnquota.c:429 #, c-format msgid "ldap_search_ext_s() failed: %s\n" msgstr "" -#: warnquota.c:429 +#: warnquota.c:435 #, fuzzy, c-format msgid "Multiple entries found for client %s (%d).\n" msgstr "" "Mehrere Einträge für Client %s gefunden (nämlich %d). Sende keine Mail.\n" -#: warnquota.c:433 +#: warnquota.c:439 #, fuzzy, c-format msgid "Entry not found for client %s.\n" msgstr "" "Eintrag für Client %s nicht gefunden (Gefundene LDAP-Einträge: %d). Sende " "keine Mail.\n" -#: warnquota.c:443 +#: warnquota.c:449 #, c-format msgid "Could not get values for %s.\n" msgstr "Konnte keine Werte für %s bekommen.\n" -#: warnquota.c:489 +#: warnquota.c:495 #, c-format msgid "Administrator for a group %s not found. Cancelling mail.\n" msgstr "Administrator für Gruppe %s nicht gefunden. Sende keine Mail.\n" -#: warnquota.c:541 +#: warnquota.c:547 #, c-format msgid "" "\n" @@ -312,7 +319,7 @@ "\n" " Blocklimits Dateilimits\n" -#: warnquota.c:542 +#: warnquota.c:548 #, c-format msgid "" "Filesystem used soft hard grace used soft hard grace\n" @@ -320,16 +327,16 @@ "Dateisystem belegt soft hart Gnadenf. belegt soft hart " "Gnadenf.\n" -#: warnquota.c:582 +#: warnquota.c:588 #, c-format msgid "Cannot wait for mailer: %s\n" msgstr "Kann nicht auf das Mailprogramm warten: %s\n" -#: warnquota.c:584 +#: warnquota.c:590 msgid "Warning: Mailer exitted abnormally.\n" msgstr "Warnung: Mailprogramm hat sich nicht korrekt beendet.\n" -#: warnquota.c:641 +#: warnquota.c:647 #, c-format msgid "" "Cannot open %s: %s\n" @@ -338,19 +345,19 @@ "Kann %s nicht öffnen: %s\n" "Werde Gerätenamen verwenden.\n" -#: warnquota.c:664 +#: warnquota.c:670 #, c-format msgid "Cannot parse line %d in quotatab (missing ':')\n" msgstr "Kann Zeile %d in Quotatabelle nicht verarbeiten (fehlender ':')\n" -#: warnquota.c:678 +#: warnquota.c:684 #, c-format msgid "Cannot stat device %s (maybe typo in quotatab)\n" msgstr "" "stat()-Aufruf für Gerät %s fehlgeschlagen (vielleicht ein Fehler in der " "Quotatabelle)\n" -#: warnquota.c:698 +#: warnquota.c:704 #, c-format msgid "" "Incorrect format string for variable %s.\n" @@ -359,36 +366,41 @@ "Ungültige Formatierungsanweisung für Variable %s.\n" "Nicht erkannter Ausdruck %%%c.\n" -#: warnquota.c:749 +#: warnquota.c:755 #, c-format msgid "Cannot open %s: %s\n" msgstr "Kann %s nicht öffnen: %s\n" -#: warnquota.c:769 +#: warnquota.c:775 #, c-format msgid "Line %d too long. Truncating.\n" msgstr "Zeile %d zu lang. Schneide sie ab.\n" -#: warnquota.c:835 +#: warnquota.c:841 #, c-format msgid "Cannot parse time at CC_BEFORE variable (line %d).\n" msgstr "Kann die Zeit bei CC_BEFORE-Variable nicht verarbeiten (Zeile %d).\n" -#: warnquota.c:885 +#: warnquota.c:891 #, c-format msgid "Error in config file (line %d), ignoring\n" msgstr "Fehler in Konfigurationsdatei (Zeile %d). Ignoriere.\n" -#: warnquota.c:888 +#: warnquota.c:894 #, c-format msgid "Possible error in config file (line %d), ignoring\n" msgstr "Möglicher Fehler in Konfigurationsdatei in Zeile %d. Ignoriere.\n" -#: warnquota.c:891 +#: warnquota.c:897 msgid "Unterminated last line, ignoring\n" msgstr "Fehlendes Zeilendendezeichen in der letzten Zeile. Ignoriere.\n" -#: warnquota.c:897 +#: warnquota.c:905 +#, c-format +msgid "Could not format LDAP URI because it's longer than %d bytes.\n" +msgstr "" + +#: warnquota.c:910 #, c-format msgid "" "LDAP library version >= 2.3 detected. Please use LDAP_URI instead of " @@ -399,22 +411,22 @@ "anstelle von Rechnername und Port.\n" "Generierte URI %s\n" -#: warnquota.c:919 +#: warnquota.c:932 #, c-format msgid "Cannot open file with group administrators: %s\n" msgstr "Kann Datei der Gruppenadministratoren nicht öffnen: %s\n" -#: warnquota.c:934 +#: warnquota.c:947 #, c-format msgid "Parse error at line %d. Cannot find end of group name.\n" msgstr "Einlesefehler in Zeile %d. Kann kein Ende des Gruppennamens finden.\n" -#: warnquota.c:943 +#: warnquota.c:956 #, c-format msgid "Parse error at line %d. Cannot find administrators name.\n" msgstr "Einlesefehler in Zeile %d. Kann Administratornamen nicht finden.\n" -#: warnquota.c:953 +#: warnquota.c:966 #, c-format msgid "" "Parse error at line %d. Trailing characters after administrators name.\n" @@ -422,7 +434,7 @@ "Einlesefehler in Zeile %d. Zusätzliche Zeichen nach dem " "Administratornamen.\n" -#: warnquota.c:1016 +#: warnquota.c:1029 #, fuzzy msgid "" "Usage:\n" @@ -431,8 +443,16 @@ "\n" "-u, --user warn users\n" "-g, --group warn groups\n" -"-s, --human-readable send information in more human friendly " -"units\n" +"-s, --human-readable[=units] display numbers in human friendly units " +"(MB,\n" +" GB, ...). Units can be also specified\n" +" explicitely by an optional argument in " +"format\n" +" [kgt],[kgt] where the first character " +"specifies\n" +" space units and the second character " +"specifies\n" +" inode units\n" "-i, --no-autofs avoid autofs mountpoints\n" "-d, --no-details do not send quota information itself\n" "-F, --format=formatname use quotafiles of specific format\n" @@ -463,7 +483,12 @@ "-v, --version Versionsinformationen anzeigen und beenden\n" "\n" -#: warnquota.c:1097 +#: warnquota.c:1102 repquota.c:134 quota.c:343 +#, c-format +msgid "Bad output format units for human readable output: %s\n" +msgstr "" + +#: warnquota.c:1119 #, c-format msgid "Cannot get host name: %s\n" msgstr "Kann Rechnernamen nicht bekommen: %s\n" @@ -613,21 +638,21 @@ "Ich denke, du solltest besser erst fsck laufen lassen !\n" "Beende...\n" -#: quotacheck.c:550 +#: quotacheck.c:551 #, c-format msgid "pushd %s/%s\n" msgstr "pushd %s/%s\n" -#: quotacheck.c:566 +#: quotacheck.c:567 #, c-format msgid "\tAdding %s size %lld ino %d links %d uid %u gid %u\n" msgstr "\tAdding %s size %lld ino %d links %d uid %u gid %u\n" -#: quotacheck.c:576 +#: quotacheck.c:577 msgid "Scanning stored directories from directory stack\n" msgstr "Scanne auf dem Verzeichnisstapel gespeicherte Verzeichnisse\n" -#: quotacheck.c:580 +#: quotacheck.c:581 #, c-format msgid "" "popd %s\n" @@ -636,17 +661,17 @@ "popd %s\n" "Entering directory %s\n" -#: quotacheck.c:592 +#: quotacheck.c:593 #, c-format msgid "Leaving %s\n" msgstr "Leaving %s\n" -#: quotacheck.c:632 +#: quotacheck.c:633 #, c-format msgid "Going to check %s quota file of %s\n" msgstr "Going to check %s quota file of %s\n" -#: quotacheck.c:638 +#: quotacheck.c:639 #, c-format msgid "" "Quota for %ss is enabled on mountpoint %s so quotacheck might damage the " @@ -655,17 +680,17 @@ "Quota für %ss ist am Mountpunkt %s aktiviert, dh. quotacheck könnte die " "Datei beschädigen.\n" -#: quotacheck.c:639 quotacheck.c:957 +#: quotacheck.c:640 quotacheck.c:967 #, fuzzy msgid "Should I continue?" msgstr "Soll ich fortsetzten" -#: quotacheck.c:640 quotacheck.c:958 +#: quotacheck.c:641 quotacheck.c:968 #, c-format msgid "As you wish... Canceling check of this file.\n" msgstr "WIe du wünschst... breche Prüfung dieser Datei ab.\n" -#: quotacheck.c:645 +#: quotacheck.c:646 #, c-format msgid "" "Quota for %ss is enabled on mountpoint %s so quotacheck might damage the " @@ -677,127 +702,127 @@ "Bitte deaktivieren Sie Quotas oder verwenden Sie -f, um die Prüfung zu " "erzwingen.\n" -#: quotacheck.c:652 +#: quotacheck.c:653 #, c-format msgid "Error while syncing quotas on %s: %s\n" msgstr "Fehler beim Syncen der Quotas auf Dateisystem %s: %s\n" -#: quotacheck.c:657 +#: quotacheck.c:658 #, c-format msgid "Cannot get quotafile name for %s\n" msgstr "Kann Quotadateinamen für %s nicht erhalten\n" -#: quotacheck.c:662 quotaio.c:150 quotasys.c:820 +#: quotacheck.c:663 quotaio.c:151 quotasys.c:843 #, c-format msgid "Cannot open quotafile %s: %s\n" msgstr "Kann Quotadatei nicht öffnen %s: %s\n" -#: quotacheck.c:702 +#: quotacheck.c:703 msgid "Renaming new files to proper names.\n" msgstr "Benenne neue Dateien mit letztendlichen Namen.\n" -#: quotacheck.c:704 +#: quotacheck.c:705 #, c-format msgid "Cannot get name of old quotafile on %s.\n" msgstr "Kann Namen der alten Quotadatei auf Dateisystem %s nicht bekommen.\n" -#: quotacheck.c:707 +#: quotacheck.c:708 msgid "Old file not found.\n" msgstr "Alte Datei nicht gefunden.\n" -#: quotacheck.c:710 +#: quotacheck.c:711 #, c-format msgid "Error while searching for old quota file %s: %s\n" msgstr "Fehler beim Suchen nach der alten Quotadatei %s: %s\n" -#: quotacheck.c:719 +#: quotacheck.c:720 msgid "Old file found removed during check!\n" msgstr "Die alte gefundene Datei wurde während der Prüfung entfernt!\n" -#: quotacheck.c:722 +#: quotacheck.c:723 #, c-format msgid "Error while opening old quota file %s: %s\n" msgstr "Fehler beim Öffnen der alten Quotadatei %s: %s\n" -#: quotacheck.c:728 +#: quotacheck.c:729 #, c-format msgid "EXT2_IOC_GETFLAGS failed: %s\n" msgstr "EXT2_IOC_GETFLAGS fehlgeschlagen: %s\n" -#: quotacheck.c:732 +#: quotacheck.c:733 #, c-format msgid "Quota file %s has IMMUTABLE flag set. Clearing.\n" msgstr "Quotadatei %s hat das IMMUTABLE-Flag gesetzt. Lösche es.\n" -#: quotacheck.c:735 +#: quotacheck.c:736 #, c-format msgid "Failed to remove IMMUTABLE flag from quota file %s: %s\n" msgstr "Konnte IMMUTABLE-Flag in der Quotadatei nicht löschen %s: %s\n" -#: quotacheck.c:744 +#: quotacheck.c:745 #, c-format msgid "Renaming old quotafile to %s~\n" msgstr "Benenne alte Quotadatei in %s~ um\n" -#: quotacheck.c:750 +#: quotacheck.c:751 #, c-format msgid "Name of quota file too long. Contact %s.\n" msgstr "Name der Quotadatei zu lang. Kontaktiere %s.\n" -#: quotacheck.c:752 +#: quotacheck.c:753 #, c-format msgid "Cannot rename old quotafile %s to %s: %s\n" msgstr "Kann alte Quotadatei %s nicht in %s umbenennen: %s\n" -#: quotacheck.c:758 +#: quotacheck.c:759 msgid "Renaming new quotafile\n" msgstr "Benenne neue Quotadatei um\n" -#: quotacheck.c:770 +#: quotacheck.c:771 #, c-format msgid "Cannot change permission of %s: %s\n" msgstr "Kann Zugriffsrechte von %s nicht ändern: %s\n" -#: quotacheck.c:777 +#: quotacheck.c:778 #, c-format msgid "Cannot open new quota file %s: %s\n" msgstr "Kann neue Quotadatei %s nicht öffnen: %s\n" -#: quotacheck.c:782 +#: quotacheck.c:783 #, c-format msgid "Warning: Cannot set EXT2 flags on %s: %s\n" msgstr "Warnung: Kann EXT2-Flags für %s nicht setzen: %s\n" -#: quotacheck.c:802 +#: quotacheck.c:803 #, c-format msgid "Dumping gathered data for %ss.\n" msgstr "Gebe gesammelte Daten für %ss aus.\n" -#: quotacheck.c:805 +#: quotacheck.c:806 #, fuzzy, c-format msgid "Cannot initialize IO on xfs/gfs2 quotafile: %s\n" msgstr "Kann IO für neue Quotadatei nicht initialisieren: %s\n" -#: quotacheck.c:811 +#: quotacheck.c:812 #, c-format msgid "Cannot initialize IO on new quotafile: %s\n" msgstr "Kann IO für neue Quotadatei nicht initialisieren: %s\n" -#: quotacheck.c:838 +#: quotacheck.c:839 #, c-format msgid "Cannot finish IO on new quotafile: %s\n" msgstr "Kann IO an neuer Quotadatei nicht beenden: %s\n" -#: quotacheck.c:841 +#: quotacheck.c:842 msgid "Data dumped.\n" msgstr "Daten ausgegeben.\n" -#: quotacheck.c:849 +#: quotacheck.c:850 #, c-format msgid "Cannot find checked quota file for %ss on %s!\n" msgstr "Kann geprüfte Quotadatei für %ss auf %s nicht finden!\n" -#: quotacheck.c:853 +#: quotacheck.c:854 #, c-format msgid "" "Cannot turn %s quotas off on %s: %s\n" @@ -806,7 +831,7 @@ "Kann Quotas vom Typ %s auf %s nicht deaktivieren: %s\n" "Der Kernel wird nichts von quotachecks Änderungen mitbekommen.\n" -#: quotacheck.c:866 +#: quotacheck.c:867 #, c-format msgid "" "Cannot turn %s quotas on on %s: %s\n" @@ -815,14 +840,14 @@ "Kann Quotas vom Typ %s auf %s nicht aktivieren: %s\n" "Der Kernel wird nichts von quotachecks Änderungen mitbekommen.\n" -#: quotacheck.c:892 +#: quotacheck.c:893 #, c-format msgid "Substracting space used by old %s quota file.\n" msgstr "" "Subtrahiere den Platz, den die alte Quotadatei für Quotas vom Typ %s " "verwendet.\n" -#: quotacheck.c:894 +#: quotacheck.c:895 #, fuzzy, c-format msgid "" "Old %s file name could not been determined. Usage will not be subtracted.\n" @@ -830,14 +855,14 @@ "Alte Quotadatei für Quotas vom Typ %s nicht gefunden. Verwendung wird nicht " "subtrahiert werden.\n" -#: quotacheck.c:899 +#: quotacheck.c:900 #, fuzzy, c-format msgid "Cannot stat old %s quota file %s: %s. Usage will not be subtracted.\n" msgstr "" "Alte Quotadatei für Quotas vom Typ %s nicht gefunden. Verwendung wird nicht " "subtrahiert werden.\n" -#: quotacheck.c:911 +#: quotacheck.c:912 #, c-format msgid "" "Quota structure for %s owning quota file not present! Something is really " @@ -846,22 +871,22 @@ "Quota-Datenstruktur in Quotadatei für Typ %s nicht vorhanden! Etwas ist " "wirklich nicht in Ordnung...\n" -#: quotacheck.c:916 +#: quotacheck.c:917 #, c-format msgid "Substracted %lu bytes.\n" msgstr "%lu Bytes subtrahiert.\n" -#: quotacheck.c:929 +#: quotacheck.c:931 #, c-format msgid "Cannot stat mountpoint %s: %s\n" msgstr "Kann stat() für Mountpunkt %s nicht aufrufen: %s\n" -#: quotacheck.c:931 +#: quotacheck.c:933 #, c-format msgid "Mountpoint %s is not a directory?!\n" msgstr "Mountpunkt %s ist kein Verzeichnis?!\n" -#: quotacheck.c:956 +#: quotacheck.c:966 #, c-format msgid "" "Cannot remount filesystem mounted on %s read-only. Counted values might not " @@ -870,7 +895,7 @@ "Kann das Dateisystem auf %s nicht als nur-lesbar ummounten. Gezählte Werte " "könnten falsch sein.\n" -#: quotacheck.c:964 +#: quotacheck.c:974 #, c-format msgid "" "Cannot remount filesystem mounted on %s read-only so counted values might " @@ -883,25 +908,25 @@ "Bitte beenden Sie alle Programme, die auf das Dateisystem schreiben oder " "verwenden Sie -m, um die Prüfung zu erzwingen.\n" -#: quotacheck.c:972 +#: quotacheck.c:982 msgid "Filesystem remounted read-only\n" msgstr "Dateisystem als nur-lesbar umgemountet\n" -#: quotacheck.c:975 +#: quotacheck.c:985 #, c-format msgid "Scanning %s [%s] " msgstr "Prüfe %s [%s] " -#: quotacheck.c:995 +#: quotacheck.c:1011 msgid "done\n" msgstr "fertig\n" -#: quotacheck.c:1004 +#: quotacheck.c:1020 #, c-format msgid "Checked %d directories and %d files\n" msgstr "%d Verzeichnisse und %d Dateien geprüft\n" -#: quotacheck.c:1008 +#: quotacheck.c:1024 #, c-format msgid "" "Cannot remount filesystem %s read-write. cannot write new quota files.\n" @@ -909,26 +934,26 @@ "Kann Dateisystem %s nicht als les- und schreibbar ummounten. Kann neue " "Quotadateien nicht schreiben.\n" -#: quotacheck.c:1009 +#: quotacheck.c:1025 msgid "Filesystem remounted RW.\n" msgstr "Dateisystem als les- und schreibbar umgemountet.\n" -#: quotacheck.c:1052 +#: quotacheck.c:1069 #, c-format msgid "Cannot find quota option on filesystem %s with quotas!\n" msgstr "Kann die Quotaoption auf dem Dateisystem %s mit Quotas nicht finden!\n" -#: quotacheck.c:1058 +#: quotacheck.c:1075 #, c-format msgid "Cannot detect quota format for journalled quota on %s\n" msgstr "Kann das Quotaformat für das Journalquota auf %s nicht feststellen\n" -#: quotacheck.c:1124 +#: quotacheck.c:1141 #, c-format msgid "Cannot get system info: %s\n" msgstr "Kann Syseminformationen nicht abrufen: %s\n" -#: quotacheck.c:1144 +#: quotacheck.c:1161 msgid "" "Your kernel probably supports journaled quota but you are not using it. " "Consider switching to journaled quota to avoid running quotacheck after an " @@ -938,16 +963,16 @@ "nicht. Vielleicht sollten Sie auf Journalquotas umsteigen, um nicht mehr " "quotacheck nach jedem unsauberen Herunterfahren ausführen zu müssen.\n" -#: quotacheck.c:1158 quotasys.c:910 +#: quotacheck.c:1175 quotasys.c:933 msgid "Cannot initialize mountpoint scan.\n" msgstr "Kann die Mountpunkt-Prüfung nicht initialisieren.\n" -#: quotacheck.c:1163 +#: quotacheck.c:1180 #, c-format msgid "Skipping %s [%s]\n" msgstr "Überspringe %s [%s]\n" -#: quotacheck.c:1180 +#: quotacheck.c:1197 #, c-format msgid "" "Cannot guess format from filename on %s. Please specify format on " @@ -956,12 +981,12 @@ "Kann das Format nicht aus dem Dateinamen auf Dateisystem %s ableiten. Bitte " "geben Sie das Format auf der Kommandozeile an.\n" -#: quotacheck.c:1185 +#: quotacheck.c:1202 #, c-format msgid "Detected quota format %s\n" msgstr "Quotaformat %s erkannt\n" -#: quotacheck.c:1206 +#: quotacheck.c:1223 msgid "" "Cannot find filesystem to check or filesystem not mounted with quota " "option.\n" @@ -969,7 +994,7 @@ "Kann kein Dateisystem zum Prüfen finden oder Dateisystem nicht mit der Quota-" "Option gemountet.\n" -#: quotacheck.c:1224 +#: quotacheck.c:1241 #, c-format msgid "" "Allocated %d bytes memory\n" @@ -980,57 +1005,57 @@ "%d Bytes freigegeben\n" "%d Bytes verloren\n" -#: quot.c:81 +#: quot.c:82 #, c-format msgid "Usage: %s [-acfugvViTq] [filesystem...]\n" msgstr "Verwendung: %s [-acfugvViTq] [Dateisystem...]\n" -#: quot.c:178 +#: quot.c:180 #, c-format msgid "%s (%s):\n" msgstr "%s (%s):\n" -#: quot.c:182 quot.c:186 +#: quot.c:184 quot.c:188 #, c-format msgid "%d\t%llu\t%llu\n" msgstr "%d\t%llu\t%llu\n" -#: quot.c:195 +#: quot.c:197 #, fuzzy, c-format msgid "%s (%s) %ss:\n" msgstr "%s (%s) %s:\n" -#: quot.c:203 quot.c:205 +#: quot.c:205 quot.c:207 #, c-format msgid "%8llu " msgstr "%8llu " -#: quot.c:208 +#: quot.c:210 #, c-format msgid "%s" msgstr "%s" -#: quot.c:210 +#: quot.c:212 #, c-format msgid "%-8.8s" msgstr "%-8.8s" -#: quot.c:212 +#: quot.c:214 #, c-format msgid "#%-7d" msgstr "#%-7d" -#: quot.c:214 +#: quot.c:216 #, c-format msgid " %8llu %8llu %8llu" msgstr " %8llu %8llu %8llu" -#: quot.c:362 +#: quot.c:364 #, c-format msgid "cannot open %s: %s\n" msgstr "Kann nicht öffnen %s: %s\n" -#: quot.c:382 +#: quot.c:384 #, c-format msgid "XFS_IOC_FSBULKSTAT ioctl failed: %s\n" msgstr "XFS_IOC_FSBULKSTAT ioctl-Aufruf fehlgeschlagen: %s\n" @@ -1078,20 +1103,20 @@ msgid "%s quota sync failed for %s: %s\n" msgstr "quotactl auf %s: %s\n" -#: quota.h:22 +#: quota.h:23 msgid "user" msgstr "" -#: quota.h:23 +#: quota.h:24 #, fuzzy msgid "group" msgstr "Gruppe" -#: quota.h:24 +#: quota.h:25 msgid "project" msgstr "" -#: quota.h:25 +#: quota.h:26 msgid "undefined" msgstr "" @@ -1169,126 +1194,131 @@ msgid "Cannot connect to system DBUS: %s\n" msgstr "Kann nicht zum System-DBUS verbinden: %s\n" -#: quota_nld.c:289 +#: quota_nld.c:292 #, c-format msgid "Failed to find tty of user %llu to report warning to.\n" msgstr "" "Konnte TTY von Nutzer %llu nicht finden, um eine Warnung dorthin " "auszugeben.\n" -#: quota_nld.c:294 +#: quota_nld.c:297 #, c-format msgid "Failed to open tty %s of user %llu to report warning.\n" msgstr "" "Konnte TTY %s von Nutzer %llu nicht öffnen, um eine Warnung auszugeben.\n" -#: quota_nld.c:300 +#: quota_nld.c:303 msgid "Warning" msgstr "Warnung" -#: quota_nld.c:303 +#: quota_nld.c:306 msgid "Error" msgstr "Fehler" -#: quota_nld.c:305 +#: quota_nld.c:308 msgid "Info" msgstr "Info" -#: quota_nld.c:308 +#: quota_nld.c:311 msgid "file limit reached" msgstr "Dateilimit erreicht" -#: quota_nld.c:311 +#: quota_nld.c:314 msgid "file quota exceeded too long" msgstr "Dateiquota zu lange überschritten" -#: quota_nld.c:314 +#: quota_nld.c:317 msgid "file quota exceeded" msgstr "Dateiquota überschritten" -#: quota_nld.c:317 +#: quota_nld.c:320 msgid "block limit reached" msgstr "Blocklimit erreicht" -#: quota_nld.c:320 +#: quota_nld.c:323 msgid "block quota exceeded too long" msgstr "Blockquota zu lange überschritten" -#: quota_nld.c:323 +#: quota_nld.c:326 msgid "block quota exceeded" msgstr "Blockquota überschritten" -#: quota_nld.c:326 +#: quota_nld.c:329 msgid "got below file limit" msgstr "Dateilimit unterschritten" -#: quota_nld.c:329 +#: quota_nld.c:332 msgid "got below file quota" msgstr "Dateiquota unterschritten" -#: quota_nld.c:332 +#: quota_nld.c:335 msgid "got below block limit" msgstr "Blocklimit unterschritten" -#: quota_nld.c:335 +#: quota_nld.c:338 msgid "got below block quota" msgstr "Blockquota unterschritten" -#: quota_nld.c:338 +#: quota_nld.c:341 msgid "unknown quota warning" msgstr "Unbekannte Block-Quota-Warnung" -#: quota_nld.c:342 +#: quota_nld.c:345 #, c-format msgid "Failed to write quota message for user %llu to %s: %s\n" msgstr "Konnte Quotanachricht für Nutzer %llu an %s nicht schreiben: %s\n" -#: quota_nld.c:355 +#: quota_nld.c:358 msgid "Cannot create DBUS message: No enough memory.\n" msgstr "Kann DBUS-Nachricht nicht erzeugen: Nicht genug Speicher.\n" -#: quota_nld.c:373 +#: quota_nld.c:376 msgid "Failed to write message to dbus: No enough memory.\n" msgstr "Konnte Nachricht nicht an DBUS schreiben: Nicht genug Speicher.\n" -#: quota_nld.c:389 +#: quota_nld.c:392 #, c-format msgid "Failed to read or parse quota netlink message: %s\n" msgstr "Konnte Quota-Netlink-Nachricht nicht lesen oder parsen: %s\n" -#: quota_nld.c:400 +#: quota_nld.c:403 msgid "Undefined program name.\n" msgstr "" -#: quota_nld.c:405 +#: quota_nld.c:408 #, fuzzy msgid "Not enough memory to build PID file name.\n" msgstr "Nicht genug Speicher.\n" -#: quota_nld.c:424 +#: quota_nld.c:427 #, fuzzy, c-format msgid "Could not open PID file '%s': %s\n" msgstr "Kann Datei nicht öffnen %s: %s\n" -#: quota_nld.c:430 +#: quota_nld.c:433 #, fuzzy, c-format msgid "Could not write daemon's PID into '%s'.\n" msgstr "Konnte keine Werte für %s bekommen.\n" -#: quota_nld.c:437 +#: quota_nld.c:440 #, fuzzy, c-format msgid "Could not close PID file '%s'.\n" msgstr "Konnte keine Werte für %s bekommen.\n" -#: quota_nld.c:467 +#: quota_nld.c:470 msgid "Could not register PID file removal on SIGTERM.\n" msgstr "" -#: quota_nld.c:469 +#: quota_nld.c:472 #, c-format msgid "Could not store my PID %jd.\n" msgstr "" +#: quota_nld.c:489 rquota_svc.c:537 +#, fuzzy, c-format +msgid "Failed to daemonize: %s\n" +msgstr "Konnte Quota nicht löschen: %s\n" + #: repquota.c:51 #, fuzzy, c-format msgid "" @@ -1297,24 +1327,31 @@ "%s [-vugsi] [-c|C] [-t|n] [-F quotaformat] [-O (default | xml | csv)] (-a | " "mntpoint)\n" "\n" -"-v, --verbose display also users/groups without any usage\n" -"-u, --user display information about users\n" -"-g, --group display information about groups\n" -"-P, --project display information about projects\n" -"-s, --human-readable show numbers in human friendly units (MB, " -"GB, ...)\n" -"-t, --truncate-names truncate names to 9 characters\n" -"-p, --raw-grace print grace time in seconds since epoch\n" -"-n, --no-names do not translate uid/gid to name\n" -"-i, --no-autofs avoid autofs mountpoints\n" -"-c, --cache translate big number of ids at once\n" -"-C, --no-cache translate ids one by one\n" -"-F, --format=formatname report information for specific format\n" -"-O, --output=format format output as xml or csv\n" -"-a, --all report information for all mount points with " -"quotas\n" -"-h, --help display this help message and exit\n" -"-V, --version display version information and exit\n" +"-v, --verbose display also users/groups without any usage\n" +"-u, --user display information about users\n" +"-g, --group display information about groups\n" +"-P, --project display information about projects\n" +"-s, --human-readable[=units] display numbers in human friendly units (MB, " +"GB,\n" +" ...). Units can be also specified explicitely " +"by\n" +" an optional argument in format [kgt],[kgt] " +"where\n" +" the first character specifies space units and " +"the\n" +" second character specifies inode units\n" +"-t, --truncate-names truncate names to 9 characters\n" +"-p, --raw-grace print grace time in seconds since epoch\n" +"-n, --no-names do not translate uid/gid to name\n" +"-i, --no-autofs avoid autofs mountpoints\n" +"-c, --cache translate big number of ids at once\n" +"-C, --no-cache translate ids one by one\n" +"-F, --format=formatname report information for specific format\n" +"-O, --output=format format output as xml or csv\n" +"-a, --all report information for all mount points with\n" +" quotas\n" +"-h, --help display this help message and exit\n" +"-V, --version display version information and exit\n" "\n" msgstr "" "Werkzeug zum Berichten von Quotas.\n" @@ -1340,52 +1377,52 @@ "-V, --version Zeige Versionsinformation und beende\n" "\n" -#: repquota.c:158 +#: repquota.c:167 msgid "Repquota cannot report through RPC calls.\n" msgstr "Repquota funktioniert nicht über RPC.\n" -#: repquota.c:162 +#: repquota.c:171 msgid "Specified both -n and -t but only one of them can be used.\n" msgstr "" "Sowohl -n als auch -t wurden angegeben, aber nur eines von beiden kann " "verwendet werden.\n" -#: repquota.c:366 +#: repquota.c:375 msgid "User" msgstr "Benutzer" -#: repquota.c:368 +#: repquota.c:377 msgid "Group" msgstr "Gruppe" -#: repquota.c:370 +#: repquota.c:379 msgid "Project" msgstr "" -#: repquota.c:373 +#: repquota.c:382 #, c-format msgid "*** Report for %s quotas on device %s\n" msgstr "*** Report für %s Quotas auf Gerät %s\n" -#: repquota.c:382 +#: repquota.c:391 msgid "Space" msgstr "Platz" -#: repquota.c:384 +#: repquota.c:393 msgid "Block" msgstr "Block" -#: repquota.c:385 +#: repquota.c:394 #, c-format msgid "Block grace time: %s; Inode grace time: %s\n" msgstr "Blockgnadenfrist: %s; Inodegnadenfrist: %s\n" -#: repquota.c:386 +#: repquota.c:395 #, c-format msgid " %s limits File limits\n" msgstr " %s Limits Dateilimits\n" -#: repquota.c:387 +#: repquota.c:396 #, c-format msgid "%-9s used soft hard grace used soft hard grace\n" msgstr "%-9s belegt weich hart Gnade belegt weich hart Gnade\n" @@ -1568,7 +1605,12 @@ msgid "WARNING - Quota file %s has corrupted headers\n" msgstr "WARNUNG - Quotadatei %s hat ungültige Kopfinformationen\n" -#: quotacheck_v2.c:362 +#: quotacheck_v2.c:361 +#, fuzzy +msgid "Continue checking assuming format from command line?" +msgstr "Prüfung unter Annahme der Version von der Kommandozeile fortsetzen?" + +#: quotacheck_v2.c:365 #, c-format msgid "" "Quota file format version %d does not match the one specified on command " @@ -1578,33 +1620,33 @@ "Kommandozeile angegeben wurde (%d). Quotadateikopf könnte inkonsistent " "sein.\n" -#: quotacheck_v2.c:366 +#: quotacheck_v2.c:370 msgid "Continue checking assuming version from command line?" msgstr "Prüfung unter Annahme der Version von der Kommandozeile fortsetzen?" -#: quotacheck_v2.c:372 +#: quotacheck_v2.c:376 msgid "Headers checked.\n" msgstr "Kopfinformationen geprüft.\n" -#: quotacheck_v2.c:388 +#: quotacheck_v2.c:392 #, c-format msgid "Do not know how to buffer format %d\n" msgstr "Ich weiß nicht, wie das Format %d zwischenzuspeichern ist\n" -#: quotacheck_v2.c:398 +#: quotacheck_v2.c:402 #, c-format msgid "Headers of file %s checked. Going to load data...\n" msgstr "Kopfinformationen von Datei %s geprüft. Lade Daten...\n" -#: quotacheck_v2.c:406 +#: quotacheck_v2.c:410 msgid "Cannot gather quota data. Tree root node corrupted.\n" msgstr "Kann Quotadaten nicht laden. Der Baumwurzelknoten ist zerstört.\n" -#: quotacheck_v2.c:414 +#: quotacheck_v2.c:418 msgid "WARNING - Some data might be changed due to corruption.\n" msgstr "WARNUNG - Einige Daten könnten wegen der Zerstörung geändert werden.\n" -#: quotacheck_v2.c:417 +#: quotacheck_v2.c:421 msgid "Not found any corrupted blocks. Congratulations.\n" msgstr "Keine zerstörten Blöcke gefunden. Gratulation.\n" @@ -1621,59 +1663,59 @@ msgstr "" "Es wurde das RPC-Quotaformat für ein Nicht-NFS-Dateisystemen angegeben.\n" -#: quotaio.c:84 +#: quotaio.c:85 msgid "Only XFS quota format is allowed on XFS filesystem.\n" msgstr "Nur das XFS-Quotaformat ist auf XFS-Dateisystemen erlaubt.\n" -#: quotaio.c:95 +#: quotaio.c:96 msgid "XFS quota allowed only on XFS filesystem.\n" msgstr "XFS-Quotaformat nur auf XFS-Dateisystemen erlaubt.\n" -#: quotaio.c:109 +#: quotaio.c:110 msgid "Quota not supported by the filesystem.\n" msgstr "Das Dateisystem unterstützt keine Quotas.\n" -#: quotaio.c:129 +#: quotaio.c:130 msgid "Cannot find any quota file to work on.\n" msgstr "Kann keine Quotadatei finden, um sie zu bearbeiten.\n" -#: quotaio.c:134 +#: quotaio.c:135 msgid "Quota file not found or has wrong format.\n" msgstr "Quotadatei nicht gefunden oder hat falsches Format.\n" -#: quotaio.c:144 +#: quotaio.c:145 #, c-format msgid "Cannot sync quotas on device %s: %s\n" msgstr "Kann Quotas auf Gerät %s nicht synchronisieren: %s\n" -#: quotaio.c:175 +#: quotaio.c:176 #, c-format msgid "Cannot initialize quota on %s: %s\n" msgstr "Kann Quotas auf %s nicht initialisieren: %s\n" -#: quotaio.c:202 +#: quotaio.c:203 #, c-format msgid "Creation of %s quota format is not supported.\n" msgstr "Erzeugung des %s-Quotaformats wird nicht unterstützt.\n" -#: quotaio.c:212 +#: quotaio.c:213 #, c-format msgid "" "Quota on %s is stored in system files and must be manipulated by fs tools.\n" msgstr "" -#: quotaio.c:222 +#: quotaio.c:223 #, c-format msgid "Cannot create new quotafile %s: %s\n" msgstr "Kann neue Quotadatei %s nicht anlegen: %s\n" -#: quotaio.c:296 +#: quotaio.c:297 #, fuzzy, c-format msgid "" "Trying to set quota limits out of range supported by quota format on %s.\n" msgstr "Versuche Quota in eine nur-lesbare Quotadatei auf %s zu schreiben\n" -#: quotaio.c:302 +#: quotaio.c:303 #, fuzzy, c-format msgid "" "Trying to set quota usage out of range supported by quota format on %s.\n" @@ -1715,7 +1757,7 @@ "Metadata init_io aufgerufen, obwohl Kernel die allgemeine Quotaschnittstelle " "nicht unterstützt!\n" -#: quotaio_rpc.c:76 quotaio_v1.c:308 quotaio_v2.c:464 +#: quotaio_rpc.c:77 quotaio_v1.c:278 quotaio_v2.c:464 #, c-format msgid "Trying to write quota to readonly quotafile on %s\n" msgstr "Versuche Quota in eine nur-lesbare Quotadatei auf %s zu schreiben\n" @@ -1777,7 +1819,7 @@ "wahrscheinlich defekt.\n" "Bitte lassen Sie quotacheck(8) laufen und versuchen Sie es nochmal.\n" -#: quotaio_v1.c:214 +#: quotaio_v1.c:184 #, c-format msgid "Trying to write info to readonly quotafile on %s.\n" msgstr "" @@ -1812,41 +1854,41 @@ "Enträge: %u\n" "Durchschnittlich verwendet: %f\n" -#: quotaio_xfs.c:260 +#: quotaio_xfs.c:265 #, c-format msgid "*** Status for %s quotas on device %s\n" msgstr "*** Status für %s-Quotas auf Gerät %s\n" -#: quotaio_xfs.c:262 quotaio_xfs.c:281 +#: quotaio_xfs.c:267 quotaio_xfs.c:286 msgid "ON" msgstr "AN" -#: quotaio_xfs.c:262 quotaio_xfs.c:281 +#: quotaio_xfs.c:267 quotaio_xfs.c:286 msgid "OFF" msgstr "AUS" -#: quotaio_xfs.c:264 quotaio_xfs.c:268 quotaio_xfs.c:272 +#: quotaio_xfs.c:269 quotaio_xfs.c:273 quotaio_xfs.c:277 #, c-format msgid "Accounting: %s; Enforcement: %s\n" msgstr "Kontierung: %s; Vollstreckung: %s\n" -#: quotaio_xfs.c:284 quotaio_xfs.c:288 quotaio_xfs.c:292 +#: quotaio_xfs.c:289 quotaio_xfs.c:293 quotaio_xfs.c:297 #, c-format msgid "Accounting [ondisk]: %s; Enforcement [ondisk]: %s\n" msgstr "" "Kontierung [auf Datenträger]: %s; Vollstreckung [auf Datenträger]: %s\n" -#: quotaio_xfs.c:301 quotaio_xfs.c:310 quotaio_xfs.c:323 +#: quotaio_xfs.c:306 quotaio_xfs.c:315 quotaio_xfs.c:328 #, c-format msgid "Inode: none\n" msgstr "Inode: keines\n" -#: quotaio_xfs.c:303 quotaio_xfs.c:312 quotaio_xfs.c:325 +#: quotaio_xfs.c:308 quotaio_xfs.c:317 quotaio_xfs.c:330 #, c-format msgid "Inode: #%llu (%llu blocks, %u extents)\n" msgstr "Inode: #%llu (%llu Blöcke, %u Extents)\n" -#: quotaon.c:67 +#: quotaon.c:37 #, fuzzy, c-format msgid "" "Usage:\n" @@ -1880,126 +1922,126 @@ "-h, --help zeige diesen Hilfetext und beende\n" "-V, --version zeige Versionsinformation und beende\n" -#: quotaon.c:81 +#: quotaon.c:51 msgid "turn quotas off for all filesystems" msgstr "" -#: quotaon.c:82 +#: quotaon.c:52 #, fuzzy msgid "turn quotas on for all filesystems" msgstr "XFS-Quotaformat nur auf XFS-Dateisystemen erlaubt.\n" -#: quotaon.c:147 +#: quotaon.c:117 msgid "Cannot turn on/off quotas via RPC.\n" msgstr "Kann Quotas via RPC nicht an-/ausschalten.\n" -#: quotaon.c:194 +#: quotaon.c:164 #, c-format msgid "set root_squash on %s: %s\n" msgstr "Setze root_squash auf %s: %s\n" -#: quotaon.c:198 +#: quotaon.c:168 #, c-format msgid "%s: %s root_squash turned off\n" msgstr "%s: %s root_squash abgeschalten\n" -#: quotaon.c:200 +#: quotaon.c:170 #, c-format msgid "%s: %s root_squash turned on\n" msgstr "%s: %s root_squash angeschalten\n" -#: quotaon.c:218 +#: quotaon.c:188 #, c-format msgid "quotactl on %s [%s]: %s\n" msgstr "quotactl auf %s [%s]: %s\n" -#: quotaon.c:221 +#: quotaon.c:191 #, c-format msgid "%s [%s]: %s quotas turned off\n" msgstr "%s [%s]: %s Quotas abgeschalten\n" -#: quotaon.c:234 +#: quotaon.c:204 #, c-format msgid "cannot find %s on %s [%s]\n" msgstr "Kann %s auf %s [%s] nicht finden\n" -#: quotaon.c:236 +#: quotaon.c:206 #, c-format msgid "using %s on %s [%s]: %s\n" msgstr "verwende %s auf %s [%s]: %s\n" -#: quotaon.c:238 +#: quotaon.c:208 msgid "Maybe create new quota files with quotacheck(8)?\n" msgstr "Vielleicht sollten Sie neue Quotadateien mit quotacheck(8) erzeugen?\n" -#: quotaon.c:240 +#: quotaon.c:210 msgid "Quota format not supported in kernel.\n" msgstr "Quotaformat wird vom Kernel nicht unterstützt.\n" -#: quotaon.c:243 +#: quotaon.c:213 #, c-format msgid "%s [%s]: %s quotas turned on\n" msgstr "%s [%s]: %s Quotas angeschalten\n" -#: quotaon.c:283 +#: quotaon.c:253 #, fuzzy msgid "Cannot change state of GFS2 quota.\n" msgstr "Kann Namen der Quotadatei im neuen Format nicht bekommen.\n" -#: quotaon.c:287 +#: quotaon.c:258 msgid "Cannot change state of XFS quota. It's not compiled in kernel.\n" msgstr "" "Kann Zustand des XFS-Quotas nicht ändern. Unterstützung dafür wurde nicht " "in den Kernel einkompiliert.\n" -#: quotaon.c:312 +#: quotaon.c:283 #, c-format msgid "Cannot find quota file on %s [%s] to turn quotas on/off.\n" msgstr "" "Kann Quotadatei auf %s [%s] nicht finden, um Quotas zu (de-)aktivieren.\n" -#: quotaon.c:317 +#: quotaon.c:288 #, c-format msgid "Quota file on %s [%s] does not exist or has wrong format.\n" msgstr "Quotadatei auf %s [%s] existiert nicht oder hat falsches Format.\n" -#: quotaon.c:346 quotaon.c:362 +#: quotaon.c:318 quotaon.c:334 msgid "off" msgstr "aus" -#: quotaon.c:348 +#: quotaon.c:320 #, fuzzy msgid "on (accounting)" msgstr "und -kontierung " -#: quotaon.c:350 +#: quotaon.c:322 msgid "on (enforced)" msgstr "" -#: quotaon.c:362 +#: quotaon.c:334 msgid "on" msgstr "an" -#: quotaon.c:364 +#: quotaon.c:336 #, c-format msgid "%s quota on %s (%s) is %s\n" msgstr "%s-Quota auf %s (%s) ist %s\n" -#: quotaon.c:381 +#: quotaon.c:353 #, c-format msgid "Name must be quotaon or quotaoff not %s\n" msgstr "Name muss entweder quotaon oder quotaoff sein, aber nicht %s\n" -#: quotaon.c:387 +#: quotaon.c:359 #, c-format msgid "Required format %s not supported by kernel.\n" msgstr "Erforderliches Format %s wird nicht vom Kernel unterstützt.\n" -#: quotaon.c:389 +#: quotaon.c:361 msgid "Warning: No quota format detected in the kernel.\n" msgstr "Warnung: Kein Quotaformat im Kernel festgestellt.\n" -#: quotaon.c:396 +#: quotaon.c:368 #, fuzzy, c-format msgid "%s: Quota cannot be turned on on NFS filesystem\n" msgstr "XFS-Quotaformat nur auf XFS-Dateisystemen erlaubt.\n" @@ -2113,81 +2155,81 @@ msgid "Invalid argument \"%s\"\n" msgstr "Ungültiges Argument \"%s\"\n" -#: quotaops.c:112 +#: quotaops.c:82 #, c-format msgid "%s (uid %d): Permission denied\n" msgstr "%s (Benutzer-Id %d): Zugriff verweigert\n" -#: quotaops.c:124 +#: quotaops.c:94 #, c-format msgid "%s (gid %d): gid set allocation (%d): %s\n" msgstr "%s (Gid %d): gid set Speicheranforderung (%d): %s\n" -#: quotaops.c:135 +#: quotaops.c:105 #, c-format msgid "%s (gid %d): error while trying getgroups(): %s\n" msgstr "%s (Gid %d): Fehler beim Aufruf von getgroups(): %s\n" -#: quotaops.c:146 +#: quotaops.c:116 #, c-format msgid "%s (gid %d): Permission denied\n" msgstr "%s (Gid %d): Zugriff verweigert\n" -#: quotaops.c:162 +#: quotaops.c:132 #, c-format msgid "error while getting quota from %s for %s (id %u): %s\n" msgstr "Fehler beim Holen der Quotas von %s für %s (Id %u): %s\n" -#: quotaops.c:187 +#: quotaops.c:157 #, c-format msgid "Cannot write quota for %u on %s: %s\n" msgstr "Kann Quota für %u auf %s nicht schreiben: %s\n" -#: quotaops.c:222 quotaops.c:224 +#: quotaops.c:192 quotaops.c:194 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s-Quota auf %s (%s) ist %s\n" -#: quotaops.c:238 +#: quotaops.c:208 msgid "Too many parameters to editor.\n" msgstr "Zu viele Parameter für den Editor.\n" -#: quotaops.c:246 +#: quotaops.c:216 #, c-format msgid "Cannot exec %s\n" msgstr "Kann 'exec %s nicht ausführen\n" -#: quotaops.c:263 +#: quotaops.c:233 #, fuzzy, c-format msgid "Cannot truncate a file: %s\n" msgstr "Kann Informationen über Quotadatei %s nicht abrufen: %s\n" -#: quotaops.c:265 +#: quotaops.c:235 #, fuzzy, c-format msgid "Cannot reset a file offset: %s\n" msgstr "Kann 'stat'-Datei %s nicht lesen: %s\n" -#: quotaops.c:267 +#: quotaops.c:237 #, fuzzy, c-format msgid "Cannot duplicate a file descriptor: %s\n" msgstr "Konnte Dateideskriptor nicht duplizieren: %s\n" -#: quotaops.c:269 +#: quotaops.c:239 #, fuzzy, c-format msgid "Cannot open a stream to write to: %s\n" msgstr "Kann temporäre Datei nicht neu öffnen: %s\n" -#: quotaops.c:270 +#: quotaops.c:240 #, fuzzy, c-format msgid "Cannot open a stream to read from: %s\n" msgstr "Kann temporäre Datei nicht neu öffnen: %s\n" -#: quotaops.c:286 +#: quotaops.c:256 #, c-format msgid "Disk quotas for %s %s (%cid %d):\n" msgstr "Datenträgerquotas für %s %s (%cid %d):\n" -#: quotaops.c:290 +#: quotaops.c:260 #, c-format msgid "" " Filesystem blocks soft hard inodes " @@ -2196,21 +2238,21 @@ " Dateisystem Blöcke weich hart Inodes " "weich hart\n" -#: quotaops.c:323 +#: quotaops.c:293 #, c-format msgid "WARNING - %s: cannot change current block allocation\n" msgstr "WARNUNG - %s: Kann aktuelle Blockbelegung nicht ändern\n" -#: quotaops.c:326 +#: quotaops.c:296 #, c-format msgid "WARNING - %s: cannot change current inode allocation\n" msgstr "WARNUNG - %s: Kann aktuelle Inodebelegung nicht ändern\n" -#: quotaops.c:352 +#: quotaops.c:322 msgid "Bad format: two title lines assumed\n" msgstr "" -#: quotaops.c:363 +#: quotaops.c:333 #, c-format msgid "" "Bad format:\n" @@ -2219,48 +2261,48 @@ "Falsches Format:\n" "%s\n" -#: quotaops.c:369 +#: quotaops.c:339 #, fuzzy, c-format msgid "Bad block usage: %s: %s\n" msgstr "Fehlerhafte Angabe für %s: %s\n" -#: quotaops.c:376 +#: quotaops.c:346 #, fuzzy, c-format msgid "Bad block soft limit: %s: %s\n" msgstr "weiches Blocklimit" -#: quotaops.c:383 +#: quotaops.c:353 #, fuzzy, c-format msgid "Bad block hard limit: %s: %s\n" msgstr "hartes Blocklimit" -#: quotaops.c:390 +#: quotaops.c:360 #, fuzzy, c-format msgid "Bad inode usage: %s: %s\n" msgstr "Fehlerhafte Angabe für %s: %s\n" -#: quotaops.c:397 +#: quotaops.c:367 #, fuzzy, c-format msgid "Bad inode soft limit: %s: %s\n" msgstr "weiches Inodelimit" -#: quotaops.c:404 +#: quotaops.c:374 #, fuzzy, c-format msgid "Bad inode hard limit: %s: %s\n" msgstr "hartes Inodelimit" -#: quotaops.c:457 +#: quotaops.c:427 #, c-format msgid "Times to enforce softlimit for %s %s (%cid %d):\n" msgstr "" "Gnadenfristen, bis weiche Limits durchgesetzt werden für %s %s (%cid %d):\n" -#: quotaops.c:459 quotaops.c:562 +#: quotaops.c:429 quotaops.c:532 #, c-format msgid "Time units may be: days, hours, minutes, or seconds\n" msgstr "Zeiteinheiten dürfen sein: days, hours, minutes, oder seconds\n" -#: quotaops.c:461 +#: quotaops.c:431 #, c-format msgid "" " Filesystem block grace inode grace\n" @@ -2268,25 +2310,25 @@ " Dateisystem Blockgnadenfrist " "Inodegnadenfrist\n" -#: quotaops.c:466 quotaops.c:472 quotaops.c:517 quotaops.c:530 setquota.c:288 +#: quotaops.c:436 quotaops.c:442 quotaops.c:487 quotaops.c:500 setquota.c:288 #: setquota.c:294 msgid "unset" msgstr "nicht festgelegt" -#: quotaops.c:468 quotaops.c:474 +#: quotaops.c:438 quotaops.c:444 msgid "0seconds" msgstr "0seconds" -#: quotaops.c:470 quotaops.c:476 quotasys.c:503 +#: quotaops.c:440 quotaops.c:446 quotasys.c:503 #, c-format msgid "%useconds" msgstr "%useconds" -#: quotaops.c:503 quotaops.c:602 +#: quotaops.c:473 quotaops.c:572 msgid "Bad format: three title lines assumed\n" msgstr "" -#: quotaops.c:513 quotaops.c:610 +#: quotaops.c:483 quotaops.c:580 #, c-format msgid "" "bad format:\n" @@ -2295,18 +2337,18 @@ "falsches Format:\n" "%s\n" -#: quotaops.c:524 quotaops.c:616 +#: quotaops.c:494 quotaops.c:586 msgid "Bad time units. Units are 'second', 'minute', 'hour', and 'day'.\n" msgstr "" "Fehlerhafte Zeiteinheiten. Einheiten sind 'second', 'minute', 'hour' und " "'day'.\n" -#: quotaops.c:560 +#: quotaops.c:530 #, c-format msgid "Grace period before enforcing soft limits for %ss:\n" msgstr "Gnadenfrist bevor die weichen Limits durchgesetzt werden für %ss:\n" -#: quotaops.c:563 +#: quotaops.c:533 #, c-format msgid " Filesystem Block grace period Inode grace period\n" msgstr " Dateisystem Blockgnadenfrist Inodegnadenfrist\n" @@ -2454,7 +2496,7 @@ "-V, --version Zeige Versionsinformationen und beende\n" "\n" -#: setquota.c:84 edquota.c:104 quota.c:114 +#: setquota.c:84 edquota.c:104 quota.c:90 #, c-format msgid "Bugs to: %s\n" msgstr "Fehler an: %s\n" @@ -2648,7 +2690,7 @@ " xml - simple XML\n" msgstr "" -#: quotasys.c:459 quota.c:297 +#: quotasys.c:459 quota.c:278 msgid "none" msgstr "kein" @@ -2717,116 +2759,116 @@ msgid "days" msgstr "%ddays" -#: quotasys.c:573 +#: quotasys.c:582 msgid "Integer overflow while parsing space number." msgstr "" -#: quotasys.c:575 +#: quotasys.c:584 msgid "K" msgstr "" -#: quotasys.c:577 +#: quotasys.c:586 msgid "M" msgstr "" -#: quotasys.c:579 +#: quotasys.c:588 msgid "G" msgstr "" -#: quotasys.c:581 +#: quotasys.c:590 msgid "T" msgstr "" -#: quotasys.c:584 +#: quotasys.c:593 msgid "Unknown space binary unit. Valid units are K, M, G, T." msgstr "" -#: quotasys.c:588 +#: quotasys.c:597 msgid "Integer overflow while interpreting space unit." msgstr "" -#: quotasys.c:628 +#: quotasys.c:650 msgid "Integer overflow while parsing number." msgstr "" -#: quotasys.c:632 +#: quotasys.c:654 msgid "k" msgstr "" -#: quotasys.c:634 +#: quotasys.c:656 msgid "m" msgstr "" -#: quotasys.c:636 +#: quotasys.c:658 msgid "g" msgstr "" -#: quotasys.c:638 +#: quotasys.c:660 msgid "t" msgstr "" -#: quotasys.c:641 +#: quotasys.c:663 msgid "Unknown decimal unit. Valid units are k, m, g, t." msgstr "" -#: quotasys.c:645 +#: quotasys.c:667 msgid "Integer overflow while interpreting decimal unit." msgstr "" -#: quotasys.c:803 +#: quotasys.c:826 #, c-format msgid "Cannot stat quota file %s: %s\n" msgstr "Kann Informationen über Quotadatei %s nicht abrufen: %s\n" -#: quotasys.c:949 +#: quotasys.c:974 msgid "Not all specified mountpoints are using quota.\n" msgstr "Nicht alle angegebenen Mountpunkte verwenden Quotas.\n" -#: quotasys.c:963 +#: quotasys.c:988 #, c-format msgid "Error while releasing file on %s\n" msgstr "Fehler bei Dateifreigabe auf %s\n" -#: quotasys.c:1022 +#: quotasys.c:1047 #, c-format msgid "Cannot create set for sigaction(): %s\n" msgstr "Kann Menge für sigaction() nicht erzeugen: %s\n" -#: quotasys.c:1025 +#: quotasys.c:1050 #, c-format msgid "Cannot set signal handler: %s\n" msgstr "Kann Signalbehandler nicht setzen: %s\n" -#: quotasys.c:1080 +#: quotasys.c:1106 #, c-format msgid "Cannot reset signal handler: %s\n" msgstr "Kann Signalbehandler nicht zurücksetzen: %s\n" -#: quotasys.c:1235 +#: quotasys.c:1261 msgid "Cannot open any file with mount points.\n" msgstr "Kann keine Datei mit Einhängepunkten öffnen.\n" -#: quotasys.c:1253 +#: quotasys.c:1279 #, c-format msgid "Cannot get device name for %s\n" msgstr "Kann Gerätenamen für %s nicht bekommen\n" -#: quotasys.c:1313 +#: quotasys.c:1339 #, c-format msgid "Cannot resolve mountpoint path %s: %s\n" msgstr "Kann Mountpunkt-Pfad %s nicht auflösen: %s\n" -#: quotasys.c:1319 +#: quotasys.c:1345 #, c-format msgid "Cannot statfs() %s: %s\n" msgstr "statfs() für %s fehlgeschlagen: %s\n" -#: quotasys.c:1331 +#: quotasys.c:1357 #, c-format msgid "Cannot stat() mounted device %s: %s\n" msgstr "stat() für eingebundenes Gerät %s fehlgeschlagen: %s\n" -#: quotasys.c:1336 +#: quotasys.c:1362 #, c-format msgid "" "Device (%s) filesystem is mounted on unsupported device type. Skipping.\n" @@ -2834,12 +2876,12 @@ "Gerät (%s): Dateisystem ist auf einem nicht unterstützten Gerätetyp " "eingehängt. Überspringe.\n" -#: quotasys.c:1346 +#: quotasys.c:1372 #, c-format msgid "Cannot stat() mountpoint %s: %s\n" msgstr "stat() für Einhängepunkt %s fehlgeschlagen: %s\n" -#: quotasys.c:1415 +#: quotasys.c:1441 #, c-format msgid "" "Cannot find a device with %s.\n" @@ -2848,7 +2890,7 @@ "Kann kein Gerät mit %s finden.\n" "Überspringe...\n" -#: quotasys.c:1419 +#: quotasys.c:1445 #, c-format msgid "" "Cannot stat() a mountpoint with %s: %s\n" @@ -2857,7 +2899,7 @@ "stat() für Einhängepunkt %s fehlgeschlagen: %s\n" "Überspringe...\n" -#: quotasys.c:1427 +#: quotasys.c:1453 #, c-format msgid "" "Cannot stat() given mountpoint %s: %s\n" @@ -2866,31 +2908,31 @@ "stat() für Einhängepunkt %s fehlgeschlagen: %s\n" "Überspringe...\n" -#: quotasys.c:1437 +#: quotasys.c:1463 #, c-format msgid "Cannot find a filesystem mountpoint for directory %s\n" msgstr "Kann keinen Dateisystem-Einhängepunkt für Verzeichnis %s finden\n" -#: quotasys.c:1443 +#: quotasys.c:1469 #, c-format msgid "Cannot resolve path %s: %s\n" msgstr "Kann Pfad %s nicht auflösen: %s\n" -#: quotasys.c:1454 +#: quotasys.c:1480 #, c-format msgid "Cannot find mountpoint for device %s\n" msgstr "Kann Einhängepunkt für Gerät %s nicht finden\n" -#: quotasys.c:1460 +#: quotasys.c:1486 #, c-format msgid "Specified path %s is not directory nor device.\n" msgstr "Angegebener Pfad %s ist weder ein Verzeichnis noch ein Gerät.\n" -#: quotasys.c:1468 +#: quotasys.c:1494 msgid "No correct mountpoint specified.\n" msgstr "Es wurde kein korrekter Einhängepunkt angegeben.\n" -#: quotasys.c:1523 +#: quotasys.c:1549 #, c-format msgid "Mountpoint (or device) %s not found or has no quota enabled.\n" msgstr "" @@ -3012,7 +3054,7 @@ msgid "Unable to register (RQUOTAPROG, EXT_RQUOTAVERS, %s).\n" msgstr "Registrierung fehlgeschlagen (RQUOTAPROG, EXT_RQUOTAVERS, udp).\n" -#: rquota_svc.c:539 +#: rquota_svc.c:542 msgid "svc_run returned\n" msgstr "svc_run ist zurückgekehrt\n" @@ -3067,66 +3109,76 @@ msgid "Error creating socket: %s\n" msgstr "Konnte Socket nicht erzeugen: %s\n" -#: svc_socket.c:122 +#: svc_socket.c:124 +#, fuzzy, c-format +msgid "Cannot set IPv6 socket options: %s\n" +msgstr "Konnte Socketoptionen nicht setzen: %s\n" + +#: svc_socket.c:131 #, c-format msgid "Cannot set socket options: %s\n" msgstr "Konnte Socketoptionen nicht setzen: %s\n" -#: svc_socket.c:128 +#: svc_socket.c:137 #, fuzzy, c-format msgid "Cannot bind to address: %s\n" msgstr "Kinnd bind-Operation zu gegebener Adresse nicht ausführen: %s\n" +#: svc_socket.c:144 +#, fuzzy, c-format +msgid "Cannot listen to address: %s\n" +msgstr "Kinnd bind-Operation zu gegebener Adresse nicht ausführen: %s\n" + #: xqmstats.c:32 xqmstats.c:37 msgid "The running kernel does not support XFS\n" msgstr "Der laufende Kernel unterstützt kein XFS.\n" -#: xqmstats.c:49 +#: xqmstats.c:50 #, c-format msgid "XFS Quota Manager dquot statistics\n" msgstr "XFS-Quota-Manager dquot-Statistiken\n" -#: xqmstats.c:50 +#: xqmstats.c:51 #, c-format msgid " reclaims: %u\n" msgstr " reclaims: %u\n" -#: xqmstats.c:51 +#: xqmstats.c:52 #, c-format msgid " missed reclaims: %u\n" msgstr " missed reclaims: %u\n" -#: xqmstats.c:52 +#: xqmstats.c:53 #, c-format msgid " dquot dups: %u\n" msgstr " dquot dups: %u\n" -#: xqmstats.c:53 +#: xqmstats.c:54 #, c-format msgid " cache misses: %u\n" msgstr " cache misses: %u\n" -#: xqmstats.c:54 +#: xqmstats.c:55 #, c-format msgid " cache hits: %u\n" msgstr " cache hits: %u\n" -#: xqmstats.c:55 +#: xqmstats.c:56 #, c-format msgid " dquot wants: %u\n" msgstr " dquot wants: %u\n" -#: xqmstats.c:56 +#: xqmstats.c:57 #, c-format msgid " shake reclaims: %u\n" msgstr " shake reclaims: %u\n" -#: xqmstats.c:57 +#: xqmstats.c:58 #, c-format msgid " inact reclaims: %u\n" msgstr " inact reclaims: %u\n" -#: xqmstats.c:62 +#: xqmstats.c:63 #, c-format msgid "Maximum %u dquots (currently %u incore, %u on freelist)\n" msgstr "Maximum %u dquots (currently %u incore, %u on freelist)\n" @@ -3287,54 +3339,63 @@ msgid "Cannot read quotas from file.\n" msgstr "Kann Quotas nicht aus Datei lesen.\n" -#: quota.c:87 +#: quota.c:58 #, fuzzy msgid "Usage: quota [-guPqvswim] [-l | [-Q | -A]] [-F quotaformat]\n" msgstr "Verwendung: quota [-guqvswim] [-l | [-Q | -A]] [-F quotaformat]\n" -#: quota.c:88 +#: quota.c:59 msgid "\tquota [-qvswim] [-l | [-Q | -A]] [-F quotaformat] -u username ...\n" msgstr "" "\tquota [-qvswim] [-l | [-Q | -A]] [-F Quotaformat] -u Benutzername ...\n" -#: quota.c:89 +#: quota.c:60 msgid "\tquota [-qvswim] [-l | [-Q | -A]] [-F quotaformat] -g groupname ...\n" msgstr "" "\tquota [-qvswim] [-l | [-Q | -A]] [-F Quotaformat] -g Gruppenname ...\n" -#: quota.c:90 +#: quota.c:61 #, fuzzy msgid "\tquota [-qvswugPQm] [-F quotaformat] -f filesystem ...\n" msgstr "\tquota [-qvswugQm] [-F Quotaformat] -f Dateisystem ...\n" -#: quota.c:91 +#: quota.c:62 #, fuzzy msgid "" "\n" -"-u, --user display quota for user\n" -"-g, --group display quota for group\n" -"-P, --project display quota for project\n" -"-q, --quiet print more terse message\n" -"-v, --verbose print more verbose message\n" -"-s, --human-readable display numbers in human friendly units (MB, " -"GB...)\n" -" --always-resolve always try to translate name to id, even if it is\n" -"\t\t\t composed of only digits\n" -"-w, --no-wrap do not wrap long lines\n" -"-p, --raw-grace print grace time in seconds since epoch\n" -"-l, --local-only do not query NFS filesystems\n" -"-Q, --quiet-refuse do not print error message when NFS server does\n" -" not respond\n" -"-i, --no-autofs do not query autofs mountpoints\n" -"-F, --format=formatname display quota of a specific format\n" -"-f, --filesystem-list display quota information only for given " -"filesystems\n" -"-A, --all-nfs display quota for all NFS mountpoints\n" -"-m, --no-mixed-pathnames trim leading slashes from NFSv4 mountpoints\n" -" --show-mntpoint show mount point of the file system in output\n" -" --hide-device do not show file system device in output\n" -"-h, --help display this help message and exit\n" -"-V, --version display version information and exit\n" +"-u, --user display quota for user\n" +"-g, --group display quota for group\n" +"-P, --project display quota for project\n" +"-q, --quiet print more terse message\n" +"-v, --verbose print more verbose message\n" +"-s, --human-readable[=units] display numbers in human friendly units (MB, " +"GB,\n" +" ...). Units can be also specified explicitely " +"by\n" +" an optional argument in format [kgt],[kgt] " +"where\n" +" the first character specifies space units and " +"the\n" +" second character specifies inode units\n" +" --always-resolve always try to translate name to id, even if it " +"is\n" +"\t\t\t composed of only digits\n" +"-w, --no-wrap do not wrap long lines\n" +"-p, --raw-grace print grace time in seconds since epoch\n" +"-l, --local-only do not query NFS filesystems\n" +"-Q, --quiet-refuse do not print error message when NFS server " +"does\n" +" not respond\n" +"-i, --no-autofs do not query autofs mountpoints\n" +"-F, --format=formatname display quota of a specific format\n" +"-f, --filesystem-list display quota information only for given\n" +" filesystems\n" +"-A, --all-nfs display quota for all NFS mountpoints\n" +"-m, --no-mixed-pathnames trim leading slashes from NFSv4 mountpoints\n" +" --show-mntpoint show mount point of the file system in output\n" +" --hide-device do not show file system device in output\n" +"-h, --help display this help message and exit\n" +"-V, --version display version information and exit\n" "\n" msgstr "" "\n" @@ -3363,93 +3424,97 @@ "-V, --version Versionsinformation ausgeben und beenden\n" "\n" -#: quota.c:123 +#: quota.c:99 msgid "space" msgstr "Platz" -#: quota.c:125 +#: quota.c:101 msgid "blocks" msgstr "Blöcke" -#: quota.c:127 +#: quota.c:103 #, c-format msgid "Disk quotas for %s %s (%cid %u): %s\n" msgstr "Dateisystemquotas für %s %s (%cid %u): %s\n" -#: quota.c:130 +#: quota.c:106 msgid "Filesystem" msgstr "Dateisystem" -#: quota.c:131 quota.c:132 +#: quota.c:107 quota.c:108 msgid "quota" msgstr "Quota" -#: quota.c:131 quota.c:132 +#: quota.c:107 quota.c:108 msgid "limit" msgstr "Limit" -#: quota.c:131 quota.c:132 +#: quota.c:107 quota.c:108 msgid "grace" msgstr "Gnadenfrist" -#: quota.c:132 +#: quota.c:108 msgid "files" msgstr "Dateien" -#: quota.c:208 +#: quota.c:189 msgid "File limit reached on" msgstr "Dateilimit erreicht auf" -#: quota.c:214 +#: quota.c:195 msgid "In file grace period on" msgstr "In der Dateignadenfrist auf" -#: quota.c:218 +#: quota.c:199 msgid "Over file quota on" msgstr "Über dem Dateiquota auf" -#: quota.c:224 +#: quota.c:205 msgid "Block limit reached on" msgstr "Blocklimit erreicht auf" -#: quota.c:230 +#: quota.c:211 msgid "In block grace period on" msgstr "In der Blockgnadenfrist auf" -#: quota.c:234 +#: quota.c:215 msgid "Over block quota on" msgstr "Über dem Blockquota auf" -#: quota.c:408 +#: quota.c:278 +msgid "no limited resources used" +msgstr "" + +#: quota.c:393 #, c-format msgid "Warning: Ignoring -%c when filesystem list specified.\n" msgstr "Warnung: Ignoriere -%c, wenn eine Dateisystemliste angegeben wurde.\n" -#: quota.c:415 +#: quota.c:400 msgid "No filesystem specified.\n" msgstr "Kein Dateisystem angegeben.\n" -#: quota.c:423 +#: quota.c:408 #, c-format msgid "Gid set allocation (%d): %s\n" msgstr "Gid-set-Speicheranforderung (ngroups=%d): %s\n" -#: quota.c:429 +#: quota.c:414 #, c-format msgid "getgroups(): %s\n" msgstr "getgroups(): %s\n" -#: quota.c:434 +#: quota.c:419 #, fuzzy msgid "Project reports not supported without project name\n" msgstr "Quotaformat wird vom Kernel nicht unterstützt.\n" -#: common.c:124 +#: common.c:125 #, c-format msgid "Quota utilities version %s.\n" msgstr "Quota-Hilfsprogramme Version %s.\n" -#: common.c:125 +#: common.c:126 #, c-format msgid "Compiled with:%s\n" msgstr "Compiliert mit:%s\n" Binary files /tmp/tmpeemP7p/v7BeTqs21S/quota-4.04/po/fr.gmo and /tmp/tmpeemP7p/VdYLEKvDrH/quota-4.05/po/fr.gmo differ diff -Nru quota-4.04/po/fr.po quota-4.05/po/fr.po --- quota-4.04/po/fr.po 2017-09-05 14:53:15.000000000 +0000 +++ quota-4.05/po/fr.po 2019-03-29 10:53:18.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: 1\n" "Report-Msgid-Bugs-To: jack@suse.cz\n" -"POT-Creation-Date: 2017-09-05 16:53+0200\n" +"POT-Creation-Date: 2019-03-29 11:53+0100\n" "PO-Revision-Date: 2003-02-21 22:43+0100\n" "Last-Translator: Jrme Schell \n" "Language-Team: French \n" @@ -15,12 +15,12 @@ "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: bylabel.c:253 +#: bylabel.c:274 #, c-format msgid "Found an invalid UUID: %s\n" msgstr "UUID invalide trouv : %s\n" -#: bylabel.c:273 +#: bylabel.c:294 #, c-format msgid "Error checking device name: %s\n" msgstr "Erreur vrification nom de priphrique : %s\n" @@ -41,8 +41,8 @@ "\n" msgstr "" -#: convertquota.c:48 warnquota.c:1028 quotacheck.c:314 repquota.c:68 -#: common.c:126 +#: convertquota.c:48 warnquota.c:1046 quotacheck.c:314 repquota.c:73 +#: common.c:127 #, c-format msgid "Bugs to %s\n" msgstr "Rapports de bugs %s\n" @@ -51,8 +51,8 @@ msgid "You have to specify source and target format of conversion.\n" msgstr "" -#: convertquota.c:112 quotacheck.c:400 quotasync.c:88 repquota.c:154 -#: quotaon.c:143 setquota.c:264 +#: convertquota.c:112 quotacheck.c:400 quotasync.c:88 repquota.c:163 +#: quotaon.c:113 setquota.c:264 msgid "Bad number of arguments.\n" msgstr "Mauvais nombre d'arguments.\n" @@ -92,7 +92,7 @@ msgid "Cannot get name of new quotafile.\n" msgstr "Impossible d'obtenir le nom du nouveau fichier de quotas.\n" -#: convertquota.c:302 quotacheck.c:764 +#: convertquota.c:302 quotacheck.c:765 #, c-format msgid "Cannot rename new quotafile %s to name %s: %s\n" msgstr "Impossible de renommer le nouveau fichier de quotas %s en %s : %s\n" @@ -113,7 +113,7 @@ msgid "Cannot open old quota file on %s: %s\n" msgstr "Impossible d'ouvrir l'ancien fichier de quotas sur %s : %s\n" -#: convertquota.c:380 +#: convertquota.c:381 msgid "Unknown action should be performed.\n" msgstr "Une action inconnue doit tre excute.\n" @@ -252,39 +252,46 @@ msgid "Could not setup ldap connection.\n" msgstr "" -#: warnquota.c:422 +#: warnquota.c:417 +#, c-format +msgid "" +"Could not format LDAP search filter for %s user and %s search attribute due " +"to excessive length.\n" +msgstr "" + +#: warnquota.c:428 #, fuzzy, c-format msgid "Error with %s.\n" msgstr "Erreur lors de la modification des quotas.\n" -#: warnquota.c:423 +#: warnquota.c:429 #, c-format msgid "ldap_search_ext_s() failed: %s\n" msgstr "" -#: warnquota.c:429 +#: warnquota.c:435 #, c-format msgid "Multiple entries found for client %s (%d).\n" msgstr "" -#: warnquota.c:433 +#: warnquota.c:439 #, c-format msgid "Entry not found for client %s.\n" msgstr "" -#: warnquota.c:443 +#: warnquota.c:449 #, fuzzy, c-format msgid "Could not get values for %s.\n" msgstr "Impossible d'obtenir le nom de priphrique pour %s\n" -#: warnquota.c:489 +#: warnquota.c:495 #, c-format msgid "Administrator for a group %s not found. Cancelling mail.\n" msgstr "" "Administrateur pour le groupe %s non trouv. Abandon de l'envoi du " "courrier.\n" -#: warnquota.c:541 +#: warnquota.c:547 #, c-format msgid "" "\n" @@ -293,7 +300,7 @@ "\n" " Limites bloc Limites fichiers\n" -#: warnquota.c:542 +#: warnquota.c:548 #, c-format msgid "" "Filesystem used soft hard grace used soft hard grace\n" @@ -301,17 +308,17 @@ "Systme fichiers utilis souple stricte sursis utilis souple stricte " "sursis\n" -#: warnquota.c:582 +#: warnquota.c:588 #, fuzzy, c-format msgid "Cannot wait for mailer: %s\n" msgstr "Impossible d'attendre le client de messagerie : %s\n" -#: warnquota.c:584 +#: warnquota.c:590 msgid "Warning: Mailer exitted abnormally.\n" msgstr "" "Attention : le client de messagerie s'est termin de manire inattendue.\n" -#: warnquota.c:641 +#: warnquota.c:647 #, fuzzy, c-format msgid "" "Cannot open %s: %s\n" @@ -320,55 +327,60 @@ "Impossible d'ouvrir %s : %s\n" "Utilisation des noms de priphriques.\n" -#: warnquota.c:664 +#: warnquota.c:670 #, fuzzy, c-format msgid "Cannot parse line %d in quotatab (missing ':')\n" msgstr "Impossible d'analyser la ligne %d dans quotatab (il manque : )\n" -#: warnquota.c:678 +#: warnquota.c:684 #, fuzzy, c-format msgid "Cannot stat device %s (maybe typo in quotatab)\n" msgstr "" "Impossible d'excuter stat() sur le priphrique %s (erreur de syntaxe dans " "quotatab ?)\n" -#: warnquota.c:698 +#: warnquota.c:704 #, c-format msgid "" "Incorrect format string for variable %s.\n" "Unrecognized expression %%%c.\n" msgstr "" -#: warnquota.c:749 +#: warnquota.c:755 #, fuzzy, c-format msgid "Cannot open %s: %s\n" msgstr "Impossible d'ouvrir %s : %s\n" -#: warnquota.c:769 +#: warnquota.c:775 #, c-format msgid "Line %d too long. Truncating.\n" msgstr "Ligne %d trop longue. Tronque.\n" -#: warnquota.c:835 +#: warnquota.c:841 #, c-format msgid "Cannot parse time at CC_BEFORE variable (line %d).\n" msgstr "" -#: warnquota.c:885 +#: warnquota.c:891 #, c-format msgid "Error in config file (line %d), ignoring\n" msgstr "Erreur dans le fichier de configuration (ligne %d), ignore\n" -#: warnquota.c:888 +#: warnquota.c:894 #, c-format msgid "Possible error in config file (line %d), ignoring\n" msgstr "Erreur probable dans le fichier de configuration (ligne %d), ignore\n" -#: warnquota.c:891 +#: warnquota.c:897 msgid "Unterminated last line, ignoring\n" msgstr "Dernire ligne non termine, ignore\n" -#: warnquota.c:897 +#: warnquota.c:905 +#, c-format +msgid "Could not format LDAP URI because it's longer than %d bytes.\n" +msgstr "" + +#: warnquota.c:910 #, c-format msgid "" "LDAP library version >= 2.3 detected. Please use LDAP_URI instead of " @@ -376,28 +388,28 @@ "Generated URI %s\n" msgstr "" -#: warnquota.c:919 +#: warnquota.c:932 #, fuzzy, c-format msgid "Cannot open file with group administrators: %s\n" msgstr "" "Impossible d'ouvrir le fichier contenant les administrateurs de groupes : " "%s\n" -#: warnquota.c:934 +#: warnquota.c:947 #, fuzzy, c-format msgid "Parse error at line %d. Cannot find end of group name.\n" msgstr "" "Erreur d'analyse la ligne %d. Impossible de trouver la fin du nom de " "groupe.\n" -#: warnquota.c:943 +#: warnquota.c:956 #, fuzzy, c-format msgid "Parse error at line %d. Cannot find administrators name.\n" msgstr "" "Erreur d'analyse la ligne %d. Impossible de trouver le nom des " "administrateurs.\n" -#: warnquota.c:953 +#: warnquota.c:966 #, c-format msgid "" "Parse error at line %d. Trailing characters after administrators name.\n" @@ -405,7 +417,7 @@ "Erreur d'analyse la ligne %d. Caractres parasites aprs le nom des " "administrateurs.\n" -#: warnquota.c:1016 +#: warnquota.c:1029 msgid "" "Usage:\n" " warnquota [-ugsid] [-F quotaformat] [-c configfile] [-q quotatabfile] [-a " @@ -413,8 +425,16 @@ "\n" "-u, --user warn users\n" "-g, --group warn groups\n" -"-s, --human-readable send information in more human friendly " -"units\n" +"-s, --human-readable[=units] display numbers in human friendly units " +"(MB,\n" +" GB, ...). Units can be also specified\n" +" explicitely by an optional argument in " +"format\n" +" [kgt],[kgt] where the first character " +"specifies\n" +" space units and the second character " +"specifies\n" +" inode units\n" "-i, --no-autofs avoid autofs mountpoints\n" "-d, --no-details do not send quota information itself\n" "-F, --format=formatname use quotafiles of specific format\n" @@ -426,7 +446,12 @@ "\n" msgstr "" -#: warnquota.c:1097 +#: warnquota.c:1102 repquota.c:134 quota.c:343 +#, c-format +msgid "Bad output format units for human readable output: %s\n" +msgstr "" + +#: warnquota.c:1119 #, fuzzy, c-format msgid "Cannot get host name: %s\n" msgstr "Impossible d'obtenir le nom du fichier de quotas pour %s\n" @@ -555,21 +580,21 @@ "Il vaudrait mieux lancer fsck d'abord !\n" "Abandon...\n" -#: quotacheck.c:550 +#: quotacheck.c:551 #, c-format msgid "pushd %s/%s\n" msgstr "pushd %s/%s\n" -#: quotacheck.c:566 +#: quotacheck.c:567 #, fuzzy, c-format msgid "\tAdding %s size %lld ino %d links %d uid %u gid %u\n" msgstr "\tAjout %s taille %s ino %s liens %d\n" -#: quotacheck.c:576 +#: quotacheck.c:577 msgid "Scanning stored directories from directory stack\n" msgstr "Parcours des rpertoires stocks depuis la pile des rpertoires\n" -#: quotacheck.c:580 +#: quotacheck.c:581 #, c-format msgid "" "popd %s\n" @@ -578,17 +603,17 @@ "popd %s\n" "Entre dans le rpertoire %s\n" -#: quotacheck.c:592 +#: quotacheck.c:593 #, c-format msgid "Leaving %s\n" msgstr "Quitte %s\n" -#: quotacheck.c:632 +#: quotacheck.c:633 #, c-format msgid "Going to check %s quota file of %s\n" msgstr "Sur le point de vrifier %s fichier de quotas de %s\n" -#: quotacheck.c:638 +#: quotacheck.c:639 #, c-format msgid "" "Quota for %ss is enabled on mountpoint %s so quotacheck might damage the " @@ -597,17 +622,17 @@ "Les quotas pour %ss sont actif sur le point de montage %s si bien que " "quotacheck risque d'endommager le fichier.\n" -#: quotacheck.c:639 quotacheck.c:957 +#: quotacheck.c:640 quotacheck.c:967 #, fuzzy msgid "Should I continue?" msgstr "Dois-je continuer" -#: quotacheck.c:640 quotacheck.c:958 +#: quotacheck.c:641 quotacheck.c:968 #, c-format msgid "As you wish... Canceling check of this file.\n" msgstr "Suivant vos dsirs... Abandon de la vrification de ce fichier.\n" -#: quotacheck.c:645 +#: quotacheck.c:646 #, c-format msgid "" "Quota for %ss is enabled on mountpoint %s so quotacheck might damage the " @@ -618,128 +643,128 @@ "quotacheck risque d'endommager le fichier.\n" "Veuillez dsactiver les quotas ou utiliser -f pour forcer la vrification.\n" -#: quotacheck.c:652 +#: quotacheck.c:653 #, c-format msgid "Error while syncing quotas on %s: %s\n" msgstr "Erreur lors de la synchronisation des quotas sur %s: %s\n" -#: quotacheck.c:657 +#: quotacheck.c:658 #, c-format msgid "Cannot get quotafile name for %s\n" msgstr "Impossible d'obtenir le nom du fichier de quotas pour %s\n" -#: quotacheck.c:662 quotaio.c:150 quotasys.c:820 +#: quotacheck.c:663 quotaio.c:151 quotasys.c:843 #, c-format msgid "Cannot open quotafile %s: %s\n" msgstr "Impossible d'ouvrir le fichier de quotas %s : %s\n" -#: quotacheck.c:702 +#: quotacheck.c:703 #, fuzzy msgid "Renaming new files to proper names.\n" msgstr "Renommage du nouveau fichier de quotas\n" -#: quotacheck.c:704 +#: quotacheck.c:705 #, c-format msgid "Cannot get name of old quotafile on %s.\n" msgstr "Impossible d'obtenir le nom de l'ancien fichier de quotas sur %s.\n" -#: quotacheck.c:707 +#: quotacheck.c:708 msgid "Old file not found.\n" msgstr "Ancien fichier non trouv.\n" -#: quotacheck.c:710 +#: quotacheck.c:711 #, c-format msgid "Error while searching for old quota file %s: %s\n" msgstr "Erreur lors de la recherche de l'ancien fichier de quotas %s : %s\n" -#: quotacheck.c:719 +#: quotacheck.c:720 msgid "Old file found removed during check!\n" msgstr "" -#: quotacheck.c:722 +#: quotacheck.c:723 #, fuzzy, c-format msgid "Error while opening old quota file %s: %s\n" msgstr "Erreur lors de la recherche de l'ancien fichier de quotas %s : %s\n" -#: quotacheck.c:728 +#: quotacheck.c:729 #, fuzzy, c-format msgid "EXT2_IOC_GETFLAGS failed: %s\n" msgstr "chec de ioctl XFS_IOC_FSBULKSTAT : %s\n" -#: quotacheck.c:732 +#: quotacheck.c:733 #, c-format msgid "Quota file %s has IMMUTABLE flag set. Clearing.\n" msgstr "" -#: quotacheck.c:735 +#: quotacheck.c:736 #, fuzzy, c-format msgid "Failed to remove IMMUTABLE flag from quota file %s: %s\n" msgstr "Impossible de lire les informations du fichier de quotas %s : %s\n" -#: quotacheck.c:744 +#: quotacheck.c:745 #, c-format msgid "Renaming old quotafile to %s~\n" msgstr "Renomme l'ancien fichier de quotas en %s~\n" -#: quotacheck.c:750 +#: quotacheck.c:751 #, c-format msgid "Name of quota file too long. Contact %s.\n" msgstr "Nom du fichier de quotas trop long. Contactez %s.\n" -#: quotacheck.c:752 +#: quotacheck.c:753 #, c-format msgid "Cannot rename old quotafile %s to %s: %s\n" msgstr "Impossible de renommer l'ancien fichier de quotas %s en %s : %s\n" -#: quotacheck.c:758 +#: quotacheck.c:759 msgid "Renaming new quotafile\n" msgstr "Renommage du nouveau fichier de quotas\n" -#: quotacheck.c:770 +#: quotacheck.c:771 #, c-format msgid "Cannot change permission of %s: %s\n" msgstr "Impossible de changer les permissions de %s : %s\n" -#: quotacheck.c:777 +#: quotacheck.c:778 #, fuzzy, c-format msgid "Cannot open new quota file %s: %s\n" msgstr "Impossible d'ouvrir le fichier de quotas %s : %s\n" -#: quotacheck.c:782 +#: quotacheck.c:783 #, c-format msgid "Warning: Cannot set EXT2 flags on %s: %s\n" msgstr "" -#: quotacheck.c:802 +#: quotacheck.c:803 #, c-format msgid "Dumping gathered data for %ss.\n" msgstr "Dchargement des donnes rcupres pour %ss.\n" -#: quotacheck.c:805 +#: quotacheck.c:806 #, fuzzy, c-format msgid "Cannot initialize IO on xfs/gfs2 quotafile: %s\n" msgstr "Initialisation ES impossible sur le nouveau fichier de quotas : %s\n" -#: quotacheck.c:811 +#: quotacheck.c:812 #, c-format msgid "Cannot initialize IO on new quotafile: %s\n" msgstr "Initialisation ES impossible sur le nouveau fichier de quotas : %s\n" -#: quotacheck.c:838 +#: quotacheck.c:839 #, c-format msgid "Cannot finish IO on new quotafile: %s\n" msgstr "Impossible de terminer ES sur le nouveau fichier de quotas : %s\n" -#: quotacheck.c:841 +#: quotacheck.c:842 msgid "Data dumped.\n" msgstr "Donnes dcharges.\n" -#: quotacheck.c:849 +#: quotacheck.c:850 #, c-format msgid "Cannot find checked quota file for %ss on %s!\n" msgstr "Impossible de trouver le fichier de quotas vrifi pour %ss sur %s !\n" -#: quotacheck.c:853 +#: quotacheck.c:854 #, c-format msgid "" "Cannot turn %s quotas off on %s: %s\n" @@ -748,7 +773,7 @@ "Impossible de dsactiver les quotas %s sur %s : %s\n" "Le noyau ne sera pas inform des modifications que quotacheck a effectu.\n" -#: quotacheck.c:866 +#: quotacheck.c:867 #, c-format msgid "" "Cannot turn %s quotas on on %s: %s\n" @@ -757,45 +782,45 @@ "Impossible d'activer les quotas %s sur %s : %s\n" "Le noyau ne sera pas inform des modifications que quotacheck a effectu.\n" -#: quotacheck.c:892 +#: quotacheck.c:893 #, c-format msgid "Substracting space used by old %s quota file.\n" msgstr "" -#: quotacheck.c:894 +#: quotacheck.c:895 #, c-format msgid "" "Old %s file name could not been determined. Usage will not be subtracted.\n" msgstr "" -#: quotacheck.c:899 +#: quotacheck.c:900 #, c-format msgid "Cannot stat old %s quota file %s: %s. Usage will not be subtracted.\n" msgstr "" -#: quotacheck.c:911 +#: quotacheck.c:912 #, c-format msgid "" "Quota structure for %s owning quota file not present! Something is really " "wrong...\n" msgstr "" -#: quotacheck.c:916 +#: quotacheck.c:917 #, c-format msgid "Substracted %lu bytes.\n" msgstr "" -#: quotacheck.c:929 +#: quotacheck.c:931 #, c-format msgid "Cannot stat mountpoint %s: %s\n" msgstr "Impossible d'excuter stat() sur le point de montage %s : %s\n" -#: quotacheck.c:931 +#: quotacheck.c:933 #, fuzzy, c-format msgid "Mountpoint %s is not a directory?!\n" msgstr "Le point de montage %s n'est pas un rpertoire ?!\n" -#: quotacheck.c:956 +#: quotacheck.c:966 #, c-format msgid "" "Cannot remount filesystem mounted on %s read-only. Counted values might not " @@ -804,7 +829,7 @@ "Impossible de remonter le systme de fichier mont sur %s en lecture seule. " "Les valeurs comptabilises riquent d'tre fausses.\n" -#: quotacheck.c:964 +#: quotacheck.c:974 #, c-format msgid "" "Cannot remount filesystem mounted on %s read-only so counted values might " @@ -817,68 +842,68 @@ "Veuillez interrompre tous les programmes qui crivent sur ce systme de " "fichiers ou utilisez l'option -m pour forcer la vrification.\n" -#: quotacheck.c:972 +#: quotacheck.c:982 msgid "Filesystem remounted read-only\n" msgstr "Systme de fichiers remont en lecture seule\n" -#: quotacheck.c:975 +#: quotacheck.c:985 #, c-format msgid "Scanning %s [%s] " msgstr "Parcours de %s [%s] " -#: quotacheck.c:995 +#: quotacheck.c:1011 msgid "done\n" msgstr "termin\n" -#: quotacheck.c:1004 +#: quotacheck.c:1020 #, c-format msgid "Checked %d directories and %d files\n" msgstr "Vrifi %d rpertoires et %d fichiers\n" -#: quotacheck.c:1008 +#: quotacheck.c:1024 #, c-format msgid "" "Cannot remount filesystem %s read-write. cannot write new quota files.\n" msgstr "" -#: quotacheck.c:1009 +#: quotacheck.c:1025 msgid "Filesystem remounted RW.\n" msgstr "Systme de fichiers remont en lecture-criture.\n" -#: quotacheck.c:1052 +#: quotacheck.c:1069 #, fuzzy, c-format msgid "Cannot find quota option on filesystem %s with quotas!\n" msgstr "" "Impossible de trouver le type de quota sur le systme de fichiers %s !\n" -#: quotacheck.c:1058 +#: quotacheck.c:1075 #, fuzzy, c-format msgid "Cannot detect quota format for journalled quota on %s\n" msgstr "Impossible d'obtenir le nom de l'ancien fichier de quotas sur %s.\n" -#: quotacheck.c:1124 +#: quotacheck.c:1141 #, fuzzy, c-format msgid "Cannot get system info: %s\n" msgstr "Impossible de fixer les options de la socket : %s\n" -#: quotacheck.c:1144 +#: quotacheck.c:1161 msgid "" "Your kernel probably supports journaled quota but you are not using it. " "Consider switching to journaled quota to avoid running quotacheck after an " "unclean shutdown.\n" msgstr "" -#: quotacheck.c:1158 quotasys.c:910 +#: quotacheck.c:1175 quotasys.c:933 #, fuzzy msgid "Cannot initialize mountpoint scan.\n" msgstr "Impossible d'initialiser l'analyse du point de montage.\n" -#: quotacheck.c:1163 +#: quotacheck.c:1180 #, c-format msgid "Skipping %s [%s]\n" msgstr "Non traitement de %s [%s]\n" -#: quotacheck.c:1180 +#: quotacheck.c:1197 #, c-format msgid "" "Cannot guess format from filename on %s. Please specify format on " @@ -887,12 +912,12 @@ "Impossible de deviner le format d'aprs le nom de fichier sur %s. Veuillez " "prciser le format sur la ligne de commande.\n" -#: quotacheck.c:1185 +#: quotacheck.c:1202 #, c-format msgid "Detected quota format %s\n" msgstr "Format de quotas dtect %s\n" -#: quotacheck.c:1206 +#: quotacheck.c:1223 #, fuzzy msgid "" "Cannot find filesystem to check or filesystem not mounted with quota " @@ -901,7 +926,7 @@ "Impossible de trouver un systme de fichiers vrifier ou systme de " "fichiers mont sans l'option de quotas.\n" -#: quotacheck.c:1224 +#: quotacheck.c:1241 #, c-format msgid "" "Allocated %d bytes memory\n" @@ -912,57 +937,57 @@ "%d octets librs\n" "%d octets perdus\n" -#: quot.c:81 +#: quot.c:82 #, fuzzy, c-format msgid "Usage: %s [-acfugvViTq] [filesystem...]\n" msgstr "Utilisation : %s [-acfugvV] [systmefichiers...]\n" -#: quot.c:178 +#: quot.c:180 #, c-format msgid "%s (%s):\n" msgstr "%s (%s) :\n" -#: quot.c:182 quot.c:186 +#: quot.c:184 quot.c:188 #, c-format msgid "%d\t%llu\t%llu\n" msgstr "%d\t%llu\t%llu\n" -#: quot.c:195 +#: quot.c:197 #, fuzzy, c-format msgid "%s (%s) %ss:\n" msgstr "%s (%s) %s :\n" -#: quot.c:203 quot.c:205 +#: quot.c:205 quot.c:207 #, c-format msgid "%8llu " msgstr "%8llu " -#: quot.c:208 +#: quot.c:210 #, c-format msgid "%s" msgstr "" -#: quot.c:210 +#: quot.c:212 #, c-format msgid "%-8.8s" msgstr "%-8.8s" -#: quot.c:212 +#: quot.c:214 #, c-format msgid "#%-7d" msgstr "#%-7d" -#: quot.c:214 +#: quot.c:216 #, c-format msgid " %8llu %8llu %8llu" msgstr " %8llu %8llu %8llu" -#: quot.c:362 +#: quot.c:364 #, c-format msgid "cannot open %s: %s\n" msgstr "Impossible d'ouvrir %s : %s\n" -#: quot.c:382 +#: quot.c:384 #, c-format msgid "XFS_IOC_FSBULKSTAT ioctl failed: %s\n" msgstr "chec de ioctl XFS_IOC_FSBULKSTAT : %s\n" @@ -1005,20 +1030,20 @@ msgid "%s quota sync failed for %s: %s\n" msgstr "quotactl sur %s : %s\n" -#: quota.h:22 +#: quota.h:23 msgid "user" msgstr "" -#: quota.h:23 +#: quota.h:24 #, fuzzy msgid "group" msgstr "Groupe" -#: quota.h:24 +#: quota.h:25 msgid "project" msgstr "" -#: quota.h:25 +#: quota.h:26 msgid "undefined" msgstr "" @@ -1093,129 +1118,134 @@ msgid "Cannot connect to system DBUS: %s\n" msgstr "Impossible de crer la socket : %s\n" -#: quota_nld.c:289 +#: quota_nld.c:292 #, c-format msgid "Failed to find tty of user %llu to report warning to.\n" msgstr "" -#: quota_nld.c:294 +#: quota_nld.c:297 #, c-format msgid "Failed to open tty %s of user %llu to report warning.\n" msgstr "" -#: quota_nld.c:300 +#: quota_nld.c:303 msgid "Warning" msgstr "" -#: quota_nld.c:303 +#: quota_nld.c:306 msgid "Error" msgstr "" -#: quota_nld.c:305 +#: quota_nld.c:308 msgid "Info" msgstr "" -#: quota_nld.c:308 +#: quota_nld.c:311 #, fuzzy msgid "file limit reached" msgstr "Limite de fichiers atteinte" -#: quota_nld.c:311 +#: quota_nld.c:314 msgid "file quota exceeded too long" msgstr "" -#: quota_nld.c:314 +#: quota_nld.c:317 msgid "file quota exceeded" msgstr "" -#: quota_nld.c:317 +#: quota_nld.c:320 #, fuzzy msgid "block limit reached" msgstr "Limite de blocs atteinte" -#: quota_nld.c:320 +#: quota_nld.c:323 msgid "block quota exceeded too long" msgstr "" -#: quota_nld.c:323 +#: quota_nld.c:326 #, fuzzy msgid "block quota exceeded" msgstr "Quota dpassement blocs activ" -#: quota_nld.c:326 +#: quota_nld.c:329 msgid "got below file limit" msgstr "" -#: quota_nld.c:329 +#: quota_nld.c:332 #, fuzzy msgid "got below file quota" msgstr "Quota dpassement fichiers activ" -#: quota_nld.c:332 +#: quota_nld.c:335 #, fuzzy msgid "got below block limit" msgstr "limite souple bloc" -#: quota_nld.c:335 +#: quota_nld.c:338 #, fuzzy msgid "got below block quota" msgstr "Quota dpassement blocs activ" -#: quota_nld.c:338 +#: quota_nld.c:341 msgid "unknown quota warning" msgstr "" -#: quota_nld.c:342 +#: quota_nld.c:345 #, fuzzy, c-format msgid "Failed to write quota message for user %llu to %s: %s\n" msgstr "Impossible d'crire les quotas pour %u sur %s : %s\n" -#: quota_nld.c:355 +#: quota_nld.c:358 msgid "Cannot create DBUS message: No enough memory.\n" msgstr "" -#: quota_nld.c:373 +#: quota_nld.c:376 msgid "Failed to write message to dbus: No enough memory.\n" msgstr "" -#: quota_nld.c:389 +#: quota_nld.c:392 #, c-format msgid "Failed to read or parse quota netlink message: %s\n" msgstr "" -#: quota_nld.c:400 +#: quota_nld.c:403 msgid "Undefined program name.\n" msgstr "" -#: quota_nld.c:405 +#: quota_nld.c:408 #, fuzzy msgid "Not enough memory to build PID file name.\n" msgstr "Pas assez de mmoire.\n" -#: quota_nld.c:424 +#: quota_nld.c:427 #, fuzzy, c-format msgid "Could not open PID file '%s': %s\n" msgstr "Impossible d'ouvrir le fichier %s : %s\n" -#: quota_nld.c:430 +#: quota_nld.c:433 #, c-format msgid "Could not write daemon's PID into '%s'.\n" msgstr "" -#: quota_nld.c:437 +#: quota_nld.c:440 #, c-format msgid "Could not close PID file '%s'.\n" msgstr "" -#: quota_nld.c:467 +#: quota_nld.c:470 msgid "Could not register PID file removal on SIGTERM.\n" msgstr "" -#: quota_nld.c:469 +#: quota_nld.c:472 #, c-format msgid "Could not store my PID %jd.\n" msgstr "" +#: quota_nld.c:489 rquota_svc.c:537 +#, fuzzy, c-format +msgid "Failed to daemonize: %s\n" +msgstr "chec de la suppression des quotas : %s\n" + #: repquota.c:51 #, c-format msgid "" @@ -1224,75 +1254,82 @@ "%s [-vugsi] [-c|C] [-t|n] [-F quotaformat] [-O (default | xml | csv)] (-a | " "mntpoint)\n" "\n" -"-v, --verbose display also users/groups without any usage\n" -"-u, --user display information about users\n" -"-g, --group display information about groups\n" -"-P, --project display information about projects\n" -"-s, --human-readable show numbers in human friendly units (MB, " -"GB, ...)\n" -"-t, --truncate-names truncate names to 9 characters\n" -"-p, --raw-grace print grace time in seconds since epoch\n" -"-n, --no-names do not translate uid/gid to name\n" -"-i, --no-autofs avoid autofs mountpoints\n" -"-c, --cache translate big number of ids at once\n" -"-C, --no-cache translate ids one by one\n" -"-F, --format=formatname report information for specific format\n" -"-O, --output=format format output as xml or csv\n" -"-a, --all report information for all mount points with " -"quotas\n" -"-h, --help display this help message and exit\n" -"-V, --version display version information and exit\n" +"-v, --verbose display also users/groups without any usage\n" +"-u, --user display information about users\n" +"-g, --group display information about groups\n" +"-P, --project display information about projects\n" +"-s, --human-readable[=units] display numbers in human friendly units (MB, " +"GB,\n" +" ...). Units can be also specified explicitely " +"by\n" +" an optional argument in format [kgt],[kgt] " +"where\n" +" the first character specifies space units and " +"the\n" +" second character specifies inode units\n" +"-t, --truncate-names truncate names to 9 characters\n" +"-p, --raw-grace print grace time in seconds since epoch\n" +"-n, --no-names do not translate uid/gid to name\n" +"-i, --no-autofs avoid autofs mountpoints\n" +"-c, --cache translate big number of ids at once\n" +"-C, --no-cache translate ids one by one\n" +"-F, --format=formatname report information for specific format\n" +"-O, --output=format format output as xml or csv\n" +"-a, --all report information for all mount points with\n" +" quotas\n" +"-h, --help display this help message and exit\n" +"-V, --version display version information and exit\n" "\n" msgstr "" -#: repquota.c:158 +#: repquota.c:167 #, fuzzy msgid "Repquota cannot report through RPC calls.\n" msgstr "Repquota ne peut pas gnrer de rapport en utilisant des appels RPC.\n" -#: repquota.c:162 +#: repquota.c:171 msgid "Specified both -n and -t but only one of them can be used.\n" msgstr "" "Spcification de -n et -t alors qu'un seul des deux peut tre utilis la " "fois.\n" -#: repquota.c:366 +#: repquota.c:375 msgid "User" msgstr "Utilisateur" -#: repquota.c:368 +#: repquota.c:377 msgid "Group" msgstr "Groupe" -#: repquota.c:370 +#: repquota.c:379 msgid "Project" msgstr "" -#: repquota.c:373 +#: repquota.c:382 #, c-format msgid "*** Report for %s quotas on device %s\n" msgstr "*** Rapport pour les quotas %s sur le priphrique %s\n" -#: repquota.c:382 +#: repquota.c:391 msgid "Space" msgstr "" -#: repquota.c:384 +#: repquota.c:393 #, fuzzy msgid "Block" msgstr "blocs" -#: repquota.c:385 +#: repquota.c:394 #, c-format msgid "Block grace time: %s; Inode grace time: %s\n" msgstr "Priode de sursis bloc : %s ; priode de sursis inode : %s\n" -#: repquota.c:386 +#: repquota.c:395 #, fuzzy, c-format msgid " %s limits File limits\n" msgstr " Limites bloc Limites fichier\n" -#: repquota.c:387 +#: repquota.c:396 #, c-format msgid "%-9s used soft hard grace used soft hard grace\n" msgstr "%-9s utilis souple stricte sursis utilis souple stricte sursis\n" @@ -1478,45 +1515,49 @@ msgid "WARNING - Quota file %s has corrupted headers\n" msgstr "ATTENTION - Les en-ttes du fichier de quotas %s sont corrompus\n" -#: quotacheck_v2.c:362 +#: quotacheck_v2.c:361 +msgid "Continue checking assuming format from command line?" +msgstr "" + +#: quotacheck_v2.c:365 #, c-format msgid "" "Quota file format version %d does not match the one specified on command " "line (%d). Quota file header may be corrupted.\n" msgstr "" -#: quotacheck_v2.c:366 +#: quotacheck_v2.c:370 msgid "Continue checking assuming version from command line?" msgstr "" -#: quotacheck_v2.c:372 +#: quotacheck_v2.c:376 msgid "Headers checked.\n" msgstr "En-ttes vrifis.\n" -#: quotacheck_v2.c:388 +#: quotacheck_v2.c:392 #, c-format msgid "Do not know how to buffer format %d\n" msgstr "" -#: quotacheck_v2.c:398 +#: quotacheck_v2.c:402 #, c-format msgid "Headers of file %s checked. Going to load data...\n" msgstr "En-ttes du fichier %s vrifis. Chargement des donnes imminent...\n" -#: quotacheck_v2.c:406 +#: quotacheck_v2.c:410 #, fuzzy msgid "Cannot gather quota data. Tree root node corrupted.\n" msgstr "" "Impossible de rcuprer les donnes des quotas. Noeud racine de l'arbre " "corrompu.\n" -#: quotacheck_v2.c:414 +#: quotacheck_v2.c:418 msgid "WARNING - Some data might be changed due to corruption.\n" msgstr "" "ATTENTION - Certaines donnes risquent d'tre modifies suite la " "corruption.\n" -#: quotacheck_v2.c:417 +#: quotacheck_v2.c:421 msgid "Not found any corrupted blocks. Congratulations.\n" msgstr "Aucun bloc corrompu n'a t trouv. Flicitations.\n" @@ -1535,63 +1576,63 @@ msgstr "" "Sur un systme de fichiers NFS, seul le format de quotas RPC est autoris.\n" -#: quotaio.c:84 +#: quotaio.c:85 msgid "Only XFS quota format is allowed on XFS filesystem.\n" msgstr "" "Sur un systme de fichiers XFS, seul le format de quotas XFS est autoris.\n" -#: quotaio.c:95 +#: quotaio.c:96 msgid "XFS quota allowed only on XFS filesystem.\n" msgstr "Quotas XFS autoriss uniquement sur un systme de fichiers XFS.\n" -#: quotaio.c:109 +#: quotaio.c:110 #, fuzzy msgid "Quota not supported by the filesystem.\n" msgstr "Ce format de quotas n'est pas support par le noyau.\n" -#: quotaio.c:129 +#: quotaio.c:130 #, fuzzy msgid "Cannot find any quota file to work on.\n" msgstr "Impossible de trouver le fichier de quotas vrifi pour %ss sur %s !\n" -#: quotaio.c:134 +#: quotaio.c:135 msgid "Quota file not found or has wrong format.\n" msgstr "Le fichier de quotas est introuvable ou n'a pas le bon format.\n" -#: quotaio.c:144 +#: quotaio.c:145 #, fuzzy, c-format msgid "Cannot sync quotas on device %s: %s\n" msgstr "Impossible de synchroniser les quotas sur le priphrique %s : %s\n" -#: quotaio.c:175 +#: quotaio.c:176 #, fuzzy, c-format msgid "Cannot initialize quota on %s: %s\n" msgstr "Impossible d'initialiser les quotas sur %s : %s\n" -#: quotaio.c:202 +#: quotaio.c:203 #, c-format msgid "Creation of %s quota format is not supported.\n" msgstr "La cration de quotas au format %s n'est pas supporte.\n" -#: quotaio.c:212 +#: quotaio.c:213 #, c-format msgid "" "Quota on %s is stored in system files and must be manipulated by fs tools.\n" msgstr "" -#: quotaio.c:222 +#: quotaio.c:223 #, fuzzy, c-format msgid "Cannot create new quotafile %s: %s\n" msgstr "Impossible de crer le nouveau fichier de quotas %s : %s\n" -#: quotaio.c:296 +#: quotaio.c:297 #, fuzzy, c-format msgid "" "Trying to set quota limits out of range supported by quota format on %s.\n" msgstr "" "Tentative d'criture des quotas dans un fichier en lecture seule sur %s\n" -#: quotaio.c:302 +#: quotaio.c:303 #, fuzzy, c-format msgid "" "Trying to set quota usage out of range supported by quota format on %s.\n" @@ -1632,7 +1673,7 @@ "interface!\n" msgstr "" -#: quotaio_rpc.c:76 quotaio_v1.c:308 quotaio_v2.c:464 +#: quotaio_rpc.c:77 quotaio_v1.c:278 quotaio_v2.c:464 #, c-format msgid "Trying to write quota to readonly quotafile on %s\n" msgstr "" @@ -1696,7 +1737,7 @@ "Please run quotacheck(8) and try again.\n" msgstr "" -#: quotaio_v1.c:214 +#: quotaio_v1.c:184 #, c-format msgid "Trying to write info to readonly quotafile on %s.\n" msgstr "" @@ -1733,40 +1774,40 @@ "Entres : %u\n" "Moyenne d'utilisation : %f\n" -#: quotaio_xfs.c:260 +#: quotaio_xfs.c:265 #, c-format msgid "*** Status for %s quotas on device %s\n" msgstr "*** Statut des quotas %s sur le priphrique %s\n" -#: quotaio_xfs.c:262 quotaio_xfs.c:281 +#: quotaio_xfs.c:267 quotaio_xfs.c:286 msgid "ON" msgstr "ACTIV" -#: quotaio_xfs.c:262 quotaio_xfs.c:281 +#: quotaio_xfs.c:267 quotaio_xfs.c:286 msgid "OFF" msgstr "DESACTIV" -#: quotaio_xfs.c:264 quotaio_xfs.c:268 quotaio_xfs.c:272 +#: quotaio_xfs.c:269 quotaio_xfs.c:273 quotaio_xfs.c:277 #, c-format msgid "Accounting: %s; Enforcement: %s\n" msgstr "Compte : %s ; En vigueur : %s\n" -#: quotaio_xfs.c:284 quotaio_xfs.c:288 quotaio_xfs.c:292 +#: quotaio_xfs.c:289 quotaio_xfs.c:293 quotaio_xfs.c:297 #, c-format msgid "Accounting [ondisk]: %s; Enforcement [ondisk]: %s\n" msgstr "Compte [sur disque] : %s ; En vigueur [sur disque] : %s\n" -#: quotaio_xfs.c:301 quotaio_xfs.c:310 quotaio_xfs.c:323 +#: quotaio_xfs.c:306 quotaio_xfs.c:315 quotaio_xfs.c:328 #, c-format msgid "Inode: none\n" msgstr "Inode : aucun\n" -#: quotaio_xfs.c:303 quotaio_xfs.c:312 quotaio_xfs.c:325 +#: quotaio_xfs.c:308 quotaio_xfs.c:317 quotaio_xfs.c:330 #, fuzzy, c-format msgid "Inode: #%llu (%llu blocks, %u extents)\n" msgstr "Inode : #%Lu (%Lu blocs, %u tendus)\n" -#: quotaon.c:67 +#: quotaon.c:37 #, c-format msgid "" "Usage:\n" @@ -1786,131 +1827,131 @@ "-V, --version display version information and exit\n" msgstr "" -#: quotaon.c:81 +#: quotaon.c:51 msgid "turn quotas off for all filesystems" msgstr "" -#: quotaon.c:82 +#: quotaon.c:52 #, fuzzy msgid "turn quotas on for all filesystems" msgstr "Quotas XFS autoriss uniquement sur un systme de fichiers XFS.\n" -#: quotaon.c:147 +#: quotaon.c:117 #, fuzzy msgid "Cannot turn on/off quotas via RPC.\n" msgstr "Impossible d'activer/dsactiver les quotas via RPC.\n" -#: quotaon.c:194 +#: quotaon.c:164 #, c-format msgid "set root_squash on %s: %s\n" msgstr "Positionnez root_squash sur %s : %s\n" -#: quotaon.c:198 +#: quotaon.c:168 #, c-format msgid "%s: %s root_squash turned off\n" msgstr "%s : %s root_squash dsactiv\n" -#: quotaon.c:200 +#: quotaon.c:170 #, c-format msgid "%s: %s root_squash turned on\n" msgstr "%s : %s root_squash activ\n" -#: quotaon.c:218 +#: quotaon.c:188 #, c-format msgid "quotactl on %s [%s]: %s\n" msgstr "quotactl sur %s [%s] : %s\n" -#: quotaon.c:221 +#: quotaon.c:191 #, c-format msgid "%s [%s]: %s quotas turned off\n" msgstr "%s [%s] : quotas %s dsactivs\n" -#: quotaon.c:234 +#: quotaon.c:204 #, fuzzy, c-format msgid "cannot find %s on %s [%s]\n" msgstr "impossible de trouver %s sur %s [%s]\n" -#: quotaon.c:236 +#: quotaon.c:206 #, c-format msgid "using %s on %s [%s]: %s\n" msgstr "utilisation de %s sur %s [%s] : %s\n" -#: quotaon.c:238 +#: quotaon.c:208 msgid "Maybe create new quota files with quotacheck(8)?\n" msgstr "" "Essayez peut-tre de crer un nouveau fichier de quotas avec " "quotacheck(8) ?\n" -#: quotaon.c:240 +#: quotaon.c:210 msgid "Quota format not supported in kernel.\n" msgstr "Ce format de quotas n'est pas support par le noyau.\n" -#: quotaon.c:243 +#: quotaon.c:213 #, c-format msgid "%s [%s]: %s quotas turned on\n" msgstr "%s [%s] : quotas %s activs\n" -#: quotaon.c:283 +#: quotaon.c:253 #, fuzzy msgid "Cannot change state of GFS2 quota.\n" msgstr "Impossible d'obtenir le nom du nouveau fichier de quotas.\n" -#: quotaon.c:287 +#: quotaon.c:258 #, fuzzy msgid "Cannot change state of XFS quota. It's not compiled in kernel.\n" msgstr "" "Impossible de changer l'tat des quotas XFS. Non compil dans le noyau.\n" -#: quotaon.c:312 +#: quotaon.c:283 #, c-format msgid "Cannot find quota file on %s [%s] to turn quotas on/off.\n" msgstr "" "Impossible de trouver le fichier de quotas sur %s [%s] pour activer/" "dsactiver les quotas.\n" -#: quotaon.c:317 +#: quotaon.c:288 #, fuzzy, c-format msgid "Quota file on %s [%s] does not exist or has wrong format.\n" msgstr "Le fichier de quotas est introuvable ou n'a pas le bon format.\n" -#: quotaon.c:346 quotaon.c:362 +#: quotaon.c:318 quotaon.c:334 msgid "off" msgstr "" -#: quotaon.c:348 +#: quotaon.c:320 msgid "on (accounting)" msgstr "" -#: quotaon.c:350 +#: quotaon.c:322 msgid "on (enforced)" msgstr "" -#: quotaon.c:362 +#: quotaon.c:334 #, fuzzy msgid "on" msgstr "aucun" -#: quotaon.c:364 +#: quotaon.c:336 #, fuzzy, c-format msgid "%s quota on %s (%s) is %s\n" msgstr "quotactl sur %s [%s] : %s\n" -#: quotaon.c:381 +#: quotaon.c:353 #, c-format msgid "Name must be quotaon or quotaoff not %s\n" msgstr "Le nom doit tre quotaon ou quotaoff et non %s\n" -#: quotaon.c:387 +#: quotaon.c:359 #, c-format msgid "Required format %s not supported by kernel.\n" msgstr "Le format requis %s n'est pas support par le noyau.\n" -#: quotaon.c:389 +#: quotaon.c:361 #, fuzzy msgid "Warning: No quota format detected in the kernel.\n" msgstr "Ce format de quotas n'est pas support par le noyau.\n" -#: quotaon.c:396 +#: quotaon.c:368 #, fuzzy, c-format msgid "%s: Quota cannot be turned on on NFS filesystem\n" msgstr "Quotas XFS autoriss uniquement sur un systme de fichiers XFS.\n" @@ -2024,81 +2065,81 @@ msgid "Invalid argument \"%s\"\n" msgstr "Argument incorrect %s \n" -#: quotaops.c:112 +#: quotaops.c:82 #, c-format msgid "%s (uid %d): Permission denied\n" msgstr "%s (uid %d) : permission refuse\n" -#: quotaops.c:124 +#: quotaops.c:94 #, c-format msgid "%s (gid %d): gid set allocation (%d): %s\n" msgstr "" -#: quotaops.c:135 +#: quotaops.c:105 #, fuzzy, c-format msgid "%s (gid %d): error while trying getgroups(): %s\n" msgstr "Erreur lors de l'excution de getgroups() : %s\n" -#: quotaops.c:146 +#: quotaops.c:116 #, c-format msgid "%s (gid %d): Permission denied\n" msgstr "%s (gid %d) : permission refuse\n" -#: quotaops.c:162 +#: quotaops.c:132 #, fuzzy, c-format msgid "error while getting quota from %s for %s (id %u): %s\n" msgstr "Erreur lors de la recherche des quotas de %s pour %u : %s\n" -#: quotaops.c:187 +#: quotaops.c:157 #, fuzzy, c-format msgid "Cannot write quota for %u on %s: %s\n" msgstr "Impossible d'crire les quotas pour %u sur %s : %s\n" -#: quotaops.c:222 quotaops.c:224 +#: quotaops.c:192 quotaops.c:194 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "Impossible d'excuter stat() sur le fichier de quotas %s : %s\n" -#: quotaops.c:238 +#: quotaops.c:208 msgid "Too many parameters to editor.\n" msgstr "" -#: quotaops.c:246 +#: quotaops.c:216 #, fuzzy, c-format msgid "Cannot exec %s\n" msgstr "Impossible d'excuter %s\n" -#: quotaops.c:263 +#: quotaops.c:233 #, fuzzy, c-format msgid "Cannot truncate a file: %s\n" msgstr "Impossible d'excuter stat() sur le fichier de quotas %s : %s\n" -#: quotaops.c:265 +#: quotaops.c:235 #, fuzzy, c-format msgid "Cannot reset a file offset: %s\n" msgstr "Impossible de lire le fichier de statistiques %s : %s\n" -#: quotaops.c:267 +#: quotaops.c:237 #, fuzzy, c-format msgid "Cannot duplicate a file descriptor: %s\n" msgstr "Impossible de dupliquer le descripteur : %s\n" -#: quotaops.c:269 +#: quotaops.c:239 #, fuzzy, c-format msgid "Cannot open a stream to write to: %s\n" msgstr "Impossible de r-ouvrir le fichier temporaire : %s\n" -#: quotaops.c:270 +#: quotaops.c:240 #, fuzzy, c-format msgid "Cannot open a stream to read from: %s\n" msgstr "Impossible de r-ouvrir le fichier temporaire : %s\n" -#: quotaops.c:286 +#: quotaops.c:256 #, c-format msgid "Disk quotas for %s %s (%cid %d):\n" msgstr "Quotas disque pour %s %s (%cid %d) :\n" -#: quotaops.c:290 +#: quotaops.c:260 #, c-format msgid "" " Filesystem blocks soft hard inodes " @@ -2107,23 +2148,23 @@ " Systme de fichiers blocs souple stricte inodes " "souple stricte\n" -#: quotaops.c:323 +#: quotaops.c:293 #, c-format msgid "WARNING - %s: cannot change current block allocation\n" msgstr "" "ATTENTION - %s : impossible de modifier l'allocation actuelle des blocs\n" -#: quotaops.c:326 +#: quotaops.c:296 #, c-format msgid "WARNING - %s: cannot change current inode allocation\n" msgstr "" "ATTENTION - %s : impossible de modifier l'allocation actuelle des inodes\n" -#: quotaops.c:352 +#: quotaops.c:322 msgid "Bad format: two title lines assumed\n" msgstr "" -#: quotaops.c:363 +#: quotaops.c:333 #, c-format msgid "" "Bad format:\n" @@ -2132,49 +2173,49 @@ "Format incorrect :\n" "%s\n" -#: quotaops.c:369 +#: quotaops.c:339 #, fuzzy, c-format msgid "Bad block usage: %s: %s\n" msgstr "Mauvais %s : %s\n" -#: quotaops.c:376 +#: quotaops.c:346 #, fuzzy, c-format msgid "Bad block soft limit: %s: %s\n" msgstr "limite souple bloc" -#: quotaops.c:383 +#: quotaops.c:353 #, fuzzy, c-format msgid "Bad block hard limit: %s: %s\n" msgstr "limite stricte bloc" -#: quotaops.c:390 +#: quotaops.c:360 #, fuzzy, c-format msgid "Bad inode usage: %s: %s\n" msgstr "Mauvais %s : %s\n" -#: quotaops.c:397 +#: quotaops.c:367 #, fuzzy, c-format msgid "Bad inode soft limit: %s: %s\n" msgstr "limite souple inode" -#: quotaops.c:404 +#: quotaops.c:374 #, fuzzy, c-format msgid "Bad inode hard limit: %s: %s\n" msgstr "limite stricte inode" -#: quotaops.c:457 +#: quotaops.c:427 #, c-format msgid "Times to enforce softlimit for %s %s (%cid %d):\n" msgstr "Temps avant l'application de la limite souple pour %s %s (%cid %d) :\n" -#: quotaops.c:459 quotaops.c:562 +#: quotaops.c:429 quotaops.c:532 #, c-format msgid "Time units may be: days, hours, minutes, or seconds\n" msgstr "" "Units de temps peuvent tre : days (jours), hours (heures), minutes, ou " "seconds\n" -#: quotaops.c:461 +#: quotaops.c:431 #, c-format msgid "" " Filesystem block grace inode grace\n" @@ -2182,25 +2223,25 @@ " Systme de fichiers sursis bloc sursis " "inode\n" -#: quotaops.c:466 quotaops.c:472 quotaops.c:517 quotaops.c:530 setquota.c:288 +#: quotaops.c:436 quotaops.c:442 quotaops.c:487 quotaops.c:500 setquota.c:288 #: setquota.c:294 msgid "unset" msgstr "vide" -#: quotaops.c:468 quotaops.c:474 +#: quotaops.c:438 quotaops.c:444 msgid "0seconds" msgstr "0seconds" -#: quotaops.c:470 quotaops.c:476 quotasys.c:503 +#: quotaops.c:440 quotaops.c:446 quotasys.c:503 #, c-format msgid "%useconds" msgstr "%useconds" -#: quotaops.c:503 quotaops.c:602 +#: quotaops.c:473 quotaops.c:572 msgid "Bad format: three title lines assumed\n" msgstr "" -#: quotaops.c:513 quotaops.c:610 +#: quotaops.c:483 quotaops.c:580 #, c-format msgid "" "bad format:\n" @@ -2209,19 +2250,19 @@ "format incorrect :\n" "%s\n" -#: quotaops.c:524 quotaops.c:616 +#: quotaops.c:494 quotaops.c:586 #, fuzzy msgid "Bad time units. Units are 'second', 'minute', 'hour', and 'day'.\n" msgstr "" "Mauvaise unit de temps. Les units sont second , minute , hour et " " day .\n" -#: quotaops.c:560 +#: quotaops.c:530 #, c-format msgid "Grace period before enforcing soft limits for %ss:\n" msgstr "Sursis avant l'application des limites souples pour %ss :\n" -#: quotaops.c:563 +#: quotaops.c:533 #, c-format msgid " Filesystem Block grace period Inode grace period\n" msgstr "" @@ -2342,7 +2383,7 @@ "\n" msgstr "" -#: setquota.c:84 edquota.c:104 quota.c:114 +#: setquota.c:84 edquota.c:104 quota.c:90 #, c-format msgid "Bugs to: %s\n" msgstr "Rapports de bugs : %s\n" @@ -2540,7 +2581,7 @@ " xml - simple XML\n" msgstr "" -#: quotasys.c:459 quota.c:297 +#: quotasys.c:459 quota.c:278 msgid "none" msgstr "aucun" @@ -2609,119 +2650,119 @@ msgid "days" msgstr "%ddays" -#: quotasys.c:573 +#: quotasys.c:582 msgid "Integer overflow while parsing space number." msgstr "" -#: quotasys.c:575 +#: quotasys.c:584 msgid "K" msgstr "" -#: quotasys.c:577 +#: quotasys.c:586 msgid "M" msgstr "" -#: quotasys.c:579 +#: quotasys.c:588 msgid "G" msgstr "" -#: quotasys.c:581 +#: quotasys.c:590 msgid "T" msgstr "" -#: quotasys.c:584 +#: quotasys.c:593 msgid "Unknown space binary unit. Valid units are K, M, G, T." msgstr "" -#: quotasys.c:588 +#: quotasys.c:597 msgid "Integer overflow while interpreting space unit." msgstr "" -#: quotasys.c:628 +#: quotasys.c:650 msgid "Integer overflow while parsing number." msgstr "" -#: quotasys.c:632 +#: quotasys.c:654 msgid "k" msgstr "" -#: quotasys.c:634 +#: quotasys.c:656 msgid "m" msgstr "" -#: quotasys.c:636 +#: quotasys.c:658 msgid "g" msgstr "" -#: quotasys.c:638 +#: quotasys.c:660 msgid "t" msgstr "" -#: quotasys.c:641 +#: quotasys.c:663 msgid "Unknown decimal unit. Valid units are k, m, g, t." msgstr "" -#: quotasys.c:645 +#: quotasys.c:667 msgid "Integer overflow while interpreting decimal unit." msgstr "" -#: quotasys.c:803 +#: quotasys.c:826 #, fuzzy, c-format msgid "Cannot stat quota file %s: %s\n" msgstr "Impossible d'excuter stat() sur le fichier de quotas %s : %s\n" -#: quotasys.c:949 +#: quotasys.c:974 msgid "Not all specified mountpoints are using quota.\n" msgstr "Les points de montage spcifis n'utilisent pas tous les quotas.\n" -#: quotasys.c:963 +#: quotasys.c:988 #, c-format msgid "Error while releasing file on %s\n" msgstr "Erreur lors de la libration fichier sur %s\n" -#: quotasys.c:1022 +#: quotasys.c:1047 #, fuzzy, c-format msgid "Cannot create set for sigaction(): %s\n" msgstr "Impossible de crer le set pour sigaction() : %s\n" -#: quotasys.c:1025 +#: quotasys.c:1050 #, fuzzy, c-format msgid "Cannot set signal handler: %s\n" msgstr "Impossible de mettre en place le gestionnaire de signal : %s\n" -#: quotasys.c:1080 +#: quotasys.c:1106 #, fuzzy, c-format msgid "Cannot reset signal handler: %s\n" msgstr "Impossible de rinitialiser le gestionnaire de signal : %s\n" -#: quotasys.c:1235 +#: quotasys.c:1261 #, fuzzy msgid "Cannot open any file with mount points.\n" msgstr "" "Impossible d'ouvrir le fichier contenant les administrateurs de groupes : " "%s\n" -#: quotasys.c:1253 +#: quotasys.c:1279 #, fuzzy, c-format msgid "Cannot get device name for %s\n" msgstr "Impossible d'obtenir le nom de priphrique pour %s\n" -#: quotasys.c:1313 +#: quotasys.c:1339 #, fuzzy, c-format msgid "Cannot resolve mountpoint path %s: %s\n" msgstr "Impossible de rsoudre le chemin du point de montage %s : %s\n" -#: quotasys.c:1319 +#: quotasys.c:1345 #, fuzzy, c-format msgid "Cannot statfs() %s: %s\n" msgstr "Impossible d'excuter statfs() sur %s : %s\n" -#: quotasys.c:1331 +#: quotasys.c:1357 #, fuzzy, c-format msgid "Cannot stat() mounted device %s: %s\n" msgstr "Impossible d'excuter stat() sur le priphrique mont %s : %s\n" -#: quotasys.c:1336 +#: quotasys.c:1362 #, fuzzy, c-format msgid "" "Device (%s) filesystem is mounted on unsupported device type. Skipping.\n" @@ -2730,12 +2771,12 @@ "un priphrique bloc ou caractre ni un montage loopback ou nomm. " "Rejet.\n" -#: quotasys.c:1346 +#: quotasys.c:1372 #, fuzzy, c-format msgid "Cannot stat() mountpoint %s: %s\n" msgstr "Impossible d'excuter stat() sur le point de montage %s : %s\n" -#: quotasys.c:1415 +#: quotasys.c:1441 #, fuzzy, c-format msgid "" "Cannot find a device with %s.\n" @@ -2744,7 +2785,7 @@ "Impossible de trouver dans les options le priphrique de montage de la " "loopback pour %s. Rejet.\n" -#: quotasys.c:1419 +#: quotasys.c:1445 #, fuzzy, c-format msgid "" "Cannot stat() a mountpoint with %s: %s\n" @@ -2753,7 +2794,7 @@ "Impossible d'excuter stat() sur le point de montage donn %s : %s\n" "Rejet...\n" -#: quotasys.c:1427 +#: quotasys.c:1453 #, fuzzy, c-format msgid "" "Cannot stat() given mountpoint %s: %s\n" @@ -2762,33 +2803,33 @@ "Impossible d'excuter stat() sur le point de montage donn %s : %s\n" "Rejet...\n" -#: quotasys.c:1437 +#: quotasys.c:1463 #, fuzzy, c-format msgid "Cannot find a filesystem mountpoint for directory %s\n" msgstr "" "Impossible de trouver le point de montage du systme de fichiers pour le " "rpertoire %s\n" -#: quotasys.c:1443 +#: quotasys.c:1469 #, fuzzy, c-format msgid "Cannot resolve path %s: %s\n" msgstr "Impossible de rsoudre le chemin %s : %s\n" -#: quotasys.c:1454 +#: quotasys.c:1480 #, fuzzy, c-format msgid "Cannot find mountpoint for device %s\n" msgstr "Impossible de trouver le point de montage pour le priphrique %s\n" -#: quotasys.c:1460 +#: quotasys.c:1486 #, c-format msgid "Specified path %s is not directory nor device.\n" msgstr "Le chemin spcifi %s n'est ni un rpertoire ni un priphrique.\n" -#: quotasys.c:1468 +#: quotasys.c:1494 msgid "No correct mountpoint specified.\n" msgstr "Aucun point de montage correct spcifi.\n" -#: quotasys.c:1523 +#: quotasys.c:1549 #, fuzzy, c-format msgid "Mountpoint (or device) %s not found or has no quota enabled.\n" msgstr "Point de montage (ou priphrique) %s introuvable.\n" @@ -2903,7 +2944,7 @@ msgid "Unable to register (RQUOTAPROG, EXT_RQUOTAVERS, %s).\n" msgstr "Impossible d'enregistrer (RQUOTAPROG, EXT_RQUOTAVERS, udp).\n" -#: rquota_svc.c:539 +#: rquota_svc.c:542 msgid "svc_run returned\n" msgstr "Retour de svc_run\n" @@ -2960,66 +3001,76 @@ msgid "Error creating socket: %s\n" msgstr "Impossible de crer la socket : %s\n" -#: svc_socket.c:122 +#: svc_socket.c:124 +#, fuzzy, c-format +msgid "Cannot set IPv6 socket options: %s\n" +msgstr "Impossible de fixer les options de la socket : %s\n" + +#: svc_socket.c:131 #, c-format msgid "Cannot set socket options: %s\n" msgstr "Impossible de fixer les options de la socket : %s\n" -#: svc_socket.c:128 +#: svc_socket.c:137 #, fuzzy, c-format msgid "Cannot bind to address: %s\n" msgstr "Impossible d'excuter bind() avec l'adresse donne : %s\n" +#: svc_socket.c:144 +#, fuzzy, c-format +msgid "Cannot listen to address: %s\n" +msgstr "Impossible d'excuter bind() avec l'adresse donne : %s\n" + #: xqmstats.c:32 xqmstats.c:37 msgid "The running kernel does not support XFS\n" msgstr "Le noyau en cours d'excution de supporte pas XFS\n" -#: xqmstats.c:49 +#: xqmstats.c:50 #, c-format msgid "XFS Quota Manager dquot statistics\n" msgstr "Statistiques dquot du gestionnaire de quotas XFS\n" -#: xqmstats.c:50 +#: xqmstats.c:51 #, c-format msgid " reclaims: %u\n" msgstr " demandes : %u\n" -#: xqmstats.c:51 +#: xqmstats.c:52 #, c-format msgid " missed reclaims: %u\n" msgstr " demandes manques : %u\n" -#: xqmstats.c:52 +#: xqmstats.c:53 #, c-format msgid " dquot dups: %u\n" msgstr " dquot en double : %u\n" -#: xqmstats.c:53 +#: xqmstats.c:54 #, c-format msgid " cache misses: %u\n" msgstr " dfaut de cache : %u\n" -#: xqmstats.c:54 +#: xqmstats.c:55 #, c-format msgid " cache hits: %u\n" msgstr " succs cache : %u\n" -#: xqmstats.c:55 +#: xqmstats.c:56 #, c-format msgid " dquot wants: %u\n" msgstr " besoins dquot : %u\n" -#: xqmstats.c:56 +#: xqmstats.c:57 #, c-format msgid " shake reclaims: %u\n" msgstr " demandes entames : %u\n" -#: xqmstats.c:57 +#: xqmstats.c:58 #, c-format msgid " inact reclaims: %u\n" msgstr " demandes inactives : %u\n" -#: xqmstats.c:62 +#: xqmstats.c:63 #, c-format msgid "Maximum %u dquots (currently %u incore, %u on freelist)\n" msgstr "Maximum %u dquots (actuellement %u inclus, %u sur liste libre)\n" @@ -3158,144 +3209,157 @@ msgid "Cannot read quotas from file.\n" msgstr "Impossible de lire les quotas depuis le fichier.\n" -#: quota.c:87 +#: quota.c:58 #, fuzzy msgid "Usage: quota [-guPqvswim] [-l | [-Q | -A]] [-F quotaformat]\n" msgstr "Utilisation : quota [-guqvs] [-l | -Q] [-F format_quota]\n" -#: quota.c:88 +#: quota.c:59 #, fuzzy msgid "\tquota [-qvswim] [-l | [-Q | -A]] [-F quotaformat] -u username ...\n" msgstr "\tquota [-qvs] [-l | -Q] [-F format_quota] -u utilisateur ...\n" -#: quota.c:89 +#: quota.c:60 #, fuzzy msgid "\tquota [-qvswim] [-l | [-Q | -A]] [-F quotaformat] -g groupname ...\n" msgstr "\tquota [-qvs] [-l | -Q] [-F format_quota] -g groupe ...\n" -#: quota.c:90 +#: quota.c:61 #, fuzzy msgid "\tquota [-qvswugPQm] [-F quotaformat] -f filesystem ...\n" msgstr "\tedquota [-u|g] [-F nom_format] [-f systme_fichier] -t\n" -#: quota.c:91 +#: quota.c:62 msgid "" "\n" -"-u, --user display quota for user\n" -"-g, --group display quota for group\n" -"-P, --project display quota for project\n" -"-q, --quiet print more terse message\n" -"-v, --verbose print more verbose message\n" -"-s, --human-readable display numbers in human friendly units (MB, " -"GB...)\n" -" --always-resolve always try to translate name to id, even if it is\n" -"\t\t\t composed of only digits\n" -"-w, --no-wrap do not wrap long lines\n" -"-p, --raw-grace print grace time in seconds since epoch\n" -"-l, --local-only do not query NFS filesystems\n" -"-Q, --quiet-refuse do not print error message when NFS server does\n" -" not respond\n" -"-i, --no-autofs do not query autofs mountpoints\n" -"-F, --format=formatname display quota of a specific format\n" -"-f, --filesystem-list display quota information only for given " -"filesystems\n" -"-A, --all-nfs display quota for all NFS mountpoints\n" -"-m, --no-mixed-pathnames trim leading slashes from NFSv4 mountpoints\n" -" --show-mntpoint show mount point of the file system in output\n" -" --hide-device do not show file system device in output\n" -"-h, --help display this help message and exit\n" -"-V, --version display version information and exit\n" +"-u, --user display quota for user\n" +"-g, --group display quota for group\n" +"-P, --project display quota for project\n" +"-q, --quiet print more terse message\n" +"-v, --verbose print more verbose message\n" +"-s, --human-readable[=units] display numbers in human friendly units (MB, " +"GB,\n" +" ...). Units can be also specified explicitely " +"by\n" +" an optional argument in format [kgt],[kgt] " +"where\n" +" the first character specifies space units and " +"the\n" +" second character specifies inode units\n" +" --always-resolve always try to translate name to id, even if it " +"is\n" +"\t\t\t composed of only digits\n" +"-w, --no-wrap do not wrap long lines\n" +"-p, --raw-grace print grace time in seconds since epoch\n" +"-l, --local-only do not query NFS filesystems\n" +"-Q, --quiet-refuse do not print error message when NFS server " +"does\n" +" not respond\n" +"-i, --no-autofs do not query autofs mountpoints\n" +"-F, --format=formatname display quota of a specific format\n" +"-f, --filesystem-list display quota information only for given\n" +" filesystems\n" +"-A, --all-nfs display quota for all NFS mountpoints\n" +"-m, --no-mixed-pathnames trim leading slashes from NFSv4 mountpoints\n" +" --show-mntpoint show mount point of the file system in output\n" +" --hide-device do not show file system device in output\n" +"-h, --help display this help message and exit\n" +"-V, --version display version information and exit\n" "\n" msgstr "" -#: quota.c:123 +#: quota.c:99 msgid "space" msgstr "" -#: quota.c:125 +#: quota.c:101 msgid "blocks" msgstr "blocs" -#: quota.c:127 +#: quota.c:103 #, fuzzy, c-format msgid "Disk quotas for %s %s (%cid %u): %s\n" msgstr "Quotas disque pour %s %s (%cid %d) : %s\n" -#: quota.c:130 +#: quota.c:106 msgid "Filesystem" msgstr "Systme fichiers" -#: quota.c:131 quota.c:132 +#: quota.c:107 quota.c:108 msgid "quota" msgstr "quota" -#: quota.c:131 quota.c:132 +#: quota.c:107 quota.c:108 msgid "limit" msgstr "limite" -#: quota.c:131 quota.c:132 +#: quota.c:107 quota.c:108 msgid "grace" msgstr "sursis" -#: quota.c:132 +#: quota.c:108 msgid "files" msgstr "fichiers" -#: quota.c:208 +#: quota.c:189 msgid "File limit reached on" msgstr "Limite de fichiers atteinte" -#: quota.c:214 +#: quota.c:195 msgid "In file grace period on" msgstr "Priode de sursis fichiers active" -#: quota.c:218 +#: quota.c:199 msgid "Over file quota on" msgstr "Quota dpassement fichiers activ" -#: quota.c:224 +#: quota.c:205 msgid "Block limit reached on" msgstr "Limite de blocs atteinte" -#: quota.c:230 +#: quota.c:211 msgid "In block grace period on" msgstr "Priode de sursis blocs active" -#: quota.c:234 +#: quota.c:215 msgid "Over block quota on" msgstr "Quota dpassement blocs activ" -#: quota.c:408 +#: quota.c:278 +msgid "no limited resources used" +msgstr "" + +#: quota.c:393 #, c-format msgid "Warning: Ignoring -%c when filesystem list specified.\n" msgstr "" -#: quota.c:415 +#: quota.c:400 #, fuzzy msgid "No filesystem specified.\n" msgstr "Aucun systme de fichier avec quotas dtect.\n" -#: quota.c:423 +#: quota.c:408 #, c-format msgid "Gid set allocation (%d): %s\n" msgstr "" -#: quota.c:429 +#: quota.c:414 #, fuzzy, c-format msgid "getgroups(): %s\n" msgstr "quota : getgroups() : %s\n" -#: quota.c:434 +#: quota.c:419 #, fuzzy msgid "Project reports not supported without project name\n" msgstr "Ce format de quotas n'est pas support par le noyau.\n" -#: common.c:124 +#: common.c:125 #, c-format msgid "Quota utilities version %s.\n" msgstr "Utilitaires quotas version %s.\n" -#: common.c:125 +#: common.c:126 #, fuzzy, c-format msgid "Compiled with:%s\n" msgstr "Compil avec " Binary files /tmp/tmpeemP7p/v7BeTqs21S/quota-4.04/po/pl.gmo and /tmp/tmpeemP7p/VdYLEKvDrH/quota-4.05/po/pl.gmo differ diff -Nru quota-4.04/po/pl.po quota-4.05/po/pl.po --- quota-4.04/po/pl.po 2017-09-05 14:53:15.000000000 +0000 +++ quota-4.05/po/pl.po 2019-03-29 10:53:18.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: quota 4.01\n" "Report-Msgid-Bugs-To: jack@suse.cz\n" -"POT-Creation-Date: 2017-09-05 16:53+0200\n" +"POT-Creation-Date: 2019-03-29 11:53+0100\n" "PO-Revision-Date: 2014-07-23 22:00+0200\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" @@ -16,12 +16,12 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: bylabel.c:253 +#: bylabel.c:274 #, c-format msgid "Found an invalid UUID: %s\n" msgstr "Znaleziono nieprawidłowy UUID: %s\n" -#: bylabel.c:273 +#: bylabel.c:294 #, c-format msgid "Error checking device name: %s\n" msgstr "Błąd podczas sprawdzania nazwy urządzenia: %s\n" @@ -57,8 +57,8 @@ "zakończenie\n" "\n" -#: convertquota.c:48 warnquota.c:1028 quotacheck.c:314 repquota.c:68 -#: common.c:126 +#: convertquota.c:48 warnquota.c:1046 quotacheck.c:314 repquota.c:73 +#: common.c:127 #, c-format msgid "Bugs to %s\n" msgstr "Błędy na adres %s\n" @@ -67,8 +67,8 @@ msgid "You have to specify source and target format of conversion.\n" msgstr "Trzeba podać źródłowy i docelowy format do konwersji.\n" -#: convertquota.c:112 quotacheck.c:400 quotasync.c:88 repquota.c:154 -#: quotaon.c:143 setquota.c:264 +#: convertquota.c:112 quotacheck.c:400 quotasync.c:88 repquota.c:163 +#: quotaon.c:113 setquota.c:264 msgid "Bad number of arguments.\n" msgstr "Błędna liczba argumentów.\n" @@ -105,7 +105,7 @@ msgid "Cannot get name of new quotafile.\n" msgstr "Nie można uzyskać nazwy nowego pliku limitów.\n" -#: convertquota.c:302 quotacheck.c:764 +#: convertquota.c:302 quotacheck.c:765 #, c-format msgid "Cannot rename new quotafile %s to name %s: %s\n" msgstr "Nie można zmienić nazwy nowego pliku limitów %s na %s: %s\n" @@ -125,7 +125,7 @@ msgid "Cannot open old quota file on %s: %s\n" msgstr "Nie można otworzyć starego pliku limitów na %s: %s\n" -#: convertquota.c:380 +#: convertquota.c:381 msgid "Unknown action should be performed.\n" msgstr "Miała być wykonana nieznana akcja.\n" @@ -258,37 +258,44 @@ msgid "Could not setup ldap connection.\n" msgstr "Nie można nawiązać połączenia LDAP, powrót.\n" -#: warnquota.c:422 +#: warnquota.c:417 +#, c-format +msgid "" +"Could not format LDAP search filter for %s user and %s search attribute due " +"to excessive length.\n" +msgstr "" + +#: warnquota.c:428 #, c-format msgid "Error with %s.\n" msgstr "Błąd przy %s.\n" -#: warnquota.c:423 +#: warnquota.c:429 #, c-format msgid "ldap_search_ext_s() failed: %s\n" msgstr "" -#: warnquota.c:429 +#: warnquota.c:435 #, fuzzy, c-format msgid "Multiple entries found for client %s (%d).\n" msgstr "Znaleziono wiele wpisów dla klienta %s (%d). Nie wysłano wiadomości.\n" -#: warnquota.c:433 +#: warnquota.c:439 #, fuzzy, c-format msgid "Entry not found for client %s.\n" msgstr "Nie znaleziono wpisu dla klienta %s. Nie wysłano wiadomości.\n" -#: warnquota.c:443 +#: warnquota.c:449 #, c-format msgid "Could not get values for %s.\n" msgstr "Nie można uzyskać wartości dla %s.\n" -#: warnquota.c:489 +#: warnquota.c:495 #, c-format msgid "Administrator for a group %s not found. Cancelling mail.\n" msgstr "Nie znaleziono administratora dla grupy %s. Anulowanie poczty.\n" -#: warnquota.c:541 +#: warnquota.c:547 #, c-format msgid "" "\n" @@ -297,23 +304,23 @@ "\n" " Limity bloków Limity plików\n" -#: warnquota.c:542 +#: warnquota.c:548 #, c-format msgid "" "Filesystem used soft hard grace used soft hard grace\n" msgstr "" "System plików używ. mięk. twar. pobł. używ. mięk. twar. pobł.\n" -#: warnquota.c:582 +#: warnquota.c:588 #, c-format msgid "Cannot wait for mailer: %s\n" msgstr "Nie można czekać na wysłanie poczty: %s\n" -#: warnquota.c:584 +#: warnquota.c:590 msgid "Warning: Mailer exitted abnormally.\n" msgstr "Uwaga: Program wysyłający pocztę nie zakończył się normalnie.\n" -#: warnquota.c:641 +#: warnquota.c:647 #, c-format msgid "" "Cannot open %s: %s\n" @@ -322,17 +329,17 @@ "Nie można otworzyć %s: %s\n" "Będą używane nazwy urządzeń.\n" -#: warnquota.c:664 +#: warnquota.c:670 #, c-format msgid "Cannot parse line %d in quotatab (missing ':')\n" msgstr "Nie można przeanalizować linii %d w pliku quotatab (brakuje ':')\n" -#: warnquota.c:678 +#: warnquota.c:684 #, c-format msgid "Cannot stat device %s (maybe typo in quotatab)\n" msgstr "Nie można wykonać stat na urządzeniu %s (może błąd w quotatab)\n" -#: warnquota.c:698 +#: warnquota.c:704 #, c-format msgid "" "Incorrect format string for variable %s.\n" @@ -341,36 +348,41 @@ "Niepoprawny łańcuch formatujący dla zmiennej %s.\n" "Nierozpoznane wyrażenie %%%c.\n" -#: warnquota.c:749 +#: warnquota.c:755 #, c-format msgid "Cannot open %s: %s\n" msgstr "nie można otworzyć %s: %s\n" -#: warnquota.c:769 +#: warnquota.c:775 #, c-format msgid "Line %d too long. Truncating.\n" msgstr "Linia %d zbyt długa. Ucięto.\n" -#: warnquota.c:835 +#: warnquota.c:841 #, c-format msgid "Cannot parse time at CC_BEFORE variable (line %d).\n" msgstr "Nie można przetworzyć czasu przy zmiennej CC_BEFORE (linia %d).\n" -#: warnquota.c:885 +#: warnquota.c:891 #, c-format msgid "Error in config file (line %d), ignoring\n" msgstr "Błąd w pliku konfiguracyjnym (linia %d), zignorowano\n" -#: warnquota.c:888 +#: warnquota.c:894 #, c-format msgid "Possible error in config file (line %d), ignoring\n" msgstr "Możliwy błąd w pliku konfiguracyjnym (linia %d), zignorowano\n" -#: warnquota.c:891 +#: warnquota.c:897 msgid "Unterminated last line, ignoring\n" msgstr "Niezakończona ostatnia linia, zignorowano\n" -#: warnquota.c:897 +#: warnquota.c:905 +#, c-format +msgid "Could not format LDAP URI because it's longer than %d bytes.\n" +msgstr "" + +#: warnquota.c:910 #, c-format msgid "" "LDAP library version >= 2.3 detected. Please use LDAP_URI instead of " @@ -381,30 +393,31 @@ "hosta i portu.\n" "Wygenerowano URI %s\n" -#: warnquota.c:919 +#: warnquota.c:932 #, c-format msgid "Cannot open file with group administrators: %s\n" msgstr "Nie można otworzyć pliku z administratorami grup: %s\n" -#: warnquota.c:934 +#: warnquota.c:947 #, c-format msgid "Parse error at line %d. Cannot find end of group name.\n" msgstr "Błąd podczas analizy linii %d. Nie można znaleźć nazwy grupy.\n" -#: warnquota.c:943 +#: warnquota.c:956 #, c-format msgid "Parse error at line %d. Cannot find administrators name.\n" msgstr "" "Błąd podczas analizy linii %d. Nie można znaleźć nazwy administratora.\n" -#: warnquota.c:953 +#: warnquota.c:966 #, c-format msgid "" "Parse error at line %d. Trailing characters after administrators name.\n" msgstr "" "Błąd podczas analizy linii %d. Nadmiarowe znaki po nazwie administratora.\n" -#: warnquota.c:1016 +#: warnquota.c:1029 +#, fuzzy msgid "" "Usage:\n" " warnquota [-ugsid] [-F quotaformat] [-c configfile] [-q quotatabfile] [-a " @@ -412,8 +425,16 @@ "\n" "-u, --user warn users\n" "-g, --group warn groups\n" -"-s, --human-readable send information in more human friendly " -"units\n" +"-s, --human-readable[=units] display numbers in human friendly units " +"(MB,\n" +" GB, ...). Units can be also specified\n" +" explicitely by an optional argument in " +"format\n" +" [kgt],[kgt] where the first character " +"specifies\n" +" space units and the second character " +"specifies\n" +" inode units\n" "-i, --no-autofs avoid autofs mountpoints\n" "-d, --no-details do not send quota information itself\n" "-F, --format=formatname use quotafiles of specific format\n" @@ -443,7 +464,12 @@ "zakończenie\n" "\n" -#: warnquota.c:1097 +#: warnquota.c:1102 repquota.c:134 quota.c:343 +#, c-format +msgid "Bad output format units for human readable output: %s\n" +msgstr "" + +#: warnquota.c:1119 #, c-format msgid "Cannot get host name: %s\n" msgstr "Nie można uzyskać nazwy hosta: %s\n" @@ -595,22 +621,22 @@ "Lepiej najpierw uruchomić fsck!\n" "zakończenie...\n" -#: quotacheck.c:550 +#: quotacheck.c:551 #, c-format msgid "pushd %s/%s\n" msgstr "pushd %s/%s\n" -#: quotacheck.c:566 +#: quotacheck.c:567 #, c-format msgid "\tAdding %s size %lld ino %d links %d uid %u gid %u\n" msgstr "" "\tDodawanie %s, o rozmiarze %lld, i-węzeł %d, dowiązań %d uid %u gid %u\n" -#: quotacheck.c:576 +#: quotacheck.c:577 msgid "Scanning stored directories from directory stack\n" msgstr "Skanowanie zapisanych na stosie katalogów\n" -#: quotacheck.c:580 +#: quotacheck.c:581 #, c-format msgid "" "popd %s\n" @@ -619,17 +645,17 @@ "popd %s\n" "Wejście do katalogu %s\n" -#: quotacheck.c:592 +#: quotacheck.c:593 #, c-format msgid "Leaving %s\n" msgstr "Opuszczanie %s\n" -#: quotacheck.c:632 +#: quotacheck.c:633 #, c-format msgid "Going to check %s quota file of %s\n" msgstr "Rozpoczynanie sprawdzania pliku limitów %s na %s\n" -#: quotacheck.c:638 +#: quotacheck.c:639 #, c-format msgid "" "Quota for %ss is enabled on mountpoint %s so quotacheck might damage the " @@ -638,16 +664,16 @@ "Limity %s włączone w punkcie montowania %s - quotacheck może uszkodzić " "plik.\n" -#: quotacheck.c:639 quotacheck.c:957 +#: quotacheck.c:640 quotacheck.c:967 msgid "Should I continue?" msgstr "Czy kontynuować?" -#: quotacheck.c:640 quotacheck.c:958 +#: quotacheck.c:641 quotacheck.c:968 #, c-format msgid "As you wish... Canceling check of this file.\n" msgstr "Wedle życzenia... anulowanie sprawdzania tego pliku.\n" -#: quotacheck.c:645 +#: quotacheck.c:646 #, c-format msgid "" "Quota for %ss is enabled on mountpoint %s so quotacheck might damage the " @@ -658,129 +684,129 @@ "plik.\n" "Proszę wyłączyć limity lub użyć -f, aby wymusić sprawdzanie.\n" -#: quotacheck.c:652 +#: quotacheck.c:653 #, c-format msgid "Error while syncing quotas on %s: %s\n" msgstr "Błąd podczas synchronizacji limitów na %s: %s\n" -#: quotacheck.c:657 +#: quotacheck.c:658 #, c-format msgid "Cannot get quotafile name for %s\n" msgstr "Nie można uzyskać nazwy pliku limitów dla %s\n" -#: quotacheck.c:662 quotaio.c:150 quotasys.c:820 +#: quotacheck.c:663 quotaio.c:151 quotasys.c:843 #, c-format msgid "Cannot open quotafile %s: %s\n" msgstr "Nie można otworzyć pliku limitów %s: %s\n" -#: quotacheck.c:702 +#: quotacheck.c:703 msgid "Renaming new files to proper names.\n" msgstr "Zmiana nazw nowych plików na właściwe.\n" -#: quotacheck.c:704 +#: quotacheck.c:705 #, c-format msgid "Cannot get name of old quotafile on %s.\n" msgstr "Nie można uzyskać nazwy starego pliku limitów na %s.\n" -#: quotacheck.c:707 +#: quotacheck.c:708 msgid "Old file not found.\n" msgstr "Nie znaleziono starego pliku.\n" -#: quotacheck.c:710 +#: quotacheck.c:711 #, c-format msgid "Error while searching for old quota file %s: %s\n" msgstr "Błąd podczas poszukiwania starego pliku limitów %s: %s\n" -#: quotacheck.c:719 +#: quotacheck.c:720 msgid "Old file found removed during check!\n" msgstr "Stary plik został usunięty przy sprawdzaniu!\n" -#: quotacheck.c:722 +#: quotacheck.c:723 #, c-format msgid "Error while opening old quota file %s: %s\n" msgstr "Błąd podczas otwierania starego pliku limitów %s: %s\n" -#: quotacheck.c:728 +#: quotacheck.c:729 #, c-format msgid "EXT2_IOC_GETFLAGS failed: %s\n" msgstr "ioctl XFS_IOC_GETFLAGS nie powiódł się: %s\n" -#: quotacheck.c:732 +#: quotacheck.c:733 #, c-format msgid "Quota file %s has IMMUTABLE flag set. Clearing.\n" msgstr "" "Plik limitów %s ma ustawioną flagę niezmienności (IMMUTABLE). Czyszczenie.\n" -#: quotacheck.c:735 +#: quotacheck.c:736 #, c-format msgid "Failed to remove IMMUTABLE flag from quota file %s: %s\n" msgstr "" "Nie udało się usunąć flagi niezmienności (IMMUTABLE) z pliku limitów %s: %s\n" -#: quotacheck.c:744 +#: quotacheck.c:745 #, c-format msgid "Renaming old quotafile to %s~\n" msgstr "Zmiana nazwy starego pliku limitów na %s~\n" -#: quotacheck.c:750 +#: quotacheck.c:751 #, c-format msgid "Name of quota file too long. Contact %s.\n" msgstr "Nazwa pliku limitów zbyt długa. Proszę o kontakt z %s.\n" -#: quotacheck.c:752 +#: quotacheck.c:753 #, c-format msgid "Cannot rename old quotafile %s to %s: %s\n" msgstr "Nie można zmienić nazwy starego pliku limitów %s na %s: %s\n" -#: quotacheck.c:758 +#: quotacheck.c:759 msgid "Renaming new quotafile\n" msgstr "Zmiana nazwy nowego pliku limitów\n" -#: quotacheck.c:770 +#: quotacheck.c:771 #, c-format msgid "Cannot change permission of %s: %s\n" msgstr "Nie można zmienić uprawnień %s: %s\n" -#: quotacheck.c:777 +#: quotacheck.c:778 #, c-format msgid "Cannot open new quota file %s: %s\n" msgstr "Nie można otworzyć nowego pliku limitów %s: %s\n" -#: quotacheck.c:782 +#: quotacheck.c:783 #, c-format msgid "Warning: Cannot set EXT2 flags on %s: %s\n" msgstr "Uwaga: Nie można ustawić flag EXT2 na %s: %s\n" -#: quotacheck.c:802 +#: quotacheck.c:803 #, c-format msgid "Dumping gathered data for %ss.\n" msgstr "Zrzucanie zgromadzonych danych typu %s.\n" -#: quotacheck.c:805 +#: quotacheck.c:806 #, c-format msgid "Cannot initialize IO on xfs/gfs2 quotafile: %s\n" msgstr "Nie można zainicjować we/wy na pliku limitów xfs/gfs2: %s\n" -#: quotacheck.c:811 +#: quotacheck.c:812 #, c-format msgid "Cannot initialize IO on new quotafile: %s\n" msgstr "Nie można zainicjować we/wy na nowym pliku limitów: %s\n" -#: quotacheck.c:838 +#: quotacheck.c:839 #, c-format msgid "Cannot finish IO on new quotafile: %s\n" msgstr "Nie można zakończyć we/wy na nowym pliku limitów: %s\n" -#: quotacheck.c:841 +#: quotacheck.c:842 msgid "Data dumped.\n" msgstr "Dane zrzucone.\n" -#: quotacheck.c:849 +#: quotacheck.c:850 #, c-format msgid "Cannot find checked quota file for %ss on %s!\n" msgstr "Nie można znaleźć sprawdzonego pliku limitów %s na %s!\n" -#: quotacheck.c:853 +#: quotacheck.c:854 #, c-format msgid "" "Cannot turn %s quotas off on %s: %s\n" @@ -789,7 +815,7 @@ "Nie można wyłączyć limitów %s na %s: %s\n" "Jądro nie zauważy zmian wykonanych przez checkquota.\n" -#: quotacheck.c:866 +#: quotacheck.c:867 #, c-format msgid "" "Cannot turn %s quotas on on %s: %s\n" @@ -798,26 +824,26 @@ "Nie można włączyć limitów %s na %s: %s\n" "Jądro nie zauważy zmian wykonanych przez checkquota.\n" -#: quotacheck.c:892 +#: quotacheck.c:893 #, c-format msgid "Substracting space used by old %s quota file.\n" msgstr "Odejmowanie miejsca użytego przez stary plik limitów %s.\n" -#: quotacheck.c:894 +#: quotacheck.c:895 #, c-format msgid "" "Old %s file name could not been determined. Usage will not be subtracted.\n" msgstr "" "Nie udało się określić nazwy starego pliku %s. Miejsce nie będzie odjęte.\n" -#: quotacheck.c:899 +#: quotacheck.c:900 #, c-format msgid "Cannot stat old %s quota file %s: %s. Usage will not be subtracted.\n" msgstr "" "Nie można wykonać stat starego pliku limitów %s %s: %s. Miejsce nie będzie " "odjęte.\n" -#: quotacheck.c:911 +#: quotacheck.c:912 #, c-format msgid "" "Quota structure for %s owning quota file not present! Something is really " @@ -826,22 +852,22 @@ "Brak struktury limitów %s dla właściciela pliku limitów! Coś jest naprawdę " "źle...\n" -#: quotacheck.c:916 +#: quotacheck.c:917 #, c-format msgid "Substracted %lu bytes.\n" msgstr "Odjęto %lu bajtów.\n" -#: quotacheck.c:929 +#: quotacheck.c:931 #, c-format msgid "Cannot stat mountpoint %s: %s\n" msgstr "Nie można wykonać stat na punkcie montowania %s: %s\n" -#: quotacheck.c:931 +#: quotacheck.c:933 #, c-format msgid "Mountpoint %s is not a directory?!\n" msgstr "Punkt montowania %s nie jest katalogiem?!\n" -#: quotacheck.c:956 +#: quotacheck.c:966 #, c-format msgid "" "Cannot remount filesystem mounted on %s read-only. Counted values might not " @@ -850,7 +876,7 @@ "Nie można przemontować r/o systemu plików zamontowanego pod %s. Policzone " "wartości mogą być błędne.\n" -#: quotacheck.c:964 +#: quotacheck.c:974 #, c-format msgid "" "Cannot remount filesystem mounted on %s read-only so counted values might " @@ -864,25 +890,25 @@ "ten\n" "system plików lub użyć flagi -m, aby wymusić sprawdzanie.\n" -#: quotacheck.c:972 +#: quotacheck.c:982 msgid "Filesystem remounted read-only\n" msgstr "System plików przemontowany tylko do odczytu\n" -#: quotacheck.c:975 +#: quotacheck.c:985 #, c-format msgid "Scanning %s [%s] " msgstr "Skanowanie %s [%s] " -#: quotacheck.c:995 +#: quotacheck.c:1011 msgid "done\n" msgstr "zrobiono\n" -#: quotacheck.c:1004 +#: quotacheck.c:1020 #, c-format msgid "Checked %d directories and %d files\n" msgstr "Sprawdzono %d katalogów i %d plików\n" -#: quotacheck.c:1008 +#: quotacheck.c:1024 #, c-format msgid "" "Cannot remount filesystem %s read-write. cannot write new quota files.\n" @@ -890,26 +916,26 @@ "Nie można przemontować r/w systemu plików %s. Nie można zapisać nowych " "plików.\n" -#: quotacheck.c:1009 +#: quotacheck.c:1025 msgid "Filesystem remounted RW.\n" msgstr "Przemontowano system plików do zapisu i odczytu.\n" -#: quotacheck.c:1052 +#: quotacheck.c:1069 #, c-format msgid "Cannot find quota option on filesystem %s with quotas!\n" msgstr "Nie można znaleźć opcji limitów dla systemu plików %s z limitami!\n" -#: quotacheck.c:1058 +#: quotacheck.c:1075 #, c-format msgid "Cannot detect quota format for journalled quota on %s\n" msgstr "Nie można wykryć formatu limitów dla limitów z kroniką na %s\n" -#: quotacheck.c:1124 +#: quotacheck.c:1141 #, c-format msgid "Cannot get system info: %s\n" msgstr "Nie można uzyskać informacji systemowych: %s\n" -#: quotacheck.c:1144 +#: quotacheck.c:1161 msgid "" "Your kernel probably supports journaled quota but you are not using it. " "Consider switching to journaled quota to avoid running quotacheck after an " @@ -919,16 +945,16 @@ "Proszę rozważyć przejście na limity z kroniką, aby zapobiec uruchamianiu " "quotacheck po każdym nienormalnym zamknięciu systemu.\n" -#: quotacheck.c:1158 quotasys.c:910 +#: quotacheck.c:1175 quotasys.c:933 msgid "Cannot initialize mountpoint scan.\n" msgstr "Nie można zainicjować skanu punktów montowania.\n" -#: quotacheck.c:1163 +#: quotacheck.c:1180 #, c-format msgid "Skipping %s [%s]\n" msgstr "Pomijanie %s [%s]\n" -#: quotacheck.c:1180 +#: quotacheck.c:1197 #, c-format msgid "" "Cannot guess format from filename on %s. Please specify format on " @@ -937,12 +963,12 @@ "Nie można odgadnąć formatu z nazwy pliku na %s. Proszę podać format w " "poleceniu.\n" -#: quotacheck.c:1185 +#: quotacheck.c:1202 #, c-format msgid "Detected quota format %s\n" msgstr "Wykryto format limitów %s\n" -#: quotacheck.c:1206 +#: quotacheck.c:1223 msgid "" "Cannot find filesystem to check or filesystem not mounted with quota " "option.\n" @@ -950,7 +976,7 @@ "Nie znaleziono systemu plików do sprawdzenia lub nie jest zamontowany z " "obsługą limitów.\n" -#: quotacheck.c:1224 +#: quotacheck.c:1241 #, c-format msgid "" "Allocated %d bytes memory\n" @@ -961,57 +987,57 @@ "Zwolniono %d bajtów\n" "Stracono %d bajtów\n" -#: quot.c:81 +#: quot.c:82 #, c-format msgid "Usage: %s [-acfugvViTq] [filesystem...]\n" msgstr "Składnia: %s [-acfugvViTq] [system-plików...]\n" -#: quot.c:178 +#: quot.c:180 #, c-format msgid "%s (%s):\n" msgstr "%s (%s):\n" -#: quot.c:182 quot.c:186 +#: quot.c:184 quot.c:188 #, c-format msgid "%d\t%llu\t%llu\n" msgstr "%d\t%llu\t%llu\n" -#: quot.c:195 +#: quot.c:197 #, c-format msgid "%s (%s) %ss:\n" msgstr "%s (%s) %ss:\n" -#: quot.c:203 quot.c:205 +#: quot.c:205 quot.c:207 #, c-format msgid "%8llu " msgstr "%8llu " -#: quot.c:208 +#: quot.c:210 #, c-format msgid "%s" msgstr "%s" -#: quot.c:210 +#: quot.c:212 #, c-format msgid "%-8.8s" msgstr "%-8.8s" -#: quot.c:212 +#: quot.c:214 #, c-format msgid "#%-7d" msgstr "#%-7d" -#: quot.c:214 +#: quot.c:216 #, c-format msgid " %8llu %8llu %8llu" msgstr " %8llu %8llu %8llu" -#: quot.c:362 +#: quot.c:364 #, c-format msgid "cannot open %s: %s\n" msgstr "nie można otworzyć %s: %s\n" -#: quot.c:382 +#: quot.c:384 #, c-format msgid "XFS_IOC_FSBULKSTAT ioctl failed: %s\n" msgstr "ioctl XFS_IOC_FSBULKSTAT nie powiódł się: %s\n" @@ -1063,19 +1089,19 @@ msgid "%s quota sync failed for %s: %s\n" msgstr "Synchronizacja limitów %s dla %s nie powiodła się: %s\n" -#: quota.h:22 +#: quota.h:23 msgid "user" msgstr "użytkownika" -#: quota.h:23 +#: quota.h:24 msgid "group" msgstr "grupy" -#: quota.h:24 +#: quota.h:25 msgid "project" msgstr "" -#: quota.h:25 +#: quota.h:26 msgid "undefined" msgstr "nieznany" @@ -1155,126 +1181,131 @@ msgid "Cannot connect to system DBUS: %s\n" msgstr "Nie można połączyć się z systemowym DBUS-em: %s\n" -#: quota_nld.c:289 +#: quota_nld.c:292 #, c-format msgid "Failed to find tty of user %llu to report warning to.\n" msgstr "" "Nie udało się odnaleźć tty użytkownika %llu w celu zgłoszenia ostrzeżenia.\n" -#: quota_nld.c:294 +#: quota_nld.c:297 #, c-format msgid "Failed to open tty %s of user %llu to report warning.\n" msgstr "" "Nie udało się otworzyć tty %s użytkownika %llu w celu zgłoszenia " "ostrzeżenia.\n" -#: quota_nld.c:300 +#: quota_nld.c:303 msgid "Warning" msgstr "Uwaga" -#: quota_nld.c:303 +#: quota_nld.c:306 msgid "Error" msgstr "Błąd" -#: quota_nld.c:305 +#: quota_nld.c:308 msgid "Info" msgstr "Informacja" -#: quota_nld.c:308 +#: quota_nld.c:311 msgid "file limit reached" msgstr "osiągnięto twardy limit plików" -#: quota_nld.c:311 +#: quota_nld.c:314 msgid "file quota exceeded too long" msgstr "miękki limit plików przekroczony zbyt długo" -#: quota_nld.c:314 +#: quota_nld.c:317 msgid "file quota exceeded" msgstr "przekroczono miękki limit plików" -#: quota_nld.c:317 +#: quota_nld.c:320 msgid "block limit reached" msgstr "osiągnięto twardy limit bloków" -#: quota_nld.c:320 +#: quota_nld.c:323 msgid "block quota exceeded too long" msgstr "miękki limit bloków przekroczony zbyt długo" -#: quota_nld.c:323 +#: quota_nld.c:326 msgid "block quota exceeded" msgstr "przekroczono miękki limit bloków" -#: quota_nld.c:326 +#: quota_nld.c:329 msgid "got below file limit" msgstr "zejście poniżej twardego limitu plików" -#: quota_nld.c:329 +#: quota_nld.c:332 msgid "got below file quota" msgstr "zejście poniżej miękkiego limitu plików" -#: quota_nld.c:332 +#: quota_nld.c:335 msgid "got below block limit" msgstr "zejście poniżej twardego limitu bloków" -#: quota_nld.c:335 +#: quota_nld.c:338 msgid "got below block quota" msgstr "zejście poniżej miękkiego limitu bloków" -#: quota_nld.c:338 +#: quota_nld.c:341 msgid "unknown quota warning" msgstr "nieznane ostrzeżenie dotyczące limitów" -#: quota_nld.c:342 +#: quota_nld.c:345 #, c-format msgid "Failed to write quota message for user %llu to %s: %s\n" msgstr "" "Nie udało się wypisać komunikatu o limicie dla użytkownika %llu na %s: %s\n" -#: quota_nld.c:355 +#: quota_nld.c:358 msgid "Cannot create DBUS message: No enough memory.\n" msgstr "Nie można utworzyć komunikatu DBUS: za mało pamięci.\n" -#: quota_nld.c:373 +#: quota_nld.c:376 msgid "Failed to write message to dbus: No enough memory.\n" msgstr "Nie udało się wypisać komunikatu przez dbus: za mało pamięci.\n" -#: quota_nld.c:389 +#: quota_nld.c:392 #, c-format msgid "Failed to read or parse quota netlink message: %s\n" msgstr "Nie udało się odczytać lub przeanalizować komunikatu netlink: %s\n" -#: quota_nld.c:400 +#: quota_nld.c:403 msgid "Undefined program name.\n" msgstr "Niezdefiniowana nazwa programu.\n" -#: quota_nld.c:405 +#: quota_nld.c:408 msgid "Not enough memory to build PID file name.\n" msgstr "Za mało pamięci, aby zbudować nazwę pliku PID.\n" -#: quota_nld.c:424 +#: quota_nld.c:427 #, c-format msgid "Could not open PID file '%s': %s\n" msgstr "Nie udało się otworzyć pliku PID '%s': %s\n" -#: quota_nld.c:430 +#: quota_nld.c:433 #, c-format msgid "Could not write daemon's PID into '%s'.\n" msgstr "Nie udało się zapisać PID-u demona do '%s'.\n" -#: quota_nld.c:437 +#: quota_nld.c:440 #, c-format msgid "Could not close PID file '%s'.\n" msgstr "Nie udało się zamknąć pliku PID-u '%s'.\n" -#: quota_nld.c:467 +#: quota_nld.c:470 msgid "Could not register PID file removal on SIGTERM.\n" msgstr "Nie udało się zarejestrować usuwania pliku PID-u pod SIGTERM.\n" -#: quota_nld.c:469 +#: quota_nld.c:472 #, c-format msgid "Could not store my PID %jd.\n" msgstr "Nie udało się zapisać własnego PID-u %jd.\n" +#: quota_nld.c:489 rquota_svc.c:537 +#, fuzzy, c-format +msgid "Failed to daemonize: %s\n" +msgstr "Nie udało się usunąć limitów: %s\n" + #: repquota.c:51 #, fuzzy, c-format msgid "" @@ -1283,24 +1314,31 @@ "%s [-vugsi] [-c|C] [-t|n] [-F quotaformat] [-O (default | xml | csv)] (-a | " "mntpoint)\n" "\n" -"-v, --verbose display also users/groups without any usage\n" -"-u, --user display information about users\n" -"-g, --group display information about groups\n" -"-P, --project display information about projects\n" -"-s, --human-readable show numbers in human friendly units (MB, " -"GB, ...)\n" -"-t, --truncate-names truncate names to 9 characters\n" -"-p, --raw-grace print grace time in seconds since epoch\n" -"-n, --no-names do not translate uid/gid to name\n" -"-i, --no-autofs avoid autofs mountpoints\n" -"-c, --cache translate big number of ids at once\n" -"-C, --no-cache translate ids one by one\n" -"-F, --format=formatname report information for specific format\n" -"-O, --output=format format output as xml or csv\n" -"-a, --all report information for all mount points with " -"quotas\n" -"-h, --help display this help message and exit\n" -"-V, --version display version information and exit\n" +"-v, --verbose display also users/groups without any usage\n" +"-u, --user display information about users\n" +"-g, --group display information about groups\n" +"-P, --project display information about projects\n" +"-s, --human-readable[=units] display numbers in human friendly units (MB, " +"GB,\n" +" ...). Units can be also specified explicitely " +"by\n" +" an optional argument in format [kgt],[kgt] " +"where\n" +" the first character specifies space units and " +"the\n" +" second character specifies inode units\n" +"-t, --truncate-names truncate names to 9 characters\n" +"-p, --raw-grace print grace time in seconds since epoch\n" +"-n, --no-names do not translate uid/gid to name\n" +"-i, --no-autofs avoid autofs mountpoints\n" +"-c, --cache translate big number of ids at once\n" +"-C, --no-cache translate ids one by one\n" +"-F, --format=formatname report information for specific format\n" +"-O, --output=format format output as xml or csv\n" +"-a, --all report information for all mount points with\n" +" quotas\n" +"-h, --help display this help message and exit\n" +"-V, --version display version information and exit\n" "\n" msgstr "" "Narzędzie do raportowania o limitach.\n" @@ -1326,51 +1364,51 @@ "-V, --version wyświetlenie informacji o wersji i zakończenie\n" "\n" -#: repquota.c:158 +#: repquota.c:167 msgid "Repquota cannot report through RPC calls.\n" msgstr "repquota nie może raportować poprzez wywołania RPC.\n" -#: repquota.c:162 +#: repquota.c:171 msgid "Specified both -n and -t but only one of them can be used.\n" msgstr "Podano jednocześnie -n i -t, ale tylko jedna z nich może być użyte.\n" -#: repquota.c:366 +#: repquota.c:375 msgid "User" msgstr "Użytkownik" -#: repquota.c:368 +#: repquota.c:377 msgid "Group" msgstr "Grupa" -#: repquota.c:370 +#: repquota.c:379 msgid "Project" msgstr "" -#: repquota.c:373 +#: repquota.c:382 #, c-format msgid "*** Report for %s quotas on device %s\n" msgstr "*** Raport dla limitów %s na urządzeniu %s\n" -#: repquota.c:382 +#: repquota.c:391 msgid "Space" msgstr "miejsca" -#: repquota.c:384 +#: repquota.c:393 msgid "Block" msgstr "bloków" -#: repquota.c:385 +#: repquota.c:394 #, c-format msgid "Block grace time: %s; Inode grace time: %s\n" msgstr "" "Okres pobłażliwości dla bloków: %s; Okres pobłażliwości dla i-węzłów: %s\n" -#: repquota.c:386 +#: repquota.c:395 #, c-format msgid " %s limits File limits\n" msgstr " Limity %-7s Limity plików\n" -#: repquota.c:387 +#: repquota.c:396 #, c-format msgid "%-9s used soft hard grace used soft hard grace\n" msgstr "%-9s używ. mięk. twar. pobł. używ. mięk. twar. pobł.\n" @@ -1549,7 +1587,12 @@ msgid "WARNING - Quota file %s has corrupted headers\n" msgstr "UWAGA - plik limitów %s ma uszkodzone nagłówki\n" -#: quotacheck_v2.c:362 +#: quotacheck_v2.c:361 +#, fuzzy +msgid "Continue checking assuming format from command line?" +msgstr "Kontynuować sprawdzanie przy założeniu wersji podanej z linii poleceń?" + +#: quotacheck_v2.c:365 #, c-format msgid "" "Quota file format version %d does not match the one specified on command " @@ -1558,33 +1601,33 @@ "Wersja formatu pliku limitów %d nie zgadza się z wersją podaną z linii " "poleceń (%d). Plik limitów może być uszkodzony.\n" -#: quotacheck_v2.c:366 +#: quotacheck_v2.c:370 msgid "Continue checking assuming version from command line?" msgstr "Kontynuować sprawdzanie przy założeniu wersji podanej z linii poleceń?" -#: quotacheck_v2.c:372 +#: quotacheck_v2.c:376 msgid "Headers checked.\n" msgstr "Nagłówki sprawdzone.\n" -#: quotacheck_v2.c:388 +#: quotacheck_v2.c:392 #, c-format msgid "Do not know how to buffer format %d\n" msgstr "Nie wiem jak buforować format %d\n" -#: quotacheck_v2.c:398 +#: quotacheck_v2.c:402 #, c-format msgid "Headers of file %s checked. Going to load data...\n" msgstr "Nagłówki pliku %s sprawdzone. Rozpoczęcie wczytywania danych...\n" -#: quotacheck_v2.c:406 +#: quotacheck_v2.c:410 msgid "Cannot gather quota data. Tree root node corrupted.\n" msgstr "Nie można zgromadzić danych o limitach. Korzeń drzewa uszkodzony.\n" -#: quotacheck_v2.c:414 +#: quotacheck_v2.c:418 msgid "WARNING - Some data might be changed due to corruption.\n" msgstr "UWAGA - część danych może być zmieniona z powodu uszkodzenia.\n" -#: quotacheck_v2.c:417 +#: quotacheck_v2.c:421 msgid "Not found any corrupted blocks. Congratulations.\n" msgstr "Nie znaleziono żadnych uszkodzonych bloków. Gratulacje.\n" @@ -1600,42 +1643,42 @@ msgid "RPC quota format specified for non-NFS filesystem.\n" msgstr "Podano format limitów RPC dla systemu plików innego niż NFS.\n" -#: quotaio.c:84 +#: quotaio.c:85 msgid "Only XFS quota format is allowed on XFS filesystem.\n" msgstr "Na systemie plików XFS dozwolony jest tylko format limitów XFS.\n" -#: quotaio.c:95 +#: quotaio.c:96 msgid "XFS quota allowed only on XFS filesystem.\n" msgstr "Format limitów XFS dozwolony tylko na systemie plików XFS.\n" -#: quotaio.c:109 +#: quotaio.c:110 msgid "Quota not supported by the filesystem.\n" msgstr "Limity nie są obsługiwane przez ten system plików.\n" -#: quotaio.c:129 +#: quotaio.c:130 msgid "Cannot find any quota file to work on.\n" msgstr "Nie znaleziono żadnego pliku limitów do operowania na nim.\n" -#: quotaio.c:134 +#: quotaio.c:135 msgid "Quota file not found or has wrong format.\n" msgstr "Pliku limitów nie znaleziono lub ma zły format.\n" -#: quotaio.c:144 +#: quotaio.c:145 #, c-format msgid "Cannot sync quotas on device %s: %s\n" msgstr "Nie można zsynchronizować limitów na urządzeniu %s: %s\n" -#: quotaio.c:175 +#: quotaio.c:176 #, c-format msgid "Cannot initialize quota on %s: %s\n" msgstr "Nie można zainicjować limitów na %s: %s\n" -#: quotaio.c:202 +#: quotaio.c:203 #, c-format msgid "Creation of %s quota format is not supported.\n" msgstr "Tworzenie limitów w formacie %s nie jest obsługiwane.\n" -#: quotaio.c:212 +#: quotaio.c:213 #, c-format msgid "" "Quota on %s is stored in system files and must be manipulated by fs tools.\n" @@ -1643,12 +1686,12 @@ "Limity na %s są zapisane w plikach systemowych i muszą być modyfikowane " "narzędziami dla systemu plików.\n" -#: quotaio.c:222 +#: quotaio.c:223 #, c-format msgid "Cannot create new quotafile %s: %s\n" msgstr "Nie można utworzyć nowego pliku limitów %s: %s\n" -#: quotaio.c:296 +#: quotaio.c:297 #, c-format msgid "" "Trying to set quota limits out of range supported by quota format on %s.\n" @@ -1656,7 +1699,7 @@ "Próba ustawienia limitów spoza zakresu obsługiwanego przez format limitów na " "%s.\n" -#: quotaio.c:302 +#: quotaio.c:303 #, c-format msgid "" "Trying to set quota usage out of range supported by quota format on %s.\n" @@ -1696,7 +1739,7 @@ "init_io metadanych wywołano bez obsługi ogólnego interfejsu limitów w " "jądrze!\n" -#: quotaio_rpc.c:76 quotaio_v1.c:308 quotaio_v2.c:464 +#: quotaio_rpc.c:77 quotaio_v1.c:278 quotaio_v2.c:464 #, c-format msgid "Trying to write quota to readonly quotafile on %s\n" msgstr "Próba zapisu limitów do pliku limitów tylko do odczytu na %s\n" @@ -1756,7 +1799,7 @@ "prawdopodobnie uszkodzony. Proszę uruchomić quotacheck(8) i spróbować " "ponownie.\n" -#: quotaio_v1.c:214 +#: quotaio_v1.c:184 #, c-format msgid "Trying to write info to readonly quotafile on %s.\n" msgstr "Próba zapisu informacji do pliku limitów tylko do odczytu na %s.\n" @@ -1789,40 +1832,40 @@ "Wpisów: %u\n" "Użyte średnio: %f\n" -#: quotaio_xfs.c:260 +#: quotaio_xfs.c:265 #, c-format msgid "*** Status for %s quotas on device %s\n" msgstr "*** Raport dla limitów %s na urządzeniu %s\n" -#: quotaio_xfs.c:262 quotaio_xfs.c:281 +#: quotaio_xfs.c:267 quotaio_xfs.c:286 msgid "ON" msgstr "WŁĄCZONE" -#: quotaio_xfs.c:262 quotaio_xfs.c:281 +#: quotaio_xfs.c:267 quotaio_xfs.c:286 msgid "OFF" msgstr "WYŁĄCZONE" -#: quotaio_xfs.c:264 quotaio_xfs.c:268 quotaio_xfs.c:272 +#: quotaio_xfs.c:269 quotaio_xfs.c:273 quotaio_xfs.c:277 #, c-format msgid "Accounting: %s; Enforcement: %s\n" msgstr "Podliczanie: %s; Wymuszanie: %s\n" -#: quotaio_xfs.c:284 quotaio_xfs.c:288 quotaio_xfs.c:292 +#: quotaio_xfs.c:289 quotaio_xfs.c:293 quotaio_xfs.c:297 #, c-format msgid "Accounting [ondisk]: %s; Enforcement [ondisk]: %s\n" msgstr "Podliczanie [na dysku]: %s; Wymuszanie [na dysku]: %s\n" -#: quotaio_xfs.c:301 quotaio_xfs.c:310 quotaio_xfs.c:323 +#: quotaio_xfs.c:306 quotaio_xfs.c:315 quotaio_xfs.c:328 #, c-format msgid "Inode: none\n" msgstr "I-węzeł: żaden\n" -#: quotaio_xfs.c:303 quotaio_xfs.c:312 quotaio_xfs.c:325 +#: quotaio_xfs.c:308 quotaio_xfs.c:317 quotaio_xfs.c:330 #, c-format msgid "Inode: #%llu (%llu blocks, %u extents)\n" msgstr "I-węzeł: #%llu (%llu bloków, %u ekstentów)\n" -#: quotaon.c:67 +#: quotaon.c:37 #, fuzzy, c-format msgid "" "Usage:\n" @@ -1857,122 +1900,122 @@ "-h, --help wyświetlenie tego opisu i zakończenie\n" "-V, --verbose wyświetlenie informacji o wersji i zakończenie\n" -#: quotaon.c:81 +#: quotaon.c:51 msgid "turn quotas off for all filesystems" msgstr "wyłączenie limitów na wszystkich systemach plików" -#: quotaon.c:82 +#: quotaon.c:52 msgid "turn quotas on for all filesystems" msgstr "włączenie limitów na wszystkich systemach plików" -#: quotaon.c:147 +#: quotaon.c:117 msgid "Cannot turn on/off quotas via RPC.\n" msgstr "Nie można włączyć/wyłączyć limitów przez RPC.\n" -#: quotaon.c:194 +#: quotaon.c:164 #, c-format msgid "set root_squash on %s: %s\n" msgstr "ustawianie root_squash na %s: %s\n" -#: quotaon.c:198 +#: quotaon.c:168 #, c-format msgid "%s: %s root_squash turned off\n" msgstr "%s: wyłączono %s root_squash\n" -#: quotaon.c:200 +#: quotaon.c:170 #, c-format msgid "%s: %s root_squash turned on\n" msgstr "%s: włączono %s root_squash\n" -#: quotaon.c:218 +#: quotaon.c:188 #, c-format msgid "quotactl on %s [%s]: %s\n" msgstr "quotactl na %s [%s]: %s\n" -#: quotaon.c:221 +#: quotaon.c:191 #, c-format msgid "%s [%s]: %s quotas turned off\n" msgstr "%s [%s]: limity %s wyłączone\n" -#: quotaon.c:234 +#: quotaon.c:204 #, c-format msgid "cannot find %s on %s [%s]\n" msgstr "nie można znaleźć %s na %s [%s]\n" -#: quotaon.c:236 +#: quotaon.c:206 #, c-format msgid "using %s on %s [%s]: %s\n" msgstr "użycie %s na %s [%s]: %s\n" -#: quotaon.c:238 +#: quotaon.c:208 msgid "Maybe create new quota files with quotacheck(8)?\n" msgstr "Może utworzyć nowe pliki limitów przez quotacheck(8)?\n" -#: quotaon.c:240 +#: quotaon.c:210 msgid "Quota format not supported in kernel.\n" msgstr "Format limitów nie obsługiwany przez jądro.\n" -#: quotaon.c:243 +#: quotaon.c:213 #, c-format msgid "%s [%s]: %s quotas turned on\n" msgstr "%s [%s]: limity %s włączone\n" -#: quotaon.c:283 +#: quotaon.c:253 msgid "Cannot change state of GFS2 quota.\n" msgstr "Nie można zmienić stanu limitów GFS2.\n" -#: quotaon.c:287 +#: quotaon.c:258 msgid "Cannot change state of XFS quota. It's not compiled in kernel.\n" msgstr "Nie można zmienić stanu limitów XFS. Nie są wkompilowane w jądro.\n" -#: quotaon.c:312 +#: quotaon.c:283 #, c-format msgid "Cannot find quota file on %s [%s] to turn quotas on/off.\n" msgstr "" "Nie można znaleźć pliku limitów na %s [%s], aby włączyć/wyłączyć limity.\n" -#: quotaon.c:317 +#: quotaon.c:288 #, c-format msgid "Quota file on %s [%s] does not exist or has wrong format.\n" msgstr "Plik limitów na %s [%s] nie istnieje lub ma niewłaściwy format.\n" -#: quotaon.c:346 quotaon.c:362 +#: quotaon.c:318 quotaon.c:334 msgid "off" msgstr "wyłączone" -#: quotaon.c:348 +#: quotaon.c:320 #, fuzzy msgid "on (accounting)" msgstr "i podliczania " -#: quotaon.c:350 +#: quotaon.c:322 msgid "on (enforced)" msgstr "" -#: quotaon.c:362 +#: quotaon.c:334 msgid "on" msgstr "włączone" -#: quotaon.c:364 +#: quotaon.c:336 #, c-format msgid "%s quota on %s (%s) is %s\n" msgstr "Limity %s na %s (%s) są %s\n" -#: quotaon.c:381 +#: quotaon.c:353 #, c-format msgid "Name must be quotaon or quotaoff not %s\n" msgstr "Nazwą musi być quotaon, lub quotaoff, nie %s\n" -#: quotaon.c:387 +#: quotaon.c:359 #, c-format msgid "Required format %s not supported by kernel.\n" msgstr "Wymagany format %s nie obsługiwany przez jądro.\n" -#: quotaon.c:389 +#: quotaon.c:361 msgid "Warning: No quota format detected in the kernel.\n" msgstr "Uwaga: Nie wykryto formatu limitów w jądrze.\n" -#: quotaon.c:396 +#: quotaon.c:368 #, c-format msgid "%s: Quota cannot be turned on on NFS filesystem\n" msgstr "%s: nie można włączyć limitów na systemie plików NFS\n" @@ -2083,81 +2126,81 @@ msgid "Invalid argument \"%s\"\n" msgstr "Błędny argument \"%s\"\n" -#: quotaops.c:112 +#: quotaops.c:82 #, c-format msgid "%s (uid %d): Permission denied\n" msgstr "%s (uid %d): Brak uprawnień\n" -#: quotaops.c:124 +#: quotaops.c:94 #, c-format msgid "%s (gid %d): gid set allocation (%d): %s\n" msgstr "%s (gid %d): przydzielenie zbioru gid (%d): %s\n" -#: quotaops.c:135 +#: quotaops.c:105 #, c-format msgid "%s (gid %d): error while trying getgroups(): %s\n" msgstr "%s (gid %d): błąd podczas próby wykonania getgroups(): %s\n" -#: quotaops.c:146 +#: quotaops.c:116 #, c-format msgid "%s (gid %d): Permission denied\n" msgstr "%s (gid %d): Brak uprawnień\n" -#: quotaops.c:162 +#: quotaops.c:132 #, c-format msgid "error while getting quota from %s for %s (id %u): %s\n" msgstr "błąd podczas uzyskiwania limitów z %s dla %s (id %u): %s\n" -#: quotaops.c:187 +#: quotaops.c:157 #, c-format msgid "Cannot write quota for %u on %s: %s\n" msgstr "Nie można zapisać limitów dla %u na %s: %s\n" -#: quotaops.c:222 quotaops.c:224 +#: quotaops.c:192 quotaops.c:194 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "Synchronizacja limitów %s nie powiodła się: %s\n" -#: quotaops.c:238 +#: quotaops.c:208 msgid "Too many parameters to editor.\n" msgstr "Zbyt dużo parametrów dla edytora.\n" -#: quotaops.c:246 +#: quotaops.c:216 #, c-format msgid "Cannot exec %s\n" msgstr "Nie można uruchomić %s\n" -#: quotaops.c:263 +#: quotaops.c:233 #, fuzzy, c-format msgid "Cannot truncate a file: %s\n" msgstr "Nie można wykonać stat na pliku limitów %s: %s\n" -#: quotaops.c:265 +#: quotaops.c:235 #, fuzzy, c-format msgid "Cannot reset a file offset: %s\n" msgstr "Nie można odczytać pliku statystyk %s: %s\n" -#: quotaops.c:267 +#: quotaops.c:237 #, fuzzy, c-format msgid "Cannot duplicate a file descriptor: %s\n" msgstr "Nie można powielić deskryptora: %s\n" -#: quotaops.c:269 +#: quotaops.c:239 #, fuzzy, c-format msgid "Cannot open a stream to write to: %s\n" msgstr "Nie można ponownie otworzyć pliku tymczasowego: %s\n" -#: quotaops.c:270 +#: quotaops.c:240 #, fuzzy, c-format msgid "Cannot open a stream to read from: %s\n" msgstr "Nie można ponownie otworzyć pliku tymczasowego: %s\n" -#: quotaops.c:286 +#: quotaops.c:256 #, c-format msgid "Disk quotas for %s %s (%cid %d):\n" msgstr "Limity dyskowe %s %s (%cid %d):\n" -#: quotaops.c:290 +#: quotaops.c:260 #, c-format msgid "" " Filesystem blocks soft hard inodes " @@ -2166,21 +2209,21 @@ " System plików bloki miękki twardy i-węzły " "miękki twardy\n" -#: quotaops.c:323 +#: quotaops.c:293 #, c-format msgid "WARNING - %s: cannot change current block allocation\n" msgstr "UWAGA - %s: nie można zmienić aktualnego przydziału bloków\n" -#: quotaops.c:326 +#: quotaops.c:296 #, c-format msgid "WARNING - %s: cannot change current inode allocation\n" msgstr "UWAGA - %s: nie można zmienić aktualnego przydziału i-węzłów\n" -#: quotaops.c:352 +#: quotaops.c:322 msgid "Bad format: two title lines assumed\n" msgstr "" -#: quotaops.c:363 +#: quotaops.c:333 #, c-format msgid "" "Bad format:\n" @@ -2189,72 +2232,72 @@ "Zły format:\n" "%s\n" -#: quotaops.c:369 +#: quotaops.c:339 #, fuzzy, c-format msgid "Bad block usage: %s: %s\n" msgstr "Nie można odczytać bloku %u: %s\n" -#: quotaops.c:376 +#: quotaops.c:346 #, fuzzy, c-format msgid "Bad block soft limit: %s: %s\n" msgstr "Błędny miękki limit bloków" -#: quotaops.c:383 +#: quotaops.c:353 #, fuzzy, c-format msgid "Bad block hard limit: %s: %s\n" msgstr "Błędny twardy limit bloków" -#: quotaops.c:390 +#: quotaops.c:360 #, fuzzy, c-format msgid "Bad inode usage: %s: %s\n" msgstr "nie można otworzyć %s: %s\n" -#: quotaops.c:397 +#: quotaops.c:367 #, fuzzy, c-format msgid "Bad inode soft limit: %s: %s\n" msgstr "Błędny miękki limit i-węzłów" -#: quotaops.c:404 +#: quotaops.c:374 #, fuzzy, c-format msgid "Bad inode hard limit: %s: %s\n" msgstr "Błędny twardy limit i-węzłów" -#: quotaops.c:457 +#: quotaops.c:427 #, c-format msgid "Times to enforce softlimit for %s %s (%cid %d):\n" msgstr "Okresy wymuszenia miękkich limitów %s %s (%cid %d):\n" -#: quotaops.c:459 quotaops.c:562 +#: quotaops.c:429 quotaops.c:532 #, c-format msgid "Time units may be: days, hours, minutes, or seconds\n" msgstr "Jednostkami czasu mogą być: days, hours, minutes, seconds\n" -#: quotaops.c:461 +#: quotaops.c:431 #, c-format msgid "" " Filesystem block grace inode grace\n" msgstr "" " System plików Pobłażliwość dla bloków Pobłażliwość dla i-węzłów\n" -#: quotaops.c:466 quotaops.c:472 quotaops.c:517 quotaops.c:530 setquota.c:288 +#: quotaops.c:436 quotaops.c:442 quotaops.c:487 quotaops.c:500 setquota.c:288 #: setquota.c:294 msgid "unset" msgstr "nie ustawiona" -#: quotaops.c:468 quotaops.c:474 +#: quotaops.c:438 quotaops.c:444 msgid "0seconds" msgstr "0 sekund" -#: quotaops.c:470 quotaops.c:476 quotasys.c:503 +#: quotaops.c:440 quotaops.c:446 quotasys.c:503 #, c-format msgid "%useconds" msgstr "%u sekund" -#: quotaops.c:503 quotaops.c:602 +#: quotaops.c:473 quotaops.c:572 msgid "Bad format: three title lines assumed\n" msgstr "" -#: quotaops.c:513 quotaops.c:610 +#: quotaops.c:483 quotaops.c:580 #, c-format msgid "" "bad format:\n" @@ -2263,17 +2306,17 @@ "zły format:\n" "%s\n" -#: quotaops.c:524 quotaops.c:616 +#: quotaops.c:494 quotaops.c:586 msgid "Bad time units. Units are 'second', 'minute', 'hour', and 'day'.\n" msgstr "" "Złe jednostki czasu. Jednostkami są 'second', 'minute', 'hour' i 'day'.\n" -#: quotaops.c:560 +#: quotaops.c:530 #, c-format msgid "Grace period before enforcing soft limits for %ss:\n" msgstr "Okres pobłażliwości przed wymuszeniem miękkich limitów %s:\n" -#: quotaops.c:563 +#: quotaops.c:533 #, c-format msgid " Filesystem Block grace period Inode grace period\n" msgstr "" @@ -2424,7 +2467,7 @@ "-h, --help wyświetlenie tego opisu i zakończenie\n" "-V, --version wyświetlenie informacji o wersji i zakończenie\n" -#: setquota.c:84 edquota.c:104 quota.c:114 +#: setquota.c:84 edquota.c:104 quota.c:90 #, c-format msgid "Bugs to: %s\n" msgstr "Błędy na adres: %s\n" @@ -2609,7 +2652,7 @@ " xml - simple XML\n" msgstr "" -#: quotasys.c:459 quota.c:297 +#: quotasys.c:459 quota.c:278 msgid "none" msgstr "brak" @@ -2670,116 +2713,116 @@ msgid "days" msgstr "dni" -#: quotasys.c:573 +#: quotasys.c:582 msgid "Integer overflow while parsing space number." msgstr "" -#: quotasys.c:575 +#: quotasys.c:584 msgid "K" msgstr "" -#: quotasys.c:577 +#: quotasys.c:586 msgid "M" msgstr "" -#: quotasys.c:579 +#: quotasys.c:588 msgid "G" msgstr "" -#: quotasys.c:581 +#: quotasys.c:590 msgid "T" msgstr "" -#: quotasys.c:584 +#: quotasys.c:593 msgid "Unknown space binary unit. Valid units are K, M, G, T." msgstr "" -#: quotasys.c:588 +#: quotasys.c:597 msgid "Integer overflow while interpreting space unit." msgstr "" -#: quotasys.c:628 +#: quotasys.c:650 msgid "Integer overflow while parsing number." msgstr "" -#: quotasys.c:632 +#: quotasys.c:654 msgid "k" msgstr "" -#: quotasys.c:634 +#: quotasys.c:656 msgid "m" msgstr "" -#: quotasys.c:636 +#: quotasys.c:658 msgid "g" msgstr "" -#: quotasys.c:638 +#: quotasys.c:660 msgid "t" msgstr "" -#: quotasys.c:641 +#: quotasys.c:663 msgid "Unknown decimal unit. Valid units are k, m, g, t." msgstr "" -#: quotasys.c:645 +#: quotasys.c:667 msgid "Integer overflow while interpreting decimal unit." msgstr "" -#: quotasys.c:803 +#: quotasys.c:826 #, c-format msgid "Cannot stat quota file %s: %s\n" msgstr "Nie można wykonać stat na pliku limitów %s: %s\n" -#: quotasys.c:949 +#: quotasys.c:974 msgid "Not all specified mountpoints are using quota.\n" msgstr "Nie wszystkie podane punkty montowania używają limitów.\n" -#: quotasys.c:963 +#: quotasys.c:988 #, c-format msgid "Error while releasing file on %s\n" msgstr "Błąd podczas zwalniania pliku na %s\n" -#: quotasys.c:1022 +#: quotasys.c:1047 #, c-format msgid "Cannot create set for sigaction(): %s\n" msgstr "Nie można utworzyć zbioru dla sigaction(): %s\n" -#: quotasys.c:1025 +#: quotasys.c:1050 #, c-format msgid "Cannot set signal handler: %s\n" msgstr "Nie można ustawić obsługi sygnału: %s\n" -#: quotasys.c:1080 +#: quotasys.c:1106 #, c-format msgid "Cannot reset signal handler: %s\n" msgstr "Nie można przywrócić obsługi sygnału: %s\n" -#: quotasys.c:1235 +#: quotasys.c:1261 msgid "Cannot open any file with mount points.\n" msgstr "Nie można otworzyć żadnego pliku z punktami montowania.\n" -#: quotasys.c:1253 +#: quotasys.c:1279 #, c-format msgid "Cannot get device name for %s\n" msgstr "Nie można uzyskać nazwy urządzenia dla %s\n" -#: quotasys.c:1313 +#: quotasys.c:1339 #, c-format msgid "Cannot resolve mountpoint path %s: %s\n" msgstr "Nie można rozwiązać ścieżki punktu montowania %s: %s\n" -#: quotasys.c:1319 +#: quotasys.c:1345 #, c-format msgid "Cannot statfs() %s: %s\n" msgstr "Nie można wykonać statfs() %s: %s\n" -#: quotasys.c:1331 +#: quotasys.c:1357 #, c-format msgid "Cannot stat() mounted device %s: %s\n" msgstr "Nie można wykonać stat() na zamontowanym urządzeniu %s: %s\n" -#: quotasys.c:1336 +#: quotasys.c:1362 #, c-format msgid "" "Device (%s) filesystem is mounted on unsupported device type. Skipping.\n" @@ -2787,12 +2830,12 @@ "Urządzenie (%s), na którym jest zamontowany system plików, nie jest " "obsługiwanego typu. Pominięto.\n" -#: quotasys.c:1346 +#: quotasys.c:1372 #, c-format msgid "Cannot stat() mountpoint %s: %s\n" msgstr "Nie można wykonać stat() na punkcie montowania %s: %s\n" -#: quotasys.c:1415 +#: quotasys.c:1441 #, c-format msgid "" "Cannot find a device with %s.\n" @@ -2801,7 +2844,7 @@ "Nie można znaleźć urządzenia z %s.\n" "Pomijanie...\n" -#: quotasys.c:1419 +#: quotasys.c:1445 #, c-format msgid "" "Cannot stat() a mountpoint with %s: %s\n" @@ -2810,7 +2853,7 @@ "Nie można wykonać stat() na punkcie montowania z %s: %s\n" "Pomijanie...\n" -#: quotasys.c:1427 +#: quotasys.c:1453 #, c-format msgid "" "Cannot stat() given mountpoint %s: %s\n" @@ -2819,31 +2862,31 @@ "Nie można wykonać stat() na podanym punkcie montowania %s: %s\n" "Pomijanie...\n" -#: quotasys.c:1437 +#: quotasys.c:1463 #, c-format msgid "Cannot find a filesystem mountpoint for directory %s\n" msgstr "Nie można znaleźć punktu montowania systemu plików dla katalogu %s\n" -#: quotasys.c:1443 +#: quotasys.c:1469 #, c-format msgid "Cannot resolve path %s: %s\n" msgstr "Nie można rozwiązać ścieżki %s: %s\n" -#: quotasys.c:1454 +#: quotasys.c:1480 #, c-format msgid "Cannot find mountpoint for device %s\n" msgstr "Nie można znaleźć punktu montowania dla urządzenia %s\n" -#: quotasys.c:1460 +#: quotasys.c:1486 #, c-format msgid "Specified path %s is not directory nor device.\n" msgstr "Podana ścieżka %s nie jest katalogiem ani urządzeniem.\n" -#: quotasys.c:1468 +#: quotasys.c:1494 msgid "No correct mountpoint specified.\n" msgstr "Nie podano poprawnego punktu montowania.\n" -#: quotasys.c:1523 +#: quotasys.c:1549 #, c-format msgid "Mountpoint (or device) %s not found or has no quota enabled.\n" msgstr "" @@ -2968,7 +3011,7 @@ msgid "Unable to register (RQUOTAPROG, EXT_RQUOTAVERS, %s).\n" msgstr "nie można zarejestrować (RQUOTAPROG, EXT_RQUOTAVERS, UDP).\n" -#: rquota_svc.c:539 +#: rquota_svc.c:542 msgid "svc_run returned\n" msgstr "svc_run powróciło\n" @@ -3025,66 +3068,76 @@ msgid "Error creating socket: %s\n" msgstr "Nie można utworzyć gniazda: %s\n" -#: svc_socket.c:122 +#: svc_socket.c:124 +#, fuzzy, c-format +msgid "Cannot set IPv6 socket options: %s\n" +msgstr "Nie można ustawić opcji gniazda: %s\n" + +#: svc_socket.c:131 #, c-format msgid "Cannot set socket options: %s\n" msgstr "Nie można ustawić opcji gniazda: %s\n" -#: svc_socket.c:128 +#: svc_socket.c:137 #, fuzzy, c-format msgid "Cannot bind to address: %s\n" msgstr "Nie można przypisać do podanego adresu: %s\n" +#: svc_socket.c:144 +#, fuzzy, c-format +msgid "Cannot listen to address: %s\n" +msgstr "Nie można przypisać do podanego adresu: %s\n" + #: xqmstats.c:32 xqmstats.c:37 msgid "The running kernel does not support XFS\n" msgstr "Działające jądro nie obsługuje XFS\n" -#: xqmstats.c:49 +#: xqmstats.c:50 #, c-format msgid "XFS Quota Manager dquot statistics\n" msgstr "Statystyki dquot Zarządcy Limitów na XFS\n" -#: xqmstats.c:50 +#: xqmstats.c:51 #, c-format msgid " reclaims: %u\n" msgstr " poprawki: %u\n" -#: xqmstats.c:51 +#: xqmstats.c:52 #, c-format msgid " missed reclaims: %u\n" msgstr " chybione poprawki: %u\n" -#: xqmstats.c:52 +#: xqmstats.c:53 #, c-format msgid " dquot dups: %u\n" msgstr " duplikaty dquot: %u\n" -#: xqmstats.c:53 +#: xqmstats.c:54 #, c-format msgid " cache misses: %u\n" msgstr " chybienia bufora: %u\n" -#: xqmstats.c:54 +#: xqmstats.c:55 #, c-format msgid " cache hits: %u\n" msgstr " trafienia bufora: %u\n" -#: xqmstats.c:55 +#: xqmstats.c:56 #, c-format msgid " dquot wants: %u\n" msgstr " żądania dquot: %u\n" -#: xqmstats.c:56 +#: xqmstats.c:57 #, c-format msgid " shake reclaims: %u\n" msgstr " poprawki shake: %u\n" -#: xqmstats.c:57 +#: xqmstats.c:58 #, c-format msgid " inact reclaims: %u\n" msgstr " poprawki inact: %u\n" -#: xqmstats.c:62 +#: xqmstats.c:63 #, c-format msgid "Maximum %u dquots (currently %u incore, %u on freelist)\n" msgstr "Maksimum %u dquot (aktualnie %u w rdzeniu, %u na liście wolnych)\n" @@ -3237,52 +3290,61 @@ msgid "Cannot read quotas from file.\n" msgstr "Nie można odczytać limitów z pliku.\n" -#: quota.c:87 +#: quota.c:58 #, fuzzy msgid "Usage: quota [-guPqvswim] [-l | [-Q | -A]] [-F quotaformat]\n" msgstr "Składnia: quota [-guqvswim] [-l | [-Q | -A]] [-F format]\n" -#: quota.c:88 +#: quota.c:59 msgid "\tquota [-qvswim] [-l | [-Q | -A]] [-F quotaformat] -u username ...\n" msgstr "\tquota [-qvswim] [-l | [-Q | -A]] [-F format] -u użytkownik ...\n" -#: quota.c:89 +#: quota.c:60 msgid "\tquota [-qvswim] [-l | [-Q | -A]] [-F quotaformat] -g groupname ...\n" msgstr "\tquota [-qvswim] [-l | [-Q | -A]] [-F format] -g grupa ...\n" -#: quota.c:90 +#: quota.c:61 #, fuzzy msgid "\tquota [-qvswugPQm] [-F quotaformat] -f filesystem ...\n" msgstr "\tquota [-qvswugQm] [-F format] -f system-plików ...\n" -#: quota.c:91 +#: quota.c:62 #, fuzzy msgid "" "\n" -"-u, --user display quota for user\n" -"-g, --group display quota for group\n" -"-P, --project display quota for project\n" -"-q, --quiet print more terse message\n" -"-v, --verbose print more verbose message\n" -"-s, --human-readable display numbers in human friendly units (MB, " -"GB...)\n" -" --always-resolve always try to translate name to id, even if it is\n" -"\t\t\t composed of only digits\n" -"-w, --no-wrap do not wrap long lines\n" -"-p, --raw-grace print grace time in seconds since epoch\n" -"-l, --local-only do not query NFS filesystems\n" -"-Q, --quiet-refuse do not print error message when NFS server does\n" -" not respond\n" -"-i, --no-autofs do not query autofs mountpoints\n" -"-F, --format=formatname display quota of a specific format\n" -"-f, --filesystem-list display quota information only for given " -"filesystems\n" -"-A, --all-nfs display quota for all NFS mountpoints\n" -"-m, --no-mixed-pathnames trim leading slashes from NFSv4 mountpoints\n" -" --show-mntpoint show mount point of the file system in output\n" -" --hide-device do not show file system device in output\n" -"-h, --help display this help message and exit\n" -"-V, --version display version information and exit\n" +"-u, --user display quota for user\n" +"-g, --group display quota for group\n" +"-P, --project display quota for project\n" +"-q, --quiet print more terse message\n" +"-v, --verbose print more verbose message\n" +"-s, --human-readable[=units] display numbers in human friendly units (MB, " +"GB,\n" +" ...). Units can be also specified explicitely " +"by\n" +" an optional argument in format [kgt],[kgt] " +"where\n" +" the first character specifies space units and " +"the\n" +" second character specifies inode units\n" +" --always-resolve always try to translate name to id, even if it " +"is\n" +"\t\t\t composed of only digits\n" +"-w, --no-wrap do not wrap long lines\n" +"-p, --raw-grace print grace time in seconds since epoch\n" +"-l, --local-only do not query NFS filesystems\n" +"-Q, --quiet-refuse do not print error message when NFS server " +"does\n" +" not respond\n" +"-i, --no-autofs do not query autofs mountpoints\n" +"-F, --format=formatname display quota of a specific format\n" +"-f, --filesystem-list display quota information only for given\n" +" filesystems\n" +"-A, --all-nfs display quota for all NFS mountpoints\n" +"-m, --no-mixed-pathnames trim leading slashes from NFSv4 mountpoints\n" +" --show-mntpoint show mount point of the file system in output\n" +" --hide-device do not show file system device in output\n" +"-h, --help display this help message and exit\n" +"-V, --version display version information and exit\n" "\n" msgstr "" "\n" @@ -3316,93 +3378,97 @@ "-V, --version wyświetlenie informacji o wersji i zakończenie\n" "\n" -#: quota.c:123 +#: quota.c:99 msgid "space" msgstr "miejsce" -#: quota.c:125 +#: quota.c:101 msgid "blocks" msgstr "bloki" -#: quota.c:127 +#: quota.c:103 #, c-format msgid "Disk quotas for %s %s (%cid %u): %s\n" msgstr "Ograniczenia dyskowe %s %s (%cid %u): %s\n" -#: quota.c:130 +#: quota.c:106 msgid "Filesystem" msgstr "System plików" -#: quota.c:131 quota.c:132 +#: quota.c:107 quota.c:108 msgid "quota" msgstr "miękki" -#: quota.c:131 quota.c:132 +#: quota.c:107 quota.c:108 msgid "limit" msgstr "twardy" -#: quota.c:131 quota.c:132 +#: quota.c:107 quota.c:108 msgid "grace" msgstr "pobł." -#: quota.c:132 +#: quota.c:108 msgid "files" msgstr "pliki" -#: quota.c:208 +#: quota.c:189 msgid "File limit reached on" msgstr "Twardy limit plików osiągnięty na" -#: quota.c:214 +#: quota.c:195 msgid "In file grace period on" msgstr "Okres pobłażliwości dla plików na" -#: quota.c:218 +#: quota.c:199 msgid "Over file quota on" msgstr "Miękki limit dla plików przekroczony na" -#: quota.c:224 +#: quota.c:205 msgid "Block limit reached on" msgstr "Twardy limit bloków osiągnięty na" -#: quota.c:230 +#: quota.c:211 msgid "In block grace period on" msgstr "Okres pobłażliwości dla bloków na" -#: quota.c:234 +#: quota.c:215 msgid "Over block quota on" msgstr "Miękki limit dla bloków przekroczony na" -#: quota.c:408 +#: quota.c:278 +msgid "no limited resources used" +msgstr "" + +#: quota.c:393 #, c-format msgid "Warning: Ignoring -%c when filesystem list specified.\n" msgstr "Uwaga: Zignorowano -%c kiedy została podana lista systemów plików.\n" -#: quota.c:415 +#: quota.c:400 msgid "No filesystem specified.\n" msgstr "Nie podano systemu plików.\n" -#: quota.c:423 +#: quota.c:408 #, c-format msgid "Gid set allocation (%d): %s\n" msgstr "Przydzielenie zbioru gid (%d): %s\n" -#: quota.c:429 +#: quota.c:414 #, c-format msgid "getgroups(): %s\n" msgstr "getgroups(): %s\n" -#: quota.c:434 +#: quota.c:419 #, fuzzy msgid "Project reports not supported without project name\n" msgstr "Format limitów nie obsługiwany przez jądro.\n" -#: common.c:124 +#: common.c:125 #, c-format msgid "Quota utilities version %s.\n" msgstr "Narzędzia Quota w wersji %s.\n" -#: common.c:125 +#: common.c:126 #, c-format msgid "Compiled with:%s\n" msgstr "Skompilowano z:%s\n" diff -Nru quota-4.04/po/quota.pot quota-4.05/po/quota.pot --- quota-4.04/po/quota.pot 2017-09-05 14:53:15.000000000 +0000 +++ quota-4.05/po/quota.pot 2019-03-29 10:53:18.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: jack@suse.cz\n" -"POT-Creation-Date: 2017-09-05 16:53+0200\n" +"POT-Creation-Date: 2019-03-29 11:53+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,12 +16,12 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: bylabel.c:253 +#: bylabel.c:274 #, c-format msgid "Found an invalid UUID: %s\n" msgstr "" -#: bylabel.c:273 +#: bylabel.c:294 #, c-format msgid "Error checking device name: %s\n" msgstr "" @@ -42,8 +42,8 @@ "\n" msgstr "" -#: convertquota.c:48 warnquota.c:1028 quotacheck.c:314 repquota.c:68 -#: common.c:126 +#: convertquota.c:48 warnquota.c:1046 quotacheck.c:314 repquota.c:73 +#: common.c:127 #, c-format msgid "Bugs to %s\n" msgstr "" @@ -52,8 +52,8 @@ msgid "You have to specify source and target format of conversion.\n" msgstr "" -#: convertquota.c:112 quotacheck.c:400 quotasync.c:88 repquota.c:154 -#: quotaon.c:143 setquota.c:264 +#: convertquota.c:112 quotacheck.c:400 quotasync.c:88 repquota.c:163 +#: quotaon.c:113 setquota.c:264 msgid "Bad number of arguments.\n" msgstr "" @@ -88,7 +88,7 @@ msgid "Cannot get name of new quotafile.\n" msgstr "" -#: convertquota.c:302 quotacheck.c:764 +#: convertquota.c:302 quotacheck.c:765 #, c-format msgid "Cannot rename new quotafile %s to name %s: %s\n" msgstr "" @@ -108,7 +108,7 @@ msgid "Cannot open old quota file on %s: %s\n" msgstr "" -#: convertquota.c:380 +#: convertquota.c:381 msgid "Unknown action should be performed.\n" msgstr "" @@ -211,112 +211,124 @@ msgid "Could not setup ldap connection.\n" msgstr "" -#: warnquota.c:422 +#: warnquota.c:417 +#, c-format +msgid "" +"Could not format LDAP search filter for %s user and %s search attribute due " +"to excessive length.\n" +msgstr "" + +#: warnquota.c:428 #, c-format msgid "Error with %s.\n" msgstr "" -#: warnquota.c:423 +#: warnquota.c:429 #, c-format msgid "ldap_search_ext_s() failed: %s\n" msgstr "" -#: warnquota.c:429 +#: warnquota.c:435 #, c-format msgid "Multiple entries found for client %s (%d).\n" msgstr "" -#: warnquota.c:433 +#: warnquota.c:439 #, c-format msgid "Entry not found for client %s.\n" msgstr "" -#: warnquota.c:443 +#: warnquota.c:449 #, c-format msgid "Could not get values for %s.\n" msgstr "" -#: warnquota.c:489 +#: warnquota.c:495 #, c-format msgid "Administrator for a group %s not found. Cancelling mail.\n" msgstr "" -#: warnquota.c:541 +#: warnquota.c:547 #, c-format msgid "" "\n" " Block limits File limits\n" msgstr "" -#: warnquota.c:542 +#: warnquota.c:548 #, c-format msgid "" "Filesystem used soft hard grace used soft hard grace\n" msgstr "" -#: warnquota.c:582 +#: warnquota.c:588 #, c-format msgid "Cannot wait for mailer: %s\n" msgstr "" -#: warnquota.c:584 +#: warnquota.c:590 msgid "Warning: Mailer exitted abnormally.\n" msgstr "" -#: warnquota.c:641 +#: warnquota.c:647 #, c-format msgid "" "Cannot open %s: %s\n" "Will use device names.\n" msgstr "" -#: warnquota.c:664 +#: warnquota.c:670 #, c-format msgid "Cannot parse line %d in quotatab (missing ':')\n" msgstr "" -#: warnquota.c:678 +#: warnquota.c:684 #, c-format msgid "Cannot stat device %s (maybe typo in quotatab)\n" msgstr "" -#: warnquota.c:698 +#: warnquota.c:704 #, c-format msgid "" "Incorrect format string for variable %s.\n" "Unrecognized expression %%%c.\n" msgstr "" -#: warnquota.c:749 +#: warnquota.c:755 #, c-format msgid "Cannot open %s: %s\n" msgstr "" -#: warnquota.c:769 +#: warnquota.c:775 #, c-format msgid "Line %d too long. Truncating.\n" msgstr "" -#: warnquota.c:835 +#: warnquota.c:841 #, c-format msgid "Cannot parse time at CC_BEFORE variable (line %d).\n" msgstr "" -#: warnquota.c:885 +#: warnquota.c:891 #, c-format msgid "Error in config file (line %d), ignoring\n" msgstr "" -#: warnquota.c:888 +#: warnquota.c:894 #, c-format msgid "Possible error in config file (line %d), ignoring\n" msgstr "" -#: warnquota.c:891 +#: warnquota.c:897 msgid "Unterminated last line, ignoring\n" msgstr "" -#: warnquota.c:897 +#: warnquota.c:905 +#, c-format +msgid "Could not format LDAP URI because it's longer than %d bytes.\n" +msgstr "" + +#: warnquota.c:910 #, c-format msgid "" "LDAP library version >= 2.3 detected. Please use LDAP_URI instead of " @@ -324,28 +336,28 @@ "Generated URI %s\n" msgstr "" -#: warnquota.c:919 +#: warnquota.c:932 #, c-format msgid "Cannot open file with group administrators: %s\n" msgstr "" -#: warnquota.c:934 +#: warnquota.c:947 #, c-format msgid "Parse error at line %d. Cannot find end of group name.\n" msgstr "" -#: warnquota.c:943 +#: warnquota.c:956 #, c-format msgid "Parse error at line %d. Cannot find administrators name.\n" msgstr "" -#: warnquota.c:953 +#: warnquota.c:966 #, c-format msgid "" "Parse error at line %d. Trailing characters after administrators name.\n" msgstr "" -#: warnquota.c:1016 +#: warnquota.c:1029 msgid "" "Usage:\n" " warnquota [-ugsid] [-F quotaformat] [-c configfile] [-q quotatabfile] [-a " @@ -353,8 +365,16 @@ "\n" "-u, --user warn users\n" "-g, --group warn groups\n" -"-s, --human-readable send information in more human friendly " -"units\n" +"-s, --human-readable[=units] display numbers in human friendly units " +"(MB,\n" +" GB, ...). Units can be also specified\n" +" explicitely by an optional argument in " +"format\n" +" [kgt],[kgt] where the first character " +"specifies\n" +" space units and the second character " +"specifies\n" +" inode units\n" "-i, --no-autofs avoid autofs mountpoints\n" "-d, --no-details do not send quota information itself\n" "-F, --format=formatname use quotafiles of specific format\n" @@ -366,7 +386,12 @@ "\n" msgstr "" -#: warnquota.c:1097 +#: warnquota.c:1102 repquota.c:134 quota.c:343 +#, c-format +msgid "Bad output format units for human readable output: %s\n" +msgstr "" + +#: warnquota.c:1119 #, c-format msgid "Cannot get host name: %s\n" msgstr "" @@ -484,54 +509,54 @@ "exiting...\n" msgstr "" -#: quotacheck.c:550 +#: quotacheck.c:551 #, c-format msgid "pushd %s/%s\n" msgstr "" -#: quotacheck.c:566 +#: quotacheck.c:567 #, c-format msgid "\tAdding %s size %lld ino %d links %d uid %u gid %u\n" msgstr "" -#: quotacheck.c:576 +#: quotacheck.c:577 msgid "Scanning stored directories from directory stack\n" msgstr "" -#: quotacheck.c:580 +#: quotacheck.c:581 #, c-format msgid "" "popd %s\n" "Entering directory %s\n" msgstr "" -#: quotacheck.c:592 +#: quotacheck.c:593 #, c-format msgid "Leaving %s\n" msgstr "" -#: quotacheck.c:632 +#: quotacheck.c:633 #, c-format msgid "Going to check %s quota file of %s\n" msgstr "" -#: quotacheck.c:638 +#: quotacheck.c:639 #, c-format msgid "" "Quota for %ss is enabled on mountpoint %s so quotacheck might damage the " "file.\n" msgstr "" -#: quotacheck.c:639 quotacheck.c:957 +#: quotacheck.c:640 quotacheck.c:967 msgid "Should I continue?" msgstr "" -#: quotacheck.c:640 quotacheck.c:958 +#: quotacheck.c:641 quotacheck.c:968 #, c-format msgid "As you wish... Canceling check of this file.\n" msgstr "" -#: quotacheck.c:645 +#: quotacheck.c:646 #, c-format msgid "" "Quota for %ss is enabled on mountpoint %s so quotacheck might damage the " @@ -539,186 +564,186 @@ "Please turn quotas off or use -f to force checking.\n" msgstr "" -#: quotacheck.c:652 +#: quotacheck.c:653 #, c-format msgid "Error while syncing quotas on %s: %s\n" msgstr "" -#: quotacheck.c:657 +#: quotacheck.c:658 #, c-format msgid "Cannot get quotafile name for %s\n" msgstr "" -#: quotacheck.c:662 quotaio.c:150 quotasys.c:820 +#: quotacheck.c:663 quotaio.c:151 quotasys.c:843 #, c-format msgid "Cannot open quotafile %s: %s\n" msgstr "" -#: quotacheck.c:702 +#: quotacheck.c:703 msgid "Renaming new files to proper names.\n" msgstr "" -#: quotacheck.c:704 +#: quotacheck.c:705 #, c-format msgid "Cannot get name of old quotafile on %s.\n" msgstr "" -#: quotacheck.c:707 +#: quotacheck.c:708 msgid "Old file not found.\n" msgstr "" -#: quotacheck.c:710 +#: quotacheck.c:711 #, c-format msgid "Error while searching for old quota file %s: %s\n" msgstr "" -#: quotacheck.c:719 +#: quotacheck.c:720 msgid "Old file found removed during check!\n" msgstr "" -#: quotacheck.c:722 +#: quotacheck.c:723 #, c-format msgid "Error while opening old quota file %s: %s\n" msgstr "" -#: quotacheck.c:728 +#: quotacheck.c:729 #, c-format msgid "EXT2_IOC_GETFLAGS failed: %s\n" msgstr "" -#: quotacheck.c:732 +#: quotacheck.c:733 #, c-format msgid "Quota file %s has IMMUTABLE flag set. Clearing.\n" msgstr "" -#: quotacheck.c:735 +#: quotacheck.c:736 #, c-format msgid "Failed to remove IMMUTABLE flag from quota file %s: %s\n" msgstr "" -#: quotacheck.c:744 +#: quotacheck.c:745 #, c-format msgid "Renaming old quotafile to %s~\n" msgstr "" -#: quotacheck.c:750 +#: quotacheck.c:751 #, c-format msgid "Name of quota file too long. Contact %s.\n" msgstr "" -#: quotacheck.c:752 +#: quotacheck.c:753 #, c-format msgid "Cannot rename old quotafile %s to %s: %s\n" msgstr "" -#: quotacheck.c:758 +#: quotacheck.c:759 msgid "Renaming new quotafile\n" msgstr "" -#: quotacheck.c:770 +#: quotacheck.c:771 #, c-format msgid "Cannot change permission of %s: %s\n" msgstr "" -#: quotacheck.c:777 +#: quotacheck.c:778 #, c-format msgid "Cannot open new quota file %s: %s\n" msgstr "" -#: quotacheck.c:782 +#: quotacheck.c:783 #, c-format msgid "Warning: Cannot set EXT2 flags on %s: %s\n" msgstr "" -#: quotacheck.c:802 +#: quotacheck.c:803 #, c-format msgid "Dumping gathered data for %ss.\n" msgstr "" -#: quotacheck.c:805 +#: quotacheck.c:806 #, c-format msgid "Cannot initialize IO on xfs/gfs2 quotafile: %s\n" msgstr "" -#: quotacheck.c:811 +#: quotacheck.c:812 #, c-format msgid "Cannot initialize IO on new quotafile: %s\n" msgstr "" -#: quotacheck.c:838 +#: quotacheck.c:839 #, c-format msgid "Cannot finish IO on new quotafile: %s\n" msgstr "" -#: quotacheck.c:841 +#: quotacheck.c:842 msgid "Data dumped.\n" msgstr "" -#: quotacheck.c:849 +#: quotacheck.c:850 #, c-format msgid "Cannot find checked quota file for %ss on %s!\n" msgstr "" -#: quotacheck.c:853 +#: quotacheck.c:854 #, c-format msgid "" "Cannot turn %s quotas off on %s: %s\n" "Kernel won't know about changes quotacheck did.\n" msgstr "" -#: quotacheck.c:866 +#: quotacheck.c:867 #, c-format msgid "" "Cannot turn %s quotas on on %s: %s\n" "Kernel won't know about changes quotacheck did.\n" msgstr "" -#: quotacheck.c:892 +#: quotacheck.c:893 #, c-format msgid "Substracting space used by old %s quota file.\n" msgstr "" -#: quotacheck.c:894 +#: quotacheck.c:895 #, c-format msgid "" "Old %s file name could not been determined. Usage will not be subtracted.\n" msgstr "" -#: quotacheck.c:899 +#: quotacheck.c:900 #, c-format msgid "Cannot stat old %s quota file %s: %s. Usage will not be subtracted.\n" msgstr "" -#: quotacheck.c:911 +#: quotacheck.c:912 #, c-format msgid "" "Quota structure for %s owning quota file not present! Something is really " "wrong...\n" msgstr "" -#: quotacheck.c:916 +#: quotacheck.c:917 #, c-format msgid "Substracted %lu bytes.\n" msgstr "" -#: quotacheck.c:929 +#: quotacheck.c:931 #, c-format msgid "Cannot stat mountpoint %s: %s\n" msgstr "" -#: quotacheck.c:931 +#: quotacheck.c:933 #, c-format msgid "Mountpoint %s is not a directory?!\n" msgstr "" -#: quotacheck.c:956 +#: quotacheck.c:966 #, c-format msgid "" "Cannot remount filesystem mounted on %s read-only. Counted values might not " "be right.\n" msgstr "" -#: quotacheck.c:964 +#: quotacheck.c:974 #, c-format msgid "" "Cannot remount filesystem mounted on %s read-only so counted values might " @@ -727,84 +752,84 @@ "checking.\n" msgstr "" -#: quotacheck.c:972 +#: quotacheck.c:982 msgid "Filesystem remounted read-only\n" msgstr "" -#: quotacheck.c:975 +#: quotacheck.c:985 #, c-format msgid "Scanning %s [%s] " msgstr "" -#: quotacheck.c:995 +#: quotacheck.c:1011 msgid "done\n" msgstr "" -#: quotacheck.c:1004 +#: quotacheck.c:1020 #, c-format msgid "Checked %d directories and %d files\n" msgstr "" -#: quotacheck.c:1008 +#: quotacheck.c:1024 #, c-format msgid "" "Cannot remount filesystem %s read-write. cannot write new quota files.\n" msgstr "" -#: quotacheck.c:1009 +#: quotacheck.c:1025 msgid "Filesystem remounted RW.\n" msgstr "" -#: quotacheck.c:1052 +#: quotacheck.c:1069 #, c-format msgid "Cannot find quota option on filesystem %s with quotas!\n" msgstr "" -#: quotacheck.c:1058 +#: quotacheck.c:1075 #, c-format msgid "Cannot detect quota format for journalled quota on %s\n" msgstr "" -#: quotacheck.c:1124 +#: quotacheck.c:1141 #, c-format msgid "Cannot get system info: %s\n" msgstr "" -#: quotacheck.c:1144 +#: quotacheck.c:1161 msgid "" "Your kernel probably supports journaled quota but you are not using it. " "Consider switching to journaled quota to avoid running quotacheck after an " "unclean shutdown.\n" msgstr "" -#: quotacheck.c:1158 quotasys.c:910 +#: quotacheck.c:1175 quotasys.c:933 msgid "Cannot initialize mountpoint scan.\n" msgstr "" -#: quotacheck.c:1163 +#: quotacheck.c:1180 #, c-format msgid "Skipping %s [%s]\n" msgstr "" -#: quotacheck.c:1180 +#: quotacheck.c:1197 #, c-format msgid "" "Cannot guess format from filename on %s. Please specify format on " "commandline.\n" msgstr "" -#: quotacheck.c:1185 +#: quotacheck.c:1202 #, c-format msgid "Detected quota format %s\n" msgstr "" -#: quotacheck.c:1206 +#: quotacheck.c:1223 msgid "" "Cannot find filesystem to check or filesystem not mounted with quota " "option.\n" msgstr "" -#: quotacheck.c:1224 +#: quotacheck.c:1241 #, c-format msgid "" "Allocated %d bytes memory\n" @@ -812,57 +837,57 @@ "Lost %d bytes\n" msgstr "" -#: quot.c:81 +#: quot.c:82 #, c-format msgid "Usage: %s [-acfugvViTq] [filesystem...]\n" msgstr "" -#: quot.c:178 +#: quot.c:180 #, c-format msgid "%s (%s):\n" msgstr "" -#: quot.c:182 quot.c:186 +#: quot.c:184 quot.c:188 #, c-format msgid "%d\t%llu\t%llu\n" msgstr "" -#: quot.c:195 +#: quot.c:197 #, c-format msgid "%s (%s) %ss:\n" msgstr "" -#: quot.c:203 quot.c:205 +#: quot.c:205 quot.c:207 #, c-format msgid "%8llu " msgstr "" -#: quot.c:208 +#: quot.c:210 #, c-format msgid "%s" msgstr "" -#: quot.c:210 +#: quot.c:212 #, c-format msgid "%-8.8s" msgstr "" -#: quot.c:212 +#: quot.c:214 #, c-format msgid "#%-7d" msgstr "" -#: quot.c:214 +#: quot.c:216 #, c-format msgid " %8llu %8llu %8llu" msgstr "" -#: quot.c:362 +#: quot.c:364 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: quot.c:382 +#: quot.c:384 #, c-format msgid "XFS_IOC_FSBULKSTAT ioctl failed: %s\n" msgstr "" @@ -905,19 +930,19 @@ msgid "%s quota sync failed for %s: %s\n" msgstr "" -#: quota.h:22 +#: quota.h:23 msgid "user" msgstr "" -#: quota.h:23 +#: quota.h:24 msgid "group" msgstr "" -#: quota.h:24 +#: quota.h:25 msgid "project" msgstr "" -#: quota.h:25 +#: quota.h:26 msgid "undefined" msgstr "" @@ -983,122 +1008,127 @@ msgid "Cannot connect to system DBUS: %s\n" msgstr "" -#: quota_nld.c:289 +#: quota_nld.c:292 #, c-format msgid "Failed to find tty of user %llu to report warning to.\n" msgstr "" -#: quota_nld.c:294 +#: quota_nld.c:297 #, c-format msgid "Failed to open tty %s of user %llu to report warning.\n" msgstr "" -#: quota_nld.c:300 +#: quota_nld.c:303 msgid "Warning" msgstr "" -#: quota_nld.c:303 +#: quota_nld.c:306 msgid "Error" msgstr "" -#: quota_nld.c:305 +#: quota_nld.c:308 msgid "Info" msgstr "" -#: quota_nld.c:308 +#: quota_nld.c:311 msgid "file limit reached" msgstr "" -#: quota_nld.c:311 +#: quota_nld.c:314 msgid "file quota exceeded too long" msgstr "" -#: quota_nld.c:314 +#: quota_nld.c:317 msgid "file quota exceeded" msgstr "" -#: quota_nld.c:317 +#: quota_nld.c:320 msgid "block limit reached" msgstr "" -#: quota_nld.c:320 +#: quota_nld.c:323 msgid "block quota exceeded too long" msgstr "" -#: quota_nld.c:323 +#: quota_nld.c:326 msgid "block quota exceeded" msgstr "" -#: quota_nld.c:326 +#: quota_nld.c:329 msgid "got below file limit" msgstr "" -#: quota_nld.c:329 +#: quota_nld.c:332 msgid "got below file quota" msgstr "" -#: quota_nld.c:332 +#: quota_nld.c:335 msgid "got below block limit" msgstr "" -#: quota_nld.c:335 +#: quota_nld.c:338 msgid "got below block quota" msgstr "" -#: quota_nld.c:338 +#: quota_nld.c:341 msgid "unknown quota warning" msgstr "" -#: quota_nld.c:342 +#: quota_nld.c:345 #, c-format msgid "Failed to write quota message for user %llu to %s: %s\n" msgstr "" -#: quota_nld.c:355 +#: quota_nld.c:358 msgid "Cannot create DBUS message: No enough memory.\n" msgstr "" -#: quota_nld.c:373 +#: quota_nld.c:376 msgid "Failed to write message to dbus: No enough memory.\n" msgstr "" -#: quota_nld.c:389 +#: quota_nld.c:392 #, c-format msgid "Failed to read or parse quota netlink message: %s\n" msgstr "" -#: quota_nld.c:400 +#: quota_nld.c:403 msgid "Undefined program name.\n" msgstr "" -#: quota_nld.c:405 +#: quota_nld.c:408 msgid "Not enough memory to build PID file name.\n" msgstr "" -#: quota_nld.c:424 +#: quota_nld.c:427 #, c-format msgid "Could not open PID file '%s': %s\n" msgstr "" -#: quota_nld.c:430 +#: quota_nld.c:433 #, c-format msgid "Could not write daemon's PID into '%s'.\n" msgstr "" -#: quota_nld.c:437 +#: quota_nld.c:440 #, c-format msgid "Could not close PID file '%s'.\n" msgstr "" -#: quota_nld.c:467 +#: quota_nld.c:470 msgid "Could not register PID file removal on SIGTERM.\n" msgstr "" -#: quota_nld.c:469 +#: quota_nld.c:472 #, c-format msgid "Could not store my PID %jd.\n" msgstr "" +#: quota_nld.c:489 rquota_svc.c:537 +#, c-format +msgid "Failed to daemonize: %s\n" +msgstr "" + #: repquota.c:51 #, c-format msgid "" @@ -1107,71 +1137,78 @@ "%s [-vugsi] [-c|C] [-t|n] [-F quotaformat] [-O (default | xml | csv)] (-a | " "mntpoint)\n" "\n" -"-v, --verbose display also users/groups without any usage\n" -"-u, --user display information about users\n" -"-g, --group display information about groups\n" -"-P, --project display information about projects\n" -"-s, --human-readable show numbers in human friendly units (MB, " -"GB, ...)\n" -"-t, --truncate-names truncate names to 9 characters\n" -"-p, --raw-grace print grace time in seconds since epoch\n" -"-n, --no-names do not translate uid/gid to name\n" -"-i, --no-autofs avoid autofs mountpoints\n" -"-c, --cache translate big number of ids at once\n" -"-C, --no-cache translate ids one by one\n" -"-F, --format=formatname report information for specific format\n" -"-O, --output=format format output as xml or csv\n" -"-a, --all report information for all mount points with " -"quotas\n" -"-h, --help display this help message and exit\n" -"-V, --version display version information and exit\n" +"-v, --verbose display also users/groups without any usage\n" +"-u, --user display information about users\n" +"-g, --group display information about groups\n" +"-P, --project display information about projects\n" +"-s, --human-readable[=units] display numbers in human friendly units (MB, " +"GB,\n" +" ...). Units can be also specified explicitely " +"by\n" +" an optional argument in format [kgt],[kgt] " +"where\n" +" the first character specifies space units and " +"the\n" +" second character specifies inode units\n" +"-t, --truncate-names truncate names to 9 characters\n" +"-p, --raw-grace print grace time in seconds since epoch\n" +"-n, --no-names do not translate uid/gid to name\n" +"-i, --no-autofs avoid autofs mountpoints\n" +"-c, --cache translate big number of ids at once\n" +"-C, --no-cache translate ids one by one\n" +"-F, --format=formatname report information for specific format\n" +"-O, --output=format format output as xml or csv\n" +"-a, --all report information for all mount points with\n" +" quotas\n" +"-h, --help display this help message and exit\n" +"-V, --version display version information and exit\n" "\n" msgstr "" -#: repquota.c:158 +#: repquota.c:167 msgid "Repquota cannot report through RPC calls.\n" msgstr "" -#: repquota.c:162 +#: repquota.c:171 msgid "Specified both -n and -t but only one of them can be used.\n" msgstr "" -#: repquota.c:366 +#: repquota.c:375 msgid "User" msgstr "" -#: repquota.c:368 +#: repquota.c:377 msgid "Group" msgstr "" -#: repquota.c:370 +#: repquota.c:379 msgid "Project" msgstr "" -#: repquota.c:373 +#: repquota.c:382 #, c-format msgid "*** Report for %s quotas on device %s\n" msgstr "" -#: repquota.c:382 +#: repquota.c:391 msgid "Space" msgstr "" -#: repquota.c:384 +#: repquota.c:393 msgid "Block" msgstr "" -#: repquota.c:385 +#: repquota.c:394 #, c-format msgid "Block grace time: %s; Inode grace time: %s\n" msgstr "" -#: repquota.c:386 +#: repquota.c:395 #, c-format msgid " %s limits File limits\n" msgstr "" -#: repquota.c:387 +#: repquota.c:396 #, c-format msgid "%-9s used soft hard grace used soft hard grace\n" msgstr "" @@ -1335,40 +1372,44 @@ msgid "WARNING - Quota file %s has corrupted headers\n" msgstr "" -#: quotacheck_v2.c:362 +#: quotacheck_v2.c:361 +msgid "Continue checking assuming format from command line?" +msgstr "" + +#: quotacheck_v2.c:365 #, c-format msgid "" "Quota file format version %d does not match the one specified on command " "line (%d). Quota file header may be corrupted.\n" msgstr "" -#: quotacheck_v2.c:366 +#: quotacheck_v2.c:370 msgid "Continue checking assuming version from command line?" msgstr "" -#: quotacheck_v2.c:372 +#: quotacheck_v2.c:376 msgid "Headers checked.\n" msgstr "" -#: quotacheck_v2.c:388 +#: quotacheck_v2.c:392 #, c-format msgid "Do not know how to buffer format %d\n" msgstr "" -#: quotacheck_v2.c:398 +#: quotacheck_v2.c:402 #, c-format msgid "Headers of file %s checked. Going to load data...\n" msgstr "" -#: quotacheck_v2.c:406 +#: quotacheck_v2.c:410 msgid "Cannot gather quota data. Tree root node corrupted.\n" msgstr "" -#: quotacheck_v2.c:414 +#: quotacheck_v2.c:418 msgid "WARNING - Some data might be changed due to corruption.\n" msgstr "" -#: quotacheck_v2.c:417 +#: quotacheck_v2.c:421 msgid "Not found any corrupted blocks. Congratulations.\n" msgstr "" @@ -1384,59 +1425,59 @@ msgid "RPC quota format specified for non-NFS filesystem.\n" msgstr "" -#: quotaio.c:84 +#: quotaio.c:85 msgid "Only XFS quota format is allowed on XFS filesystem.\n" msgstr "" -#: quotaio.c:95 +#: quotaio.c:96 msgid "XFS quota allowed only on XFS filesystem.\n" msgstr "" -#: quotaio.c:109 +#: quotaio.c:110 msgid "Quota not supported by the filesystem.\n" msgstr "" -#: quotaio.c:129 +#: quotaio.c:130 msgid "Cannot find any quota file to work on.\n" msgstr "" -#: quotaio.c:134 +#: quotaio.c:135 msgid "Quota file not found or has wrong format.\n" msgstr "" -#: quotaio.c:144 +#: quotaio.c:145 #, c-format msgid "Cannot sync quotas on device %s: %s\n" msgstr "" -#: quotaio.c:175 +#: quotaio.c:176 #, c-format msgid "Cannot initialize quota on %s: %s\n" msgstr "" -#: quotaio.c:202 +#: quotaio.c:203 #, c-format msgid "Creation of %s quota format is not supported.\n" msgstr "" -#: quotaio.c:212 +#: quotaio.c:213 #, c-format msgid "" "Quota on %s is stored in system files and must be manipulated by fs tools.\n" msgstr "" -#: quotaio.c:222 +#: quotaio.c:223 #, c-format msgid "Cannot create new quotafile %s: %s\n" msgstr "" -#: quotaio.c:296 +#: quotaio.c:297 #, c-format msgid "" "Trying to set quota limits out of range supported by quota format on %s.\n" msgstr "" -#: quotaio.c:302 +#: quotaio.c:303 #, c-format msgid "" "Trying to set quota usage out of range supported by quota format on %s.\n" @@ -1472,7 +1513,7 @@ "interface!\n" msgstr "" -#: quotaio_rpc.c:76 quotaio_v1.c:308 quotaio_v2.c:464 +#: quotaio_rpc.c:77 quotaio_v1.c:278 quotaio_v2.c:464 #, c-format msgid "Trying to write quota to readonly quotafile on %s\n" msgstr "" @@ -1528,7 +1569,7 @@ "Please run quotacheck(8) and try again.\n" msgstr "" -#: quotaio_v1.c:214 +#: quotaio_v1.c:184 #, c-format msgid "Trying to write info to readonly quotafile on %s.\n" msgstr "" @@ -1554,40 +1595,40 @@ "Used average: %f\n" msgstr "" -#: quotaio_xfs.c:260 +#: quotaio_xfs.c:265 #, c-format msgid "*** Status for %s quotas on device %s\n" msgstr "" -#: quotaio_xfs.c:262 quotaio_xfs.c:281 +#: quotaio_xfs.c:267 quotaio_xfs.c:286 msgid "ON" msgstr "" -#: quotaio_xfs.c:262 quotaio_xfs.c:281 +#: quotaio_xfs.c:267 quotaio_xfs.c:286 msgid "OFF" msgstr "" -#: quotaio_xfs.c:264 quotaio_xfs.c:268 quotaio_xfs.c:272 +#: quotaio_xfs.c:269 quotaio_xfs.c:273 quotaio_xfs.c:277 #, c-format msgid "Accounting: %s; Enforcement: %s\n" msgstr "" -#: quotaio_xfs.c:284 quotaio_xfs.c:288 quotaio_xfs.c:292 +#: quotaio_xfs.c:289 quotaio_xfs.c:293 quotaio_xfs.c:297 #, c-format msgid "Accounting [ondisk]: %s; Enforcement [ondisk]: %s\n" msgstr "" -#: quotaio_xfs.c:301 quotaio_xfs.c:310 quotaio_xfs.c:323 +#: quotaio_xfs.c:306 quotaio_xfs.c:315 quotaio_xfs.c:328 #, c-format msgid "Inode: none\n" msgstr "" -#: quotaio_xfs.c:303 quotaio_xfs.c:312 quotaio_xfs.c:325 +#: quotaio_xfs.c:308 quotaio_xfs.c:317 quotaio_xfs.c:330 #, c-format msgid "Inode: #%llu (%llu blocks, %u extents)\n" msgstr "" -#: quotaon.c:67 +#: quotaon.c:37 #, c-format msgid "" "Usage:\n" @@ -1607,120 +1648,120 @@ "-V, --version display version information and exit\n" msgstr "" -#: quotaon.c:81 +#: quotaon.c:51 msgid "turn quotas off for all filesystems" msgstr "" -#: quotaon.c:82 +#: quotaon.c:52 msgid "turn quotas on for all filesystems" msgstr "" -#: quotaon.c:147 +#: quotaon.c:117 msgid "Cannot turn on/off quotas via RPC.\n" msgstr "" -#: quotaon.c:194 +#: quotaon.c:164 #, c-format msgid "set root_squash on %s: %s\n" msgstr "" -#: quotaon.c:198 +#: quotaon.c:168 #, c-format msgid "%s: %s root_squash turned off\n" msgstr "" -#: quotaon.c:200 +#: quotaon.c:170 #, c-format msgid "%s: %s root_squash turned on\n" msgstr "" -#: quotaon.c:218 +#: quotaon.c:188 #, c-format msgid "quotactl on %s [%s]: %s\n" msgstr "" -#: quotaon.c:221 +#: quotaon.c:191 #, c-format msgid "%s [%s]: %s quotas turned off\n" msgstr "" -#: quotaon.c:234 +#: quotaon.c:204 #, c-format msgid "cannot find %s on %s [%s]\n" msgstr "" -#: quotaon.c:236 +#: quotaon.c:206 #, c-format msgid "using %s on %s [%s]: %s\n" msgstr "" -#: quotaon.c:238 +#: quotaon.c:208 msgid "Maybe create new quota files with quotacheck(8)?\n" msgstr "" -#: quotaon.c:240 +#: quotaon.c:210 msgid "Quota format not supported in kernel.\n" msgstr "" -#: quotaon.c:243 +#: quotaon.c:213 #, c-format msgid "%s [%s]: %s quotas turned on\n" msgstr "" -#: quotaon.c:283 +#: quotaon.c:253 msgid "Cannot change state of GFS2 quota.\n" msgstr "" -#: quotaon.c:287 +#: quotaon.c:258 msgid "Cannot change state of XFS quota. It's not compiled in kernel.\n" msgstr "" -#: quotaon.c:312 +#: quotaon.c:283 #, c-format msgid "Cannot find quota file on %s [%s] to turn quotas on/off.\n" msgstr "" -#: quotaon.c:317 +#: quotaon.c:288 #, c-format msgid "Quota file on %s [%s] does not exist or has wrong format.\n" msgstr "" -#: quotaon.c:346 quotaon.c:362 +#: quotaon.c:318 quotaon.c:334 msgid "off" msgstr "" -#: quotaon.c:348 +#: quotaon.c:320 msgid "on (accounting)" msgstr "" -#: quotaon.c:350 +#: quotaon.c:322 msgid "on (enforced)" msgstr "" -#: quotaon.c:362 +#: quotaon.c:334 msgid "on" msgstr "" -#: quotaon.c:364 +#: quotaon.c:336 #, c-format msgid "%s quota on %s (%s) is %s\n" msgstr "" -#: quotaon.c:381 +#: quotaon.c:353 #, c-format msgid "Name must be quotaon or quotaoff not %s\n" msgstr "" -#: quotaon.c:387 +#: quotaon.c:359 #, c-format msgid "Required format %s not supported by kernel.\n" msgstr "" -#: quotaon.c:389 +#: quotaon.c:361 msgid "Warning: No quota format detected in the kernel.\n" msgstr "" -#: quotaon.c:396 +#: quotaon.c:368 #, c-format msgid "%s: Quota cannot be turned on on NFS filesystem\n" msgstr "" @@ -1826,189 +1867,189 @@ msgid "Invalid argument \"%s\"\n" msgstr "" -#: quotaops.c:112 +#: quotaops.c:82 #, c-format msgid "%s (uid %d): Permission denied\n" msgstr "" -#: quotaops.c:124 +#: quotaops.c:94 #, c-format msgid "%s (gid %d): gid set allocation (%d): %s\n" msgstr "" -#: quotaops.c:135 +#: quotaops.c:105 #, c-format msgid "%s (gid %d): error while trying getgroups(): %s\n" msgstr "" -#: quotaops.c:146 +#: quotaops.c:116 #, c-format msgid "%s (gid %d): Permission denied\n" msgstr "" -#: quotaops.c:162 +#: quotaops.c:132 #, c-format msgid "error while getting quota from %s for %s (id %u): %s\n" msgstr "" -#: quotaops.c:187 +#: quotaops.c:157 #, c-format msgid "Cannot write quota for %u on %s: %s\n" msgstr "" -#: quotaops.c:222 quotaops.c:224 +#: quotaops.c:192 quotaops.c:194 #, c-format msgid "%s failed: %s\n" msgstr "" -#: quotaops.c:238 +#: quotaops.c:208 msgid "Too many parameters to editor.\n" msgstr "" -#: quotaops.c:246 +#: quotaops.c:216 #, c-format msgid "Cannot exec %s\n" msgstr "" -#: quotaops.c:263 +#: quotaops.c:233 #, c-format msgid "Cannot truncate a file: %s\n" msgstr "" -#: quotaops.c:265 +#: quotaops.c:235 #, c-format msgid "Cannot reset a file offset: %s\n" msgstr "" -#: quotaops.c:267 +#: quotaops.c:237 #, c-format msgid "Cannot duplicate a file descriptor: %s\n" msgstr "" -#: quotaops.c:269 +#: quotaops.c:239 #, c-format msgid "Cannot open a stream to write to: %s\n" msgstr "" -#: quotaops.c:270 +#: quotaops.c:240 #, c-format msgid "Cannot open a stream to read from: %s\n" msgstr "" -#: quotaops.c:286 +#: quotaops.c:256 #, c-format msgid "Disk quotas for %s %s (%cid %d):\n" msgstr "" -#: quotaops.c:290 +#: quotaops.c:260 #, c-format msgid "" " Filesystem blocks soft hard inodes " "soft hard\n" msgstr "" -#: quotaops.c:323 +#: quotaops.c:293 #, c-format msgid "WARNING - %s: cannot change current block allocation\n" msgstr "" -#: quotaops.c:326 +#: quotaops.c:296 #, c-format msgid "WARNING - %s: cannot change current inode allocation\n" msgstr "" -#: quotaops.c:352 +#: quotaops.c:322 msgid "Bad format: two title lines assumed\n" msgstr "" -#: quotaops.c:363 +#: quotaops.c:333 #, c-format msgid "" "Bad format:\n" "%s\n" msgstr "" -#: quotaops.c:369 +#: quotaops.c:339 #, c-format msgid "Bad block usage: %s: %s\n" msgstr "" -#: quotaops.c:376 +#: quotaops.c:346 #, c-format msgid "Bad block soft limit: %s: %s\n" msgstr "" -#: quotaops.c:383 +#: quotaops.c:353 #, c-format msgid "Bad block hard limit: %s: %s\n" msgstr "" -#: quotaops.c:390 +#: quotaops.c:360 #, c-format msgid "Bad inode usage: %s: %s\n" msgstr "" -#: quotaops.c:397 +#: quotaops.c:367 #, c-format msgid "Bad inode soft limit: %s: %s\n" msgstr "" -#: quotaops.c:404 +#: quotaops.c:374 #, c-format msgid "Bad inode hard limit: %s: %s\n" msgstr "" -#: quotaops.c:457 +#: quotaops.c:427 #, c-format msgid "Times to enforce softlimit for %s %s (%cid %d):\n" msgstr "" -#: quotaops.c:459 quotaops.c:562 +#: quotaops.c:429 quotaops.c:532 #, c-format msgid "Time units may be: days, hours, minutes, or seconds\n" msgstr "" -#: quotaops.c:461 +#: quotaops.c:431 #, c-format msgid "" " Filesystem block grace inode grace\n" msgstr "" -#: quotaops.c:466 quotaops.c:472 quotaops.c:517 quotaops.c:530 setquota.c:288 +#: quotaops.c:436 quotaops.c:442 quotaops.c:487 quotaops.c:500 setquota.c:288 #: setquota.c:294 msgid "unset" msgstr "" -#: quotaops.c:468 quotaops.c:474 +#: quotaops.c:438 quotaops.c:444 msgid "0seconds" msgstr "" -#: quotaops.c:470 quotaops.c:476 quotasys.c:503 +#: quotaops.c:440 quotaops.c:446 quotasys.c:503 #, c-format msgid "%useconds" msgstr "" -#: quotaops.c:503 quotaops.c:602 +#: quotaops.c:473 quotaops.c:572 msgid "Bad format: three title lines assumed\n" msgstr "" -#: quotaops.c:513 quotaops.c:610 +#: quotaops.c:483 quotaops.c:580 #, c-format msgid "" "bad format:\n" "%s\n" msgstr "" -#: quotaops.c:524 quotaops.c:616 +#: quotaops.c:494 quotaops.c:586 msgid "Bad time units. Units are 'second', 'minute', 'hour', and 'day'.\n" msgstr "" -#: quotaops.c:560 +#: quotaops.c:530 #, c-format msgid "Grace period before enforcing soft limits for %ss:\n" msgstr "" -#: quotaops.c:563 +#: quotaops.c:533 #, c-format msgid " Filesystem Block grace period Inode grace period\n" msgstr "" @@ -2125,7 +2166,7 @@ "\n" msgstr "" -#: setquota.c:84 edquota.c:104 quota.c:114 +#: setquota.c:84 edquota.c:104 quota.c:90 #, c-format msgid "Bugs to: %s\n" msgstr "" @@ -2295,7 +2336,7 @@ " xml - simple XML\n" msgstr "" -#: quotasys.c:459 quota.c:297 +#: quotasys.c:459 quota.c:278 msgid "none" msgstr "" @@ -2356,172 +2397,172 @@ msgid "days" msgstr "" -#: quotasys.c:573 +#: quotasys.c:582 msgid "Integer overflow while parsing space number." msgstr "" -#: quotasys.c:575 +#: quotasys.c:584 msgid "K" msgstr "" -#: quotasys.c:577 +#: quotasys.c:586 msgid "M" msgstr "" -#: quotasys.c:579 +#: quotasys.c:588 msgid "G" msgstr "" -#: quotasys.c:581 +#: quotasys.c:590 msgid "T" msgstr "" -#: quotasys.c:584 +#: quotasys.c:593 msgid "Unknown space binary unit. Valid units are K, M, G, T." msgstr "" -#: quotasys.c:588 +#: quotasys.c:597 msgid "Integer overflow while interpreting space unit." msgstr "" -#: quotasys.c:628 +#: quotasys.c:650 msgid "Integer overflow while parsing number." msgstr "" -#: quotasys.c:632 +#: quotasys.c:654 msgid "k" msgstr "" -#: quotasys.c:634 +#: quotasys.c:656 msgid "m" msgstr "" -#: quotasys.c:636 +#: quotasys.c:658 msgid "g" msgstr "" -#: quotasys.c:638 +#: quotasys.c:660 msgid "t" msgstr "" -#: quotasys.c:641 +#: quotasys.c:663 msgid "Unknown decimal unit. Valid units are k, m, g, t." msgstr "" -#: quotasys.c:645 +#: quotasys.c:667 msgid "Integer overflow while interpreting decimal unit." msgstr "" -#: quotasys.c:803 +#: quotasys.c:826 #, c-format msgid "Cannot stat quota file %s: %s\n" msgstr "" -#: quotasys.c:949 +#: quotasys.c:974 msgid "Not all specified mountpoints are using quota.\n" msgstr "" -#: quotasys.c:963 +#: quotasys.c:988 #, c-format msgid "Error while releasing file on %s\n" msgstr "" -#: quotasys.c:1022 +#: quotasys.c:1047 #, c-format msgid "Cannot create set for sigaction(): %s\n" msgstr "" -#: quotasys.c:1025 +#: quotasys.c:1050 #, c-format msgid "Cannot set signal handler: %s\n" msgstr "" -#: quotasys.c:1080 +#: quotasys.c:1106 #, c-format msgid "Cannot reset signal handler: %s\n" msgstr "" -#: quotasys.c:1235 +#: quotasys.c:1261 msgid "Cannot open any file with mount points.\n" msgstr "" -#: quotasys.c:1253 +#: quotasys.c:1279 #, c-format msgid "Cannot get device name for %s\n" msgstr "" -#: quotasys.c:1313 +#: quotasys.c:1339 #, c-format msgid "Cannot resolve mountpoint path %s: %s\n" msgstr "" -#: quotasys.c:1319 +#: quotasys.c:1345 #, c-format msgid "Cannot statfs() %s: %s\n" msgstr "" -#: quotasys.c:1331 +#: quotasys.c:1357 #, c-format msgid "Cannot stat() mounted device %s: %s\n" msgstr "" -#: quotasys.c:1336 +#: quotasys.c:1362 #, c-format msgid "" "Device (%s) filesystem is mounted on unsupported device type. Skipping.\n" msgstr "" -#: quotasys.c:1346 +#: quotasys.c:1372 #, c-format msgid "Cannot stat() mountpoint %s: %s\n" msgstr "" -#: quotasys.c:1415 +#: quotasys.c:1441 #, c-format msgid "" "Cannot find a device with %s.\n" "Skipping...\n" msgstr "" -#: quotasys.c:1419 +#: quotasys.c:1445 #, c-format msgid "" "Cannot stat() a mountpoint with %s: %s\n" "Skipping...\n" msgstr "" -#: quotasys.c:1427 +#: quotasys.c:1453 #, c-format msgid "" "Cannot stat() given mountpoint %s: %s\n" "Skipping...\n" msgstr "" -#: quotasys.c:1437 +#: quotasys.c:1463 #, c-format msgid "Cannot find a filesystem mountpoint for directory %s\n" msgstr "" -#: quotasys.c:1443 +#: quotasys.c:1469 #, c-format msgid "Cannot resolve path %s: %s\n" msgstr "" -#: quotasys.c:1454 +#: quotasys.c:1480 #, c-format msgid "Cannot find mountpoint for device %s\n" msgstr "" -#: quotasys.c:1460 +#: quotasys.c:1486 #, c-format msgid "Specified path %s is not directory nor device.\n" msgstr "" -#: quotasys.c:1468 +#: quotasys.c:1494 msgid "No correct mountpoint specified.\n" msgstr "" -#: quotasys.c:1523 +#: quotasys.c:1549 #, c-format msgid "Mountpoint (or device) %s not found or has no quota enabled.\n" msgstr "" @@ -2620,7 +2661,7 @@ msgid "Unable to register (RQUOTAPROG, EXT_RQUOTAVERS, %s).\n" msgstr "" -#: rquota_svc.c:539 +#: rquota_svc.c:542 msgid "svc_run returned\n" msgstr "" @@ -2669,66 +2710,76 @@ msgid "Error creating socket: %s\n" msgstr "" -#: svc_socket.c:122 +#: svc_socket.c:124 +#, c-format +msgid "Cannot set IPv6 socket options: %s\n" +msgstr "" + +#: svc_socket.c:131 #, c-format msgid "Cannot set socket options: %s\n" msgstr "" -#: svc_socket.c:128 +#: svc_socket.c:137 #, c-format msgid "Cannot bind to address: %s\n" msgstr "" +#: svc_socket.c:144 +#, c-format +msgid "Cannot listen to address: %s\n" +msgstr "" + #: xqmstats.c:32 xqmstats.c:37 msgid "The running kernel does not support XFS\n" msgstr "" -#: xqmstats.c:49 +#: xqmstats.c:50 #, c-format msgid "XFS Quota Manager dquot statistics\n" msgstr "" -#: xqmstats.c:50 +#: xqmstats.c:51 #, c-format msgid " reclaims: %u\n" msgstr "" -#: xqmstats.c:51 +#: xqmstats.c:52 #, c-format msgid " missed reclaims: %u\n" msgstr "" -#: xqmstats.c:52 +#: xqmstats.c:53 #, c-format msgid " dquot dups: %u\n" msgstr "" -#: xqmstats.c:53 +#: xqmstats.c:54 #, c-format msgid " cache misses: %u\n" msgstr "" -#: xqmstats.c:54 +#: xqmstats.c:55 #, c-format msgid " cache hits: %u\n" msgstr "" -#: xqmstats.c:55 +#: xqmstats.c:56 #, c-format msgid " dquot wants: %u\n" msgstr "" -#: xqmstats.c:56 +#: xqmstats.c:57 #, c-format msgid " shake reclaims: %u\n" msgstr "" -#: xqmstats.c:57 +#: xqmstats.c:58 #, c-format msgid " inact reclaims: %u\n" msgstr "" -#: xqmstats.c:62 +#: xqmstats.c:63 #, c-format msgid "Maximum %u dquots (currently %u incore, %u on freelist)\n" msgstr "" @@ -2853,138 +2904,151 @@ msgid "Cannot read quotas from file.\n" msgstr "" -#: quota.c:87 +#: quota.c:58 msgid "Usage: quota [-guPqvswim] [-l | [-Q | -A]] [-F quotaformat]\n" msgstr "" -#: quota.c:88 +#: quota.c:59 msgid "\tquota [-qvswim] [-l | [-Q | -A]] [-F quotaformat] -u username ...\n" msgstr "" -#: quota.c:89 +#: quota.c:60 msgid "\tquota [-qvswim] [-l | [-Q | -A]] [-F quotaformat] -g groupname ...\n" msgstr "" -#: quota.c:90 +#: quota.c:61 msgid "\tquota [-qvswugPQm] [-F quotaformat] -f filesystem ...\n" msgstr "" -#: quota.c:91 +#: quota.c:62 msgid "" "\n" -"-u, --user display quota for user\n" -"-g, --group display quota for group\n" -"-P, --project display quota for project\n" -"-q, --quiet print more terse message\n" -"-v, --verbose print more verbose message\n" -"-s, --human-readable display numbers in human friendly units (MB, " -"GB...)\n" -" --always-resolve always try to translate name to id, even if it is\n" -"\t\t\t composed of only digits\n" -"-w, --no-wrap do not wrap long lines\n" -"-p, --raw-grace print grace time in seconds since epoch\n" -"-l, --local-only do not query NFS filesystems\n" -"-Q, --quiet-refuse do not print error message when NFS server does\n" -" not respond\n" -"-i, --no-autofs do not query autofs mountpoints\n" -"-F, --format=formatname display quota of a specific format\n" -"-f, --filesystem-list display quota information only for given " -"filesystems\n" -"-A, --all-nfs display quota for all NFS mountpoints\n" -"-m, --no-mixed-pathnames trim leading slashes from NFSv4 mountpoints\n" -" --show-mntpoint show mount point of the file system in output\n" -" --hide-device do not show file system device in output\n" -"-h, --help display this help message and exit\n" -"-V, --version display version information and exit\n" +"-u, --user display quota for user\n" +"-g, --group display quota for group\n" +"-P, --project display quota for project\n" +"-q, --quiet print more terse message\n" +"-v, --verbose print more verbose message\n" +"-s, --human-readable[=units] display numbers in human friendly units (MB, " +"GB,\n" +" ...). Units can be also specified explicitely " +"by\n" +" an optional argument in format [kgt],[kgt] " +"where\n" +" the first character specifies space units and " +"the\n" +" second character specifies inode units\n" +" --always-resolve always try to translate name to id, even if it " +"is\n" +"\t\t\t composed of only digits\n" +"-w, --no-wrap do not wrap long lines\n" +"-p, --raw-grace print grace time in seconds since epoch\n" +"-l, --local-only do not query NFS filesystems\n" +"-Q, --quiet-refuse do not print error message when NFS server " +"does\n" +" not respond\n" +"-i, --no-autofs do not query autofs mountpoints\n" +"-F, --format=formatname display quota of a specific format\n" +"-f, --filesystem-list display quota information only for given\n" +" filesystems\n" +"-A, --all-nfs display quota for all NFS mountpoints\n" +"-m, --no-mixed-pathnames trim leading slashes from NFSv4 mountpoints\n" +" --show-mntpoint show mount point of the file system in output\n" +" --hide-device do not show file system device in output\n" +"-h, --help display this help message and exit\n" +"-V, --version display version information and exit\n" "\n" msgstr "" -#: quota.c:123 +#: quota.c:99 msgid "space" msgstr "" -#: quota.c:125 +#: quota.c:101 msgid "blocks" msgstr "" -#: quota.c:127 +#: quota.c:103 #, c-format msgid "Disk quotas for %s %s (%cid %u): %s\n" msgstr "" -#: quota.c:130 +#: quota.c:106 msgid "Filesystem" msgstr "" -#: quota.c:131 quota.c:132 +#: quota.c:107 quota.c:108 msgid "quota" msgstr "" -#: quota.c:131 quota.c:132 +#: quota.c:107 quota.c:108 msgid "limit" msgstr "" -#: quota.c:131 quota.c:132 +#: quota.c:107 quota.c:108 msgid "grace" msgstr "" -#: quota.c:132 +#: quota.c:108 msgid "files" msgstr "" -#: quota.c:208 +#: quota.c:189 msgid "File limit reached on" msgstr "" -#: quota.c:214 +#: quota.c:195 msgid "In file grace period on" msgstr "" -#: quota.c:218 +#: quota.c:199 msgid "Over file quota on" msgstr "" -#: quota.c:224 +#: quota.c:205 msgid "Block limit reached on" msgstr "" -#: quota.c:230 +#: quota.c:211 msgid "In block grace period on" msgstr "" -#: quota.c:234 +#: quota.c:215 msgid "Over block quota on" msgstr "" -#: quota.c:408 +#: quota.c:278 +msgid "no limited resources used" +msgstr "" + +#: quota.c:393 #, c-format msgid "Warning: Ignoring -%c when filesystem list specified.\n" msgstr "" -#: quota.c:415 +#: quota.c:400 msgid "No filesystem specified.\n" msgstr "" -#: quota.c:423 +#: quota.c:408 #, c-format msgid "Gid set allocation (%d): %s\n" msgstr "" -#: quota.c:429 +#: quota.c:414 #, c-format msgid "getgroups(): %s\n" msgstr "" -#: quota.c:434 +#: quota.c:419 msgid "Project reports not supported without project name\n" msgstr "" -#: common.c:124 +#: common.c:125 #, c-format msgid "Quota utilities version %s.\n" msgstr "" -#: common.c:125 +#: common.c:126 #, c-format msgid "Compiled with:%s\n" msgstr "" diff -Nru quota-4.04/quot.8 quota-4.05/quot.8 --- quota-4.04/quot.8 2013-03-27 07:38:47.000000000 +0000 +++ quota-4.05/quot.8 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -.TH QUOT 8 -.SH NAME -quot \- summarize filesystem ownership -.SH SYNOPSIS -.nf -\f3quot\f1 [ \f3\-acfguvi\f1 ] [ filesystem... ] -.fi -.SH DESCRIPTION -.IR quot -displays the number of kilobytes in the named -.I filesystem -currently owned by each user or group. Note that this utility -currently works only for XFS. -.SH OPTIONS -.TP -.B \-a -Generate a report for all mounted filesystems giving the number of -kilobytes used by each user or group. -.TP -.B \-c -Display three columns giving file size in kilobytes, number of -files of that size, and cumulative total of kilobytes -in that size or smaller file. -The last row is used as an overflow -bucket and is the total of all files greater than 500 kilobytes. -.TP -.B \-f -Display count of kilobytes and number of files owned by each user or group. -.TP -.B \-g -Report on groups. -.TP -.B \-u -Report on users (the default). -.TP -.B \-v -Display three columns containing the number of kilobytes not accessed in -the last 30, 60, and 90 days. -.TP -.B \-i -Ignore mountpoints mounted by automounter. -.TP -.B \-T -Avoid truncation of user names longer than 8 characters. -.TP -.B \-q -Do not sort the output. -.SH FILES -.PD 0 -.TP 20 -/etc/mtab -mounted filesystem table -.TP -/etc/passwd -default set of users -.TP -/etc/group -default set of groups -.PD -.SH "SEE ALSO" -du(1), -ls(1). -.SH BUGS -Currently, only the XFS filesystem type is supported. diff -Nru quota-4.04/quota.1 quota-4.05/quota.1 --- quota-4.04/quota.1 2016-03-31 08:30:11.000000000 +0000 +++ quota-4.05/quota.1 2018-01-10 08:47:25.000000000 +0000 @@ -109,10 +109,16 @@ will display quotas on filesystems where no storage is allocated. .TP -.B -s, --human-readable +.B -s, --human-readable[=\f2units\f1] option will make .BR quota (1) -try to choose units for showing limits, used space and used inodes. +try to choose units for showing limits, used space and used inodes. Units can +be also specified explicitely by an optional argument in format [ +.BR kgt +],[ +.BR kgt +] where the first character specifies space units and the second character +specifies inode units. .TP .B --always-resolve Always try to translate user / group name to uid / gid even if the name diff -Nru quota-4.04/quota.c quota-4.05/quota.c --- quota-4.04/quota.c 2017-09-05 14:03:59.000000000 +0000 +++ quota-4.05/quota.c 2019-03-29 10:39:28.000000000 +0000 @@ -1,35 +1,5 @@ /* - * Copyright (c) 1980, 1990 Regents of the University of California. All - * rights reserved. - * - * This code is derived from software contributed to Berkeley by Robert Elz at - * The University of Melbourne. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. 2. - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. 3. All advertising - * materials mentioning features or use of this software must display the - * following acknowledgement: This product includes software developed by the - * University of California, Berkeley and its contributors. 4. Neither the - * name of the University nor the names of its contributors may be used to - * endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * Basic utility for reporting quotas */ #include "config.h" @@ -49,6 +19,7 @@ #include #include #include +#include #ifdef RPC #include #include "rquota.h" @@ -64,7 +35,6 @@ #define FL_VERBOSE 2 #define FL_USER 4 #define FL_GROUP 8 -#define FL_SMARTSIZE 16 #define FL_LOCALONLY 32 #define FL_QUIETREFUSE 64 #define FL_NOAUTOFS 128 @@ -79,6 +49,7 @@ #define FL_PROJECT 65536 static int flags, fmt = -1; +static enum s2s_unit spaceunit = S2S_NONE, inodeunit = S2S_NONE; char *progname; static void usage(void) @@ -89,28 +60,33 @@ _("\tquota [-qvswim] [-l | [-Q | -A]] [-F quotaformat] -g groupname ...\n"), _("\tquota [-qvswugPQm] [-F quotaformat] -f filesystem ...\n"), _("\n\ --u, --user display quota for user\n\ --g, --group display quota for group\n\ --P, --project display quota for project\n\ --q, --quiet print more terse message\n\ --v, --verbose print more verbose message\n\ --s, --human-readable display numbers in human friendly units (MB, GB...)\n\ - --always-resolve always try to translate name to id, even if it is\n\ - composed of only digits\n\ --w, --no-wrap do not wrap long lines\n\ --p, --raw-grace print grace time in seconds since epoch\n\ --l, --local-only do not query NFS filesystems\n\ --Q, --quiet-refuse do not print error message when NFS server does\n\ - not respond\n\ --i, --no-autofs do not query autofs mountpoints\n\ --F, --format=formatname display quota of a specific format\n\ --f, --filesystem-list display quota information only for given filesystems\n\ --A, --all-nfs display quota for all NFS mountpoints\n\ --m, --no-mixed-pathnames trim leading slashes from NFSv4 mountpoints\n\ - --show-mntpoint show mount point of the file system in output\n\ - --hide-device do not show file system device in output\n\ --h, --help display this help message and exit\n\ --V, --version display version information and exit\n\n")); +-u, --user display quota for user\n\ +-g, --group display quota for group\n\ +-P, --project display quota for project\n\ +-q, --quiet print more terse message\n\ +-v, --verbose print more verbose message\n\ +-s, --human-readable[=units] display numbers in human friendly units (MB, GB,\n\ + ...). Units can be also specified explicitely by\n\ + an optional argument in format [kgt],[kgt] where\n\ + the first character specifies space units and the\n\ + second character specifies inode units\n\ + --always-resolve always try to translate name to id, even if it is\n\ + composed of only digits\n\ +-w, --no-wrap do not wrap long lines\n\ +-p, --raw-grace print grace time in seconds since epoch\n\ +-l, --local-only do not query NFS filesystems\n\ +-Q, --quiet-refuse do not print error message when NFS server does\n\ + not respond\n\ +-i, --no-autofs do not query autofs mountpoints\n\ +-F, --format=formatname display quota of a specific format\n\ +-f, --filesystem-list display quota information only for given\n\ + filesystems\n\ +-A, --all-nfs display quota for all NFS mountpoints\n\ +-m, --no-mixed-pathnames trim leading slashes from NFSv4 mountpoints\n\ + --show-mntpoint show mount point of the file system in output\n\ + --hide-device do not show file system device in output\n\ +-h, --help display this help message and exit\n\ +-V, --version display version information and exit\n\n")); fprintf(stderr, _("Bugs to: %s\n"), PACKAGE_BUGREPORT); exit(1); } @@ -119,7 +95,7 @@ { char *spacehdr; - if (flags & FL_SMARTSIZE) + if (spaceunit != S2S_NONE) spacehdr = _("space"); else spacehdr = _("blocks"); @@ -182,7 +158,7 @@ char timebuf[MAXTIMELEN]; char name[MAXNAMELEN]; struct quota_handle **handles; - int lines = 0, bover, iover, over; + int lines = 0, bover, iover, over, unlimited; time_t now; time(&now); @@ -198,11 +174,16 @@ goto out_handles; } over = 0; + unlimited = 1; for (q = qlist; q; q = q->dq_next) { bover = iover = 0; - if (!(flags & FL_VERBOSE) && !q->dq_dqb.dqb_isoftlimit && !q->dq_dqb.dqb_ihardlimit - && !q->dq_dqb.dqb_bsoftlimit && !q->dq_dqb.dqb_bhardlimit) - continue; + if (!q->dq_dqb.dqb_isoftlimit && !q->dq_dqb.dqb_ihardlimit + && !q->dq_dqb.dqb_bsoftlimit && !q->dq_dqb.dqb_bhardlimit) { + if (!(flags & FL_VERBOSE)) + continue; + } else { + unlimited = 0; + } msgi = NULL; if (q->dq_dqb.dqb_ihardlimit && q->dq_dqb.dqb_curinodes >= q->dq_dqb.dqb_ihardlimit) { msgi = _("File limit reached on"); @@ -267,9 +248,9 @@ else strcpy(timebuf, "0"); } - space2str(toqb(q->dq_dqb.dqb_curspace), numbuf[0], !!(flags & FL_SMARTSIZE)); - space2str(q->dq_dqb.dqb_bsoftlimit, numbuf[1], !!(flags & FL_SMARTSIZE)); - space2str(q->dq_dqb.dqb_bhardlimit, numbuf[2], !!(flags & FL_SMARTSIZE)); + space2str(toqb(q->dq_dqb.dqb_curspace), numbuf[0], spaceunit); + space2str(q->dq_dqb.dqb_bsoftlimit, numbuf[1], spaceunit); + space2str(q->dq_dqb.dqb_bhardlimit, numbuf[2], spaceunit); printf(" %7s%c %6s %7s %7s", numbuf[0], bover ? '*' : ' ', numbuf[1], numbuf[2], timebuf); @@ -285,16 +266,16 @@ else strcpy(timebuf, "0"); } - number2str(q->dq_dqb.dqb_curinodes, numbuf[0], !!(flags & FL_SMARTSIZE)); - number2str(q->dq_dqb.dqb_isoftlimit, numbuf[1], !!(flags & FL_SMARTSIZE)); - number2str(q->dq_dqb.dqb_ihardlimit, numbuf[2], !!(flags & FL_SMARTSIZE)); + number2str(q->dq_dqb.dqb_curinodes, numbuf[0], inodeunit); + number2str(q->dq_dqb.dqb_isoftlimit, numbuf[1], inodeunit); + number2str(q->dq_dqb.dqb_ihardlimit, numbuf[2], inodeunit); printf(" %7s%c %6s %7s %7s\n", numbuf[0], iover ? '*' : ' ', numbuf[1], numbuf[2], timebuf); continue; } } if (!(flags & FL_QUIET) && !lines && qlist) - heading(type, id, name, _("none")); + heading(type, id, name, unlimited ? _("none") : _("no limited resources used")); freeprivs(qlist); out_handles: dispose_handle_list(handles); @@ -314,7 +295,7 @@ { "project", 0, NULL, 'P' }, { "quiet", 0, NULL, 'q' }, { "verbose", 0, NULL, 'v' }, - { "human-readable", 0, NULL, 's' }, + { "human-readable", 2, NULL, 's' }, { "always-resolve", 0, NULL, 256 }, { "raw-grace", 0, NULL, 'p' }, { "local-only", 0, NULL, 'l' }, @@ -334,7 +315,7 @@ progname = basename(argv[0]); flags |= FL_SHOW_DEVICE; - while ((ret = getopt_long(argc, argv, "hguqvsPVliQF:wfApm", long_opts, NULL)) != -1) { + while ((ret = getopt_long(argc, argv, "hguqvs::PVliQF:wfApm", long_opts, NULL)) != -1) { switch (ret) { case 'g': flags |= FL_GROUP; @@ -356,7 +337,11 @@ exit(1); break; case 's': - flags |= FL_SMARTSIZE; + inodeunit = spaceunit = S2S_AUTO; + if (optarg) { + if (unitopt2unit(optarg, &spaceunit, &inodeunit) < 0) + die(1, _("Bad output format units for human readable output: %s\n"), optarg); + } break; case 'p': flags |= FL_RAWGRACE; diff -Nru quota-4.04/quotacheck.c quota-4.05/quotacheck.c --- quota-4.04/quotacheck.c 2017-09-05 14:03:59.000000000 +0000 +++ quota-4.05/quotacheck.c 2019-03-29 10:39:28.000000000 +0000 @@ -538,6 +538,7 @@ if ((lstat(de->d_name, &st)) == -1) { errstr(_("lstat: Cannot stat `%s/%s': %s\nGuess you'd better run fsck first !\nexiting...\n"), pathname, de->d_name, strerror(errno)); + closedir(dp); goto out; } @@ -924,6 +925,7 @@ struct stat st; int remounted = 0; int failed = 0; + int ret; if (lstat(mnt->me_dir, &st) < 0) die(2, _("Cannot stat mountpoint %s: %s\n"), mnt->me_dir, strerror(errno)); @@ -939,14 +941,22 @@ */ if (cfmt == QF_XFS) goto start_scan; - if (ucheck) - if (process_file(mnt, USRQUOTA) < 0) + if (ucheck) { + ret = process_file(mnt, USRQUOTA); + if (ret < 0) { + failed |= ret; ucheck = 0; - if (gcheck) - if (process_file(mnt, GRPQUOTA) < 0) + } + } + if (gcheck) { + ret = process_file(mnt, GRPQUOTA); + if (ret < 0) { + failed |= ret; gcheck = 0; + } + } if (!ucheck && !gcheck) /* Nothing to check? */ - return 0; + return failed; if (!(flags & FL_NOREMOUNT)) { /* Now we try to remount fs read-only to prevent races when scanning filesystem */ if (mount @@ -978,8 +988,11 @@ !strcmp(mnt->me_type, MNTTYPE_EXT3) || !strcmp(mnt->me_type, MNTTYPE_NEXT3) || !strcmp(mnt->me_type, MNTTYPE_EXT4)) { - if ((failed = ext2_direct_scan(mnt->me_devname)) < 0) + ret = ext2_direct_scan(mnt->me_devname); + if (ret < 0) { + failed |= ret; goto out; + } } else { #else @@ -987,8 +1000,11 @@ #endif if (flags & FL_VERYVERBOSE) putchar('\n'); - if ((failed = scan_dir(mnt->me_dir)) < 0) + ret = scan_dir(mnt->me_dir); + if (ret < 0) { + failed |= ret; goto out; + } } dirs_done++; if (flags & FL_VERBOSE || flags & FL_DEBUG) @@ -1027,7 +1043,8 @@ int fmt; if (strcmp(mnt->me_type, MNTTYPE_XFS) == 0 || - strcmp(mnt->me_type, MNTTYPE_GFS2) == 0) + strcmp(mnt->me_type, MNTTYPE_GFS2) == 0 || + strcmp(mnt->me_type, MNTTYPE_EXFS) == 0) return QF_XFS; if (type == USRQUOTA) { @@ -1101,7 +1118,7 @@ { /* We never check XFS, NFS, and filesystems supporting VFS metaformat */ if (!strcmp(fstype, MNTTYPE_XFS) || nfs_fstype(fstype) || - meta_qf_fstype(fstype)) + meta_qf_fstype(fstype) || !strcmp(fstype, MNTTYPE_EXFS)) return 0; /* In all other cases we can pick a format... */ if (fmt == -1) diff -Nru quota-4.04/quotacheck_v2.c quota-4.05/quotacheck_v2.c --- quota-4.04/quotacheck_v2.c 2016-07-06 09:09:19.000000000 +0000 +++ quota-4.05/quotacheck_v2.c 2018-02-05 15:27:01.000000000 +0000 @@ -357,13 +357,17 @@ le32toh(head.dqh_version) > known_versions[type]) { errstr(_("WARNING - Quota file %s has corrupted headers\n"), filename); + if (!(flags & FL_INTERACTIVE) || + !ask_yn(_("Continue checking assuming format from command line?"), 0)) + return -1; } if (le32toh(head.dqh_version) != version) { errstr(_("Quota file format version %d does not match the one " "specified on command line (%d). Quota file header " "may be corrupted.\n"), le32toh(head.dqh_version), version); - if (!ask_yn(_("Continue checking assuming version from command line?"), 1)) + if (!(flags & FL_INTERACTIVE) || + !ask_yn(_("Continue checking assuming version from command line?"), 1)) return -1; detected_versions[type] = version; } else diff -Nru quota-4.04/quota.h quota-4.05/quota.h --- quota-4.04/quota.h 2016-03-31 08:30:11.000000000 +0000 +++ quota-4.05/quota.h 2019-03-29 10:39:33.000000000 +0000 @@ -1,6 +1,7 @@ #ifndef GUARD_QUOTA_H #define GUARD_QUOTA_H +#include #include #include diff -Nru quota-4.04/quotaio.c quota-4.05/quotaio.c --- quota-4.04/quotaio.c 2013-12-12 19:32:58.000000000 +0000 +++ quota-4.05/quotaio.c 2018-05-09 14:50:25.000000000 +0000 @@ -79,7 +79,8 @@ } if (!strcmp(mnt->me_type, MNTTYPE_XFS) || /* XFS filesystem? */ - !strcmp(mnt->me_type, MNTTYPE_GFS2)) { /* XFS filesystem? */ + !strcmp(mnt->me_type, MNTTYPE_GFS2) || /* XFS filesystem? */ + !strcmp(mnt->me_type, MNTTYPE_EXFS)) { /* EXFS filesystem? */ if (fmt != -1 && fmt != QF_XFS) { /* User wanted some other format? */ errstr(_("Only XFS quota format is allowed on XFS filesystem.\n")); goto out_handle; diff -Nru quota-4.04/quotaio_generic.c quota-4.05/quotaio_generic.c --- quota-4.04/quotaio_generic.c 2016-03-31 08:30:11.000000000 +0000 +++ quota-4.05/quotaio_generic.c 2018-01-10 09:23:01.000000000 +0000 @@ -204,6 +204,11 @@ if (ret < 0) break; id = kdqblk.dqb_id + 1; + /* id -1 is invalid and the last one... */ + if (id == -1) { + errno = ENOENT; + break; + } } free(dquot); diff -Nru quota-4.04/quotaio_rpc.c quota-4.05/quotaio_rpc.c --- quota-4.04/quotaio_rpc.c 2013-03-27 07:38:47.000000000 +0000 +++ quota-4.05/quotaio_rpc.c 2018-05-28 16:08:21.000000000 +0000 @@ -33,7 +33,8 @@ #ifdef RPC h->qh_info.dqi_max_b_limit = ~(uint32_t)0; h->qh_info.dqi_max_i_limit = ~(uint32_t)0; - h->qh_info.dqi_max_b_usage = (~(uint32_t)0) << QUOTABLOCK_BITS; + h->qh_info.dqi_max_b_usage = ((uint64_t)(~(uint32_t)0)) + << QUOTABLOCK_BITS; h->qh_info.dqi_max_i_usage = ~(uint32_t)0; return 0; #else diff -Nru quota-4.04/quotaio_v1.c quota-4.05/quotaio_v1.c --- quota-4.04/quotaio_v1.c 2013-03-27 07:38:47.000000000 +0000 +++ quota-4.05/quotaio_v1.c 2019-03-29 10:39:28.000000000 +0000 @@ -1,35 +1,5 @@ /* - * Copyright (c) 1980, 1990 Regents of the University of California. All - * rights reserved. - * - * This code is derived from software contributed to Berkeley by Robert Elz at - * The University of Melbourne. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. 2. - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. 3. All advertising - * materials mentioning features or use of this software must display the - * following acknowledgement: This product includes software developed by the - * University of California, Berkeley and its contributors. 4. Neither the - * name of the University nor the names of its contributors may be used to - * endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * Functions for handling old quota format with sparse quota file */ #include "config.h" diff -Nru quota-4.04/quotaio_xfs.c quota-4.05/quotaio_xfs.c --- quota-4.04/quotaio_xfs.c 2016-03-31 08:30:11.000000000 +0000 +++ quota-4.05/quotaio_xfs.c 2018-01-10 09:18:11.000000000 +0000 @@ -219,6 +219,11 @@ if (ret < 0) break; id = xdqblk.d_id + 1; + /* id -1 is invalid and the last one... */ + if (id == -1) { + errno = ENOENT; + break; + } } free(dquot); diff -Nru quota-4.04/quota_nld.c quota-4.05/quota_nld.c --- quota-4.04/quota_nld.c 2015-12-16 17:09:16.000000000 +0000 +++ quota-4.05/quota_nld.c 2019-03-29 10:39:28.000000000 +0000 @@ -262,6 +262,8 @@ warn->warntype == QUOTA_NL_BSOFTBELOW) && !(flags & FL_PRINTBELOW)) return; uid2user(warn->caused_id, user); + if (strlen(user) > UT_NAMESIZE) + goto skip_utmp; strcpy(dev, "/dev/"); setutent(); @@ -270,7 +272,7 @@ if (uent->ut_type != USER_PROCESS) continue; /* Entry for a different user? */ - if (strcmp(user, uent->ut_user)) + if (strncmp(user, uent->ut_user, UT_NAMESIZE)) continue; sstrncpy(dev+5, uent->ut_line, PATH_MAX-5); if (stat(dev, &st) < 0) @@ -281,6 +283,7 @@ } } if (!max_atime) { +skip_utmp: /* * This can happen quite easily so don't spam syslog with * the error @@ -482,7 +485,10 @@ dhandle = init_dbus(); if (!(flags & FL_NODAEMON)) { use_syslog(); - daemon(0, 0); + if (daemon(0, 0)) { + errstr(_("Failed to daemonize: %s\n"), strerror(errno)); + exit(1); + }; use_pid_file(); } run(nsock); diff -Nru quota-4.04/quotaon.c quota-4.05/quotaon.c --- quota-4.04/quotaon.c 2016-07-12 12:16:48.000000000 +0000 +++ quota-4.05/quotaon.c 2019-03-29 10:39:28.000000000 +0000 @@ -1,35 +1,5 @@ /* - * Copyright (c) 1980, 1990 Regents of the University of California. All - * rights reserved. - * - * This code is derived from software contributed to Berkeley by Robert Elz at - * The University of Melbourne. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. 2. - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. 3. All advertising - * materials mentioning features or use of this software must display the - * following acknowledgement: This product includes software developed by the - * University of California, Berkeley and its contributors. 4. Neither the - * name of the University nor the names of its contributors may be used to - * endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * Utility for turning quotas on and off and reporting their state. */ #include "config.h" @@ -282,7 +252,8 @@ if (!strcmp(mnt->me_type, MNTTYPE_GFS2)) { errstr(_("Cannot change state of GFS2 quota.\n")); return 1; - } else if (!strcmp(mnt->me_type, MNTTYPE_XFS)) { /* XFS filesystem has special handling... */ + } else if (!strcmp(mnt->me_type, MNTTYPE_XFS) || + !strcmp(mnt->me_type, MNTTYPE_EXFS)) { /* XFS filesystem has special handling... */ if (!kern_qfmt_supp(QF_XFS)) { errstr(_("Cannot change state of XFS quota. It's not compiled in kernel.\n")); return 1; @@ -337,7 +308,8 @@ if (kern_qfmt_supp(QF_XFS)) { on = kern_quota_state_xfs(mnt->me_devname, type); if (!strcmp(mnt->me_type, MNTTYPE_XFS) || - !strcmp(mnt->me_type, MNTTYPE_GFS2) || on >= 0) { + !strcmp(mnt->me_type, MNTTYPE_GFS2) || on >= 0 || + !strcmp(mnt->me_type, MNTTYPE_EXFS)) { if (on < 0) on = 0; if (!(flags & FL_VERBOSE)) diff -Nru quota-4.04/quotaops.c quota-4.05/quotaops.c --- quota-4.04/quotaops.c 2017-09-05 14:03:59.000000000 +0000 +++ quota-4.05/quotaops.c 2019-03-29 10:39:28.000000000 +0000 @@ -1,35 +1,5 @@ /* - * Copyright (c) 1980, 1990 Regents of the University of California. All - * rights reserved. - * - * This code is derived from software contributed to Berkeley by Robert Elz at - * The University of Melbourne. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. 2. - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. 3. All advertising - * materials mentioning features or use of this software must display the - * following acknowledgement: This product includes software developed by the - * University of California, Berkeley and its contributors. 4. Neither the - * name of the University nor the names of its contributors may be used to - * endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * Helper functions to handle lists of quota structures */ #include "config.h" diff -Nru quota-4.04/quotasys.c quota-4.05/quotasys.c --- quota-4.04/quotasys.c 2016-07-12 14:13:28.000000000 +0000 +++ quota-4.05/quotasys.c 2018-05-09 14:50:25.000000000 +0000 @@ -18,8 +18,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -532,30 +532,39 @@ /* * Convert number in quota blocks to some nice short form for printing */ -void space2str(qsize_t space, char *buf, int format) +void space2str(qsize_t space, char *buf, enum s2s_unit format) { int i; - char suffix[8] = " MGT"; - qsize_t aspace = space >= 0 ? space : -space; + char suffix[8] = "KMGT"; + qsize_t aspace; + int sign = 1; + long long unit; + + aspace = space = qb2kb(space); + if (format == S2S_NONE) { + sprintf(buf, "%lld", (long long)space); + return; + } + if (aspace < 0) { + aspace = -space; + sign = -1; + } + if (format == S2S_AUTO) { + for (i = 3; i >= 0; i--) { + unit = 1LL << (QUOTABLOCK_BITS*i); - space = qb2kb(space); - if (format) { - for (i = 3; i > 0; i--) { - long long unit = 1LL << (QUOTABLOCK_BITS*i); - - if (aspace >= unit * 100) { - int sign = aspace != space ? -1 : 1; - - sprintf(buf, "%lld%c", (long long) - DIV_ROUND_UP(aspace, unit) * sign, - suffix[i]); - return; - } + if (aspace >= unit * 100) + goto print; } - sprintf(buf, "%lldK", (long long)space); - return; + unit = 1; + i = 0; + } else { + i = format - S2S_KB; + unit = 1LL << (QUOTABLOCK_BITS*i); } - sprintf(buf, "%lld", (long long)space); +print: + sprintf(buf, "%lld%c", (long long)DIV_ROUND_UP(aspace, unit) * sign, + suffix[i]); } /* @@ -593,25 +602,38 @@ /* * Convert number to some nice short form for printing */ -void number2str(long long num, char *buf, int format) +void number2str(long long num, char *buf, enum s2s_unit format) { int i; - unsigned long long div; + unsigned long long div;; char suffix[8] = " kmgt"; + long long anum = num; + int sign = 1; - if (format) { - long long anum = num >= 0 ? num : -num; - int sign = num != anum ? -1 : 1; + if (format == S2S_NONE) { + sprintf(buf, "%lld", num); + return; + } + if (num < 0) { + anum = -num; + sign = -1; + } + if (format == S2S_AUTO) { for (i = 4, div = 1000000000000LL; i > 0; i--, div /= 1000) - if (anum >= 100*div) { - sprintf(buf, "%lld%c", - DIV_ROUND_UP(anum, div) * sign, - suffix[i]); - return; - } + if (anum >= 100*div) + break; + } else { + div = 1; + for (i = 0; i < format - S2S_NONE; i++) + div *= 1000; + } + if (suffix[i] != ' ') { + sprintf(buf, "%lld%c", DIV_ROUND_UP(anum, div) * sign, + suffix[i]); + } else { + sprintf(buf, "%lld", DIV_ROUND_UP(anum, div) * sign); } - sprintf(buf, "%lld", num); } /* @@ -759,7 +781,8 @@ static int hasquota(const char *dev, struct mntent *mnt, int type, int flags) { if (!strcmp(mnt->mnt_type, MNTTYPE_GFS2) || - !strcmp(mnt->mnt_type, MNTTYPE_XFS)) + !strcmp(mnt->mnt_type, MNTTYPE_XFS) || + !strcmp(mnt->mnt_type, MNTTYPE_EXFS)) return hasxfsquota(dev, mnt, type, flags); if (!strcmp(mnt->mnt_type, MNTTYPE_OCFS2)) return hasvfsmetaquota(dev, mnt, type, flags); @@ -769,7 +792,7 @@ * standard GETFMT quotactl because that does not distinguish between * quota in system file and quota in ordinary file. */ - if (!strcmp(mnt->mnt_type, MNTTYPE_EXT4)) { + if (!strcmp(mnt->mnt_type, MNTTYPE_EXT4) || !strcmp(mnt->mnt_type, MNTTYPE_F2FS)) { struct if_dqinfo kinfo; if (quotactl(QCMD(Q_GETINFO, type), dev, 0, (void *)&kinfo) == 0) { @@ -931,12 +954,14 @@ break; case QF_XFS: if (!strcmp(mnt->me_type, MNTTYPE_XFS) || - !strcmp(mnt->me_type, MNTTYPE_GFS2)) + !strcmp(mnt->me_type, MNTTYPE_GFS2) || + !strcmp(mnt->me_type, MNTTYPE_EXFS)) goto add_entry; break; default: if (strcmp(mnt->me_type, MNTTYPE_XFS) && strcmp(mnt->me_type, MNTTYPE_GFS2) && + strcmp(mnt->me_type, MNTTYPE_EXFS) && !nfs_fstype(mnt->me_type)) goto add_entry; break; @@ -1037,7 +1062,8 @@ else { struct v2_dqstats v2_stats; - if (!stat("/proc/fs/xfs/stat", &st)) + if (!stat("/proc/fs/xfs/stat", &st) || + !stat("/proc/fs/exfs/stat", &st)) kernel_qfmt[kernel_qfmt_num++] = QF_XFS; else { fs_quota_stat_t dummy; diff -Nru quota-4.04/quotasys.h quota-4.05/quotasys.h --- quota-4.04/quotasys.h 2016-07-12 11:57:45.000000000 +0000 +++ quota-4.05/quotasys.h 2018-01-10 08:22:56.000000000 +0000 @@ -11,6 +11,7 @@ #include #include "mntopt.h" #include "quota.h" +#include "common.h" #define MAXNAMELEN 64 /* Maximal length of user/group name */ #define MAXTIMELEN 40 /* Maximal length of time string */ @@ -129,13 +130,13 @@ int str2timeunits(time_t, char *, time_t *); /* Convert number in quota blocks to short printable form */ -void space2str(qsize_t, char *, int); +void space2str(qsize_t, char *, enum s2s_unit); /* Convert block number with unit from string to quota blocks */ const char *str2space(const char *string, qsize_t *space); /* Convert number to short printable form */ -void number2str(long long, char *, int); +void number2str(long long, char *, enum s2s_unit); /* Convert inode number with unit from string to quota inodes. */ const char *str2number(const char *string, qsize_t *inodes); diff -Nru quota-4.04/quot.c quota-4.05/quot.c --- quota-4.04/quot.c 2013-03-27 07:38:47.000000000 +0000 +++ quota-4.05/quot.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,388 +0,0 @@ -/* - * Copyright (c) 1980, 1990 Regents of the University of California. - * Copyright (C) 2000, 2001 Silicon Graphics, Inc. [SGI] - * All rights reserved. - * - * [Extensions to support XFS are copyright SGI] - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. 2. - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. 3. All advertising - * materials mentioning features or use of this software must display the - * following acknowledgement: This product includes software developed by the - * University of California, Berkeley and its contributors. 4. Neither the - * name of the University nor the names of its contributors may be used to - * endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include "config.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "pot.h" -#include "quot.h" -#include "common.h" -#include "mntopt.h" -#include "bylabel.h" -#include "quotasys.h" - -#define TSIZE 500 -static __uint64_t sizes[TSIZE]; -static __uint64_t overflow; - -static int aflag; -static int cflag; -static int fflag; -static int gflag; -static int uflag; -static int vflag; -static int iflag; -static int qflag; -static int Tflag; -static time_t now; -char *progname; - -static void mounttable(void); -static char *idname(__uint32_t, int); -static void report(const char *, const char *, int); -static void creport(const char *, const char *); - -static void usage(void) -{ - errstr(_("Usage: %s [-acfugvViTq] [filesystem...]\n"), progname); - exit(1); -} - -int main(int argc, char **argv) -{ - int c; - - now = time(0); - progname = basename(argv[0]); - - while ((c = getopt(argc, argv, "acfguvVTq")) != -1) { - switch (c) { - case 'a': - aflag++; - break; - case 'c': - cflag++; - break; - case 'f': - fflag++; - break; - case 'g': - gflag++; - break; - case 'u': - uflag++; - break; - case 'v': - vflag++; - break; - case 'i': - iflag++; - break; - case 'q': - qflag++; - break; - case 'T': - Tflag++; - break; - case 'V': - version(); - exit(0); - default: - usage(); - } - } - if ((aflag && optind != argc) || (!aflag && optind == argc)) - usage(); - if (!uflag && !gflag) - uflag++; - if (init_mounts_scan(aflag ? 0 : argc - optind, argv + optind, (iflag ? MS_NO_AUTOFS : 0)) < 0) - return 1; - mounttable(); - end_mounts_scan(); - return 0; -} - -static void mounttable(void) -{ - int doit = 0; - struct mount_entry *mntp; - - while ((mntp = get_next_mount())) { - /* Currently, only XFS is implemented... */ - if (strcmp(mntp->me_type, MNTTYPE_XFS) == 0) { - checkXFS(mntp->me_devname, mntp->me_dir); - doit = 1; - } - /* ...additional filesystems types here. */ - - if (doit) { - if (cflag) creport(mntp->me_devname, mntp->me_dir); - if (!cflag && uflag) report(mntp->me_devname, mntp->me_dir, 0); - if (!cflag && gflag) report(mntp->me_devname, mntp->me_dir, 1); - } - } -} - -static int qcmp(du_t * p1, du_t * p2) -{ - if (p1->blocks > p2->blocks) - return -1; - if (p1->blocks < p2->blocks) - return 1; - if (p1->id > p2->id) - return 1; - else if (p1->id < p2->id) - return -1; - return 0; -} - -static void creport(const char *file, const char *fsdir) -{ - int i; - __uint64_t t = 0; - - printf(_("%s (%s):\n"), file, fsdir); - for (i = 0; i < TSIZE - 1; i++) - if (sizes[i] > 0) { - t += sizes[i] * i; - printf(_("%d\t%llu\t%llu\n"), i, - (unsigned long long) sizes[i], - (unsigned long long) t); - } - printf(_("%d\t%llu\t%llu\n"), TSIZE - 1, - (unsigned long long) sizes[TSIZE - 1], - (unsigned long long) (overflow + t)); -} - -static void report(const char *file, const char *fsdir, int type) -{ - du_t *dp; - - printf(_("%s (%s) %ss:\n"), file, fsdir, _(type2name(type))); - if (!qflag) - qsort(du[type], ndu[type], sizeof(du[type][0]), (int (*)(const void *, const void *))qcmp); - for (dp = du[type]; dp < &du[type][ndu[type]]; dp++) { - char *cp; - - if (dp->blocks == 0) - return; - printf(_("%8llu "), (unsigned long long) dp->blocks); - if (fflag) - printf(_("%8llu "), (unsigned long long) dp->nfiles); - if ((cp = idname(dp->id, type)) != NULL) { - if (Tflag) - printf(_("%s"), cp); - else - printf(_("%-8.8s"), cp); - } else - printf(_("#%-7d"), dp->id); - if (vflag) - printf(_(" %8llu %8llu %8llu"), - (unsigned long long) dp->blocks30, - (unsigned long long) dp->blocks60, - (unsigned long long) dp->blocks90); - putchar('\n'); - } -} - -static idcache_t *getnextent(int type, __uint32_t id, int byid) -{ - struct passwd *pw; - struct group *gr; - static idcache_t idc; - - if (type) { /* /etc/group */ - if ((gr = byid? getgrgid(id) : getgrent()) == NULL) - return NULL; - idc.id = gr->gr_gid; - strncpy(idc.name, gr->gr_name, UT_NAMESIZE); - return &idc; - } - /* /etc/passwd */ - if ((pw = byid? getpwuid(id) : getpwent()) == NULL) - return NULL; - idc.id = pw->pw_uid; - strncpy(idc.name, pw->pw_name, UT_NAMESIZE); - return &idc; -} - -static char *idname(__uint32_t id, int type) -{ - idcache_t *ncp, *idp; - static idcache_t nc[2][NID]; - static int entriesleft[2] = { NID, NID }; - - /* check cache for name first */ - ncp = &nc[type][id & IDMASK]; - if (ncp->id == id && ncp->name[0]) - return ncp->name; - if (entriesleft[type]) { - /* - * If we haven't gone through the passwd/group file - * then fill the cache while seaching for name. - * This lets us run through passwd/group serially. - */ - if (entriesleft[type] == NID) - type? setgrent() : setpwent(); - while (((idp = getnextent(type, id, 0)) != NULL) && entriesleft[type]) { - entriesleft[type]--; - ncp = &nc[type][idp->id & IDMASK]; - if (ncp->name[0] == '\0' || idp->id == id) - memcpy(ncp, idp, sizeof(idcache_t)); - if (idp->id == id) - return ncp->name; - } - type? endgrent() : endpwent(); - entriesleft[type] = 0; - ncp = &nc[type][id & IDMASK]; - } - - /* Not cached - do it the slow way & insert into cache */ - if ((idp = getnextent(type, id, 1)) == NULL) - return NULL; - memcpy(ncp, idp, sizeof(idcache_t)); - return ncp->name; -} - -/* - * === XFS specific code follows === - */ - -static void acctXFS(xfs_bstat_t *p) -{ - register du_t *dp; - du_t **hp; - __uint64_t size; - __uint32_t i, id; - - if ((p->bs_mode & S_IFMT) == 0) - return; - size = howmany((p->bs_blocks * p->bs_blksize), 0x400ULL); - - if (cflag) { - if (!(S_ISDIR(p->bs_mode) || S_ISREG(p->bs_mode))) - return; - if (size >= TSIZE) { - overflow += size; - size = TSIZE - 1; - } - sizes[(int)size]++; - return; - } - for (i = 0; i < 2; i++) { - id = (i == 0)? p->bs_uid : p->bs_gid; - hp = &duhash[i][id % DUHASH]; - for (dp = *hp; dp; dp = dp->next) - if (dp->id == id) - break; - if (dp == 0) { - if (ndu[i] >= NDU) - return; - dp = &du[i][(ndu[i]++)]; - dp->next = *hp; - *hp = dp; - dp->id = id; - dp->nfiles = 0; - dp->blocks = 0; - dp->blocks30 = 0; - dp->blocks60 = 0; - dp->blocks90 = 0; - } - dp->blocks += size; - - if (now - p->bs_atime.tv_sec > 30 * SEC24HR) - dp->blocks30 += size; - if (now - p->bs_atime.tv_sec > 60 * SEC24HR) - dp->blocks60 += size; - if (now - p->bs_atime.tv_sec > 90 * SEC24HR) - dp->blocks90 += size; - dp->nfiles++; - } -} - -static void checkXFS(const char *file, const char *fsdir) -{ - xfs_fsop_bulkreq_t bulkreq; - __u64 last = 0; - __s32 count; - int i; - int sts; - int fsfd; - du_t **dp; - xfs_bstat_t *buf; - - /* - * Initialize tables between checks; because of the qsort - * in report() the hash tables must be rebuilt each time. - */ - for (sts = 0; sts < TSIZE; sts++) - sizes[sts] = 0; - overflow = 0; - for (i = 0; i < 2; i++) - for (dp = duhash[i]; dp < &duhash[i][DUHASH]; dp++) - *dp = 0; - ndu[0] = ndu[1] = 0; - - fsfd = open(fsdir, O_RDONLY); - if (fsfd < 0) { - errstr(_("cannot open %s: %s\n"), fsdir, strerror(errno)); - exit(1); - } - sync(); - - buf = (xfs_bstat_t *) smalloc(NBSTAT * sizeof(xfs_bstat_t)); - memset(buf, 0, NBSTAT * sizeof(xfs_bstat_t)); - - bulkreq.lastip = &last; - bulkreq.icount = NBSTAT; - bulkreq.ubuffer = buf; - bulkreq.ocount = &count; - - while ((sts = ioctl(fsfd, XFS_IOC_FSBULKSTAT, &bulkreq)) == 0) { - if (count == 0) - break; - for (i = 0; i < count; i++) - acctXFS(&buf[i]); - } - if (sts < 0) { - errstr(_("XFS_IOC_FSBULKSTAT ioctl failed: %s\n"), - strerror(errno)); - exit(1); - } - free(buf); - close(fsfd); -} diff -Nru quota-4.04/quot.h quota-4.05/quot.h --- quota-4.04/quot.h 2013-03-27 07:38:47.000000000 +0000 +++ quota-4.05/quot.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,113 +0,0 @@ -/* - * Copyright (c) 1980, 1990 Regents of the University of California. - * Copyright (C) 2000, 2001 Silicon Graphics, Inc. [SGI] - * All rights reserved. - * - * [Extensions to support XFS are copyright SGI] - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. 2. - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. 3. All advertising - * materials mentioning features or use of this software must display the - * following acknowledgement: This product includes software developed by the - * University of California, Berkeley and its contributors. 4. Neither the - * name of the University nor the names of its contributors may be used to - * endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#define SEC24HR (60*60*24) /* seconds per day */ - -typedef struct { - __uint32_t id; - char name[UT_NAMESIZE + 1]; -} idcache_t; - -typedef struct du { - struct du *next; - __uint64_t blocks; - __uint64_t blocks30; - __uint64_t blocks60; - __uint64_t blocks90; - __uint64_t nfiles; - __uint32_t id; -} du_t; - -#define NDU 60000 -#define DUHASH 8209 -static du_t du[2][NDU]; -static du_t *duhash[2][DUHASH]; -static int ndu[2]; - -#define NID 256 -#define IDMASK (NID-1) - -/* - * === Start XFS specific types and definitions === - */ -#include - -/* Structures returned from ioctl XFS_IOC_FSBULKSTAT */ -typedef struct xfs_bstime { - time_t tv_sec; /* seconds */ - __s32 tv_nsec; /* and nanoseconds */ -} xfs_bstime_t; - -typedef struct xfs_bstat { - __u64 bs_ino; /* inode number */ - __u16 bs_mode; /* type and mode */ - __u16 bs_nlink; /* number of links */ - __u32 bs_uid; /* user id */ - __u32 bs_gid; /* group id */ - __u32 bs_rdev; /* device value */ - __s32 bs_blksize; /* block size */ - __s64 bs_size; /* file size */ - xfs_bstime_t bs_atime; /* access time */ - xfs_bstime_t bs_mtime; /* modify time */ - xfs_bstime_t bs_ctime; /* inode change time */ - int64_t bs_blocks; /* number of blocks */ - __u32 bs_xflags; /* extended flags */ - __s32 bs_extsize; /* extent size */ - __s32 bs_extents; /* number of extents */ - __u32 bs_gen; /* generation count */ - __u16 bs_projid; /* project id */ - unsigned char bs_pad[14]; /* pad space, unused */ - __u32 bs_dmevmask; /* DMIG event mask */ - __u16 bs_dmstate; /* DMIG state info */ - __u16 bs_aextents; /* attribute number of extents */ -} xfs_bstat_t; - -/* The user-level BulkStat Request interface structure. */ -typedef struct xfs_fsop_bulkreq { - __u64 *lastip; /* last inode # pointer */ - __s32 icount; /* count of entries in buffer */ - void *ubuffer; /* user buffer for inode desc. */ - __s32 *ocount; /* output count pointer */ -} xfs_fsop_bulkreq_t; - -#ifndef XFS_IOC_FSBULKSTAT -#define XFS_IOC_FSBULKSTAT _IOWR('X', 101, struct xfs_fsop_bulkreq) -#endif - -#define NBSTAT 4069 /* XFS bulkstat inodes */ -static void checkXFS(const char *file, const char *fsdir); - -/* - * === End of XFS specific types and definitions === - */ diff -Nru quota-4.04/repquota.8 quota-4.05/repquota.8 --- quota-4.04/repquota.8 2016-03-31 08:30:11.000000000 +0000 +++ quota-4.05/repquota.8 2018-01-10 08:48:43.000000000 +0000 @@ -98,9 +98,15 @@ .B -n, --no-names Don't resolve UIDs/GIDs to names. This can speedup printing a lot. .TP -.B -s, --human-readable -Try to report used space, number of used inodes and limits in more appropriate units -than the default ones. +.B -s, --human-readable[=\f2units\f1] +Try to report used space, number of used inodes and limits in more appropriate +units than the default ones. Units can be also specified explicitely by an +optional argument in format [ +.BR kgt +],[ +.BR kgt +] where the first character specifies space units and the second character +specifies inode units. .TP .B -p, --raw-grace When user is in grace period, report time in seconds since epoch when his grace diff -Nru quota-4.04/repquota.c quota-4.05/repquota.c --- quota-4.04/repquota.c 2016-04-04 09:31:02.000000000 +0000 +++ quota-4.05/repquota.c 2018-01-10 08:34:59.000000000 +0000 @@ -32,7 +32,6 @@ #define FL_VERBOSE 4 #define FL_ALL 8 /* Dump quota files on all filesystems */ #define FL_TRUNCNAMES 16 /* Truncate names to fit into the screen */ -#define FL_SHORTNUMS 32 /* Try to print space in appropriate units */ #define FL_NONAME 64 /* Don't translate ids to names */ #define FL_NOCACHE 128 /* Don't cache dquots before resolving */ #define FL_NOAUTOFS 256 /* Ignore autofs mountpoints */ @@ -44,27 +43,33 @@ static int mntcnt; static int cached_dquots; static struct dquot dquot_cache[MAX_CACHE_DQUOTS]; +static enum s2s_unit spaceunit = S2S_NONE, inodeunit = S2S_NONE; char *progname; static void usage(void) { errstr(_("Utility for reporting quotas.\nUsage:\n%s [-vugsi] [-c|C] [-t|n] [-F quotaformat] [-O (default | xml | csv)] (-a | mntpoint)\n\n\ --v, --verbose display also users/groups without any usage\n\ --u, --user display information about users\n\ --g, --group display information about groups\n\ --P, --project display information about projects\n\ --s, --human-readable show numbers in human friendly units (MB, GB, ...)\n\ --t, --truncate-names truncate names to 9 characters\n\ --p, --raw-grace print grace time in seconds since epoch\n\ --n, --no-names do not translate uid/gid to name\n\ --i, --no-autofs avoid autofs mountpoints\n\ --c, --cache translate big number of ids at once\n\ --C, --no-cache translate ids one by one\n\ --F, --format=formatname report information for specific format\n\ --O, --output=format format output as xml or csv\n\ --a, --all report information for all mount points with quotas\n\ --h, --help display this help message and exit\n\ --V, --version display version information and exit\n\n"), progname); +-v, --verbose display also users/groups without any usage\n\ +-u, --user display information about users\n\ +-g, --group display information about groups\n\ +-P, --project display information about projects\n\ +-s, --human-readable[=units] display numbers in human friendly units (MB, GB,\n\ + ...). Units can be also specified explicitely by\n\ + an optional argument in format [kgt],[kgt] where\n\ + the first character specifies space units and the\n\ + second character specifies inode units\n\ +-t, --truncate-names truncate names to 9 characters\n\ +-p, --raw-grace print grace time in seconds since epoch\n\ +-n, --no-names do not translate uid/gid to name\n\ +-i, --no-autofs avoid autofs mountpoints\n\ +-c, --cache translate big number of ids at once\n\ +-C, --no-cache translate ids one by one\n\ +-F, --format=formatname report information for specific format\n\ +-O, --output=format format output as xml or csv\n\ +-a, --all report information for all mount points with\n\ + quotas\n\ +-h, --help display this help message and exit\n\ +-V, --version display version information and exit\n\n"), progname); fprintf(stderr, _("Bugs to %s\n"), PACKAGE_BUGREPORT); exit(1); } @@ -83,7 +88,7 @@ { "help", 0, NULL, 'h' }, { "truncate-names", 0, NULL, 't' }, { "raw-grace", 0, NULL, 'p' }, - { "human-readable", 0, NULL, 's' }, + { "human-readable", 2, NULL, 's' }, { "no-names", 0, NULL, 'n' }, { "cache", 0, NULL, 'c' }, { "no-cache", 0, NULL, 'C' }, @@ -93,7 +98,7 @@ { NULL, 0, NULL, 0 } }; - while ((ret = getopt_long(argcnt, argstr, "VavugPhtspncCiF:O:", long_opts, NULL)) != -1) { + while ((ret = getopt_long(argcnt, argstr, "VavugPhts::pncCiF:O:", long_opts, NULL)) != -1) { switch (ret) { case '?': case 'h': @@ -123,7 +128,11 @@ flags |= FL_RAWGRACE; break; case 's': - flags |= FL_SHORTNUMS; + inodeunit = spaceunit = S2S_AUTO; + if (optarg) { + if (unitopt2unit(optarg, &spaceunit, &inodeunit) < 0) + die(1, _("Bad output format units for human readable output: %s\n"), optarg); + } break; case 'C': flags |= FL_NOCACHE; @@ -215,9 +224,9 @@ strcpy(time, "0"); else time[0] = 0; - space2str(toqb(entry->dqb_curspace), numbuf[0], flags & FL_SHORTNUMS); - space2str(entry->dqb_bsoftlimit, numbuf[1], flags & FL_SHORTNUMS); - space2str(entry->dqb_bhardlimit, numbuf[2], flags & FL_SHORTNUMS); + space2str(toqb(entry->dqb_curspace), numbuf[0], spaceunit); + space2str(entry->dqb_bsoftlimit, numbuf[1], spaceunit); + space2str(entry->dqb_bhardlimit, numbuf[2], spaceunit); if (ofmt == QOF_DEFAULT) { printf("%-*s %c%c %7s %7s %7s %6s", PRINTNAMELEN, pname, @@ -236,7 +245,7 @@ } else if (ofmt == QOF_XML) { char *spacehdr; - if (flags & FL_SHORTNUMS) + if (spaceunit != S2S_NONE) spacehdr = "space"; else spacehdr = "block"; @@ -264,9 +273,9 @@ strcpy(time, "0"); else time[0] = 0; - number2str(entry->dqb_curinodes, numbuf[0], flags & FL_SHORTNUMS); - number2str(entry->dqb_isoftlimit, numbuf[1], flags & FL_SHORTNUMS); - number2str(entry->dqb_ihardlimit, numbuf[2], flags & FL_SHORTNUMS); + number2str(entry->dqb_curinodes, numbuf[0], inodeunit); + number2str(entry->dqb_isoftlimit, numbuf[1], inodeunit); + number2str(entry->dqb_ihardlimit, numbuf[2], inodeunit); if (ofmt == QOF_DEFAULT) printf(" %7s %5s %5s %6s\n", numbuf[0], numbuf[1], numbuf[2], time); else if (ofmt == QOF_CSV) @@ -378,7 +387,7 @@ time2str(h->qh_info.dqi_igrace, igbuf, TF_ROUND); if (ofmt == QOF_DEFAULT) { - if (flags & FL_SHORTNUMS) + if (spaceunit != S2S_NONE) spacehdr = _("Space"); else spacehdr = _("Block"); @@ -389,7 +398,7 @@ } else if (ofmt == QOF_XML) { printf(" %s\n %s\n", bgbuf, igbuf); } else if (ofmt == QOF_CSV) { - if (flags & FL_SHORTNUMS) + if (spaceunit != S2S_NONE) spacehdr = "Space"; else spacehdr = "Block"; diff -Nru quota-4.04/rquota_server.c quota-4.05/rquota_server.c --- quota-4.04/rquota_server.c 2014-05-01 16:34:36.000000000 +0000 +++ quota-4.05/rquota_server.c 2019-03-29 10:39:33.000000000 +0000 @@ -60,7 +60,7 @@ */ extern struct authunix_parms *unix_cred; -int in_group(gid_t * gids, u_int len, gid_t gid) +int in_group(gid_t * gids, uint32_t len, gid_t gid) { gid_t *gidsp = gids + len; diff -Nru quota-4.04/rquota_svc.c quota-4.05/rquota_svc.c --- quota-4.04/rquota_svc.c 2017-09-05 14:04:16.000000000 +0000 +++ quota-4.05/rquota_svc.c 2019-03-29 10:39:28.000000000 +0000 @@ -533,7 +533,10 @@ if (!(flags & FL_NODAEMON)) { use_syslog(); - daemon(0, 0); + if (daemon(0, 0) < 0) { + errstr(_("Failed to daemonize: %s\n"), strerror(errno)); + exit(1); + } } svc_run(); errstr(_("svc_run returned\n")); diff -Nru quota-4.04/svc_socket.c quota-4.05/svc_socket.c --- quota-4.04/svc_socket.c 2017-09-05 14:04:16.000000000 +0000 +++ quota-4.05/svc_socket.c 2019-03-29 10:42:42.000000000 +0000 @@ -31,13 +31,13 @@ static int get_service_port(u_long number, const char *proto) { - char rpcdata [1024], servdata [1024]; - struct rpcent rpcbuf, *rpcp = NULL; + char servdata [1024]; + struct rpcent *rpcp = NULL; struct servent servbuf, *servp = NULL; int ret; - ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof(rpcdata), &rpcp); - if (ret == 0 && rpcp != NULL) { + rpcp = getrpcbynumber(number); + if (rpcp != NULL) { /* First try name */ ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata, sizeof servdata, &servp); @@ -118,6 +118,15 @@ return -1; } + if (ai->ai_family == AF_INET6) { + if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, + &optval, sizeof(optval)) < 0) { + errstr(_("Cannot set IPv6 socket options: %s\n"), strerror(errno)); + close(fd); + return -1; + } + } + if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)) < 0) { errstr(_("Cannot set socket options: %s\n"), strerror(errno)); close(fd); @@ -129,6 +138,15 @@ close(fd); return -1; } + + if (ai->ai_protocol == IPPROTO_TCP) { + if (listen(fd, SOMAXCONN) < 0) { + errstr(_("Cannot listen to address: %s\n"), strerror(errno)); + close(fd); + return -1; + } + } + return fd; } diff -Nru quota-4.04/warnquota.8 quota-4.05/warnquota.8 --- quota-4.04/warnquota.8 2013-10-29 22:42:08.000000000 +0000 +++ quota-4.05/warnquota.8 2018-01-10 08:50:08.000000000 +0000 @@ -73,9 +73,15 @@ check whether groups are not exceeding quotas. If group is exceeding quota a mail is sent to the user specified in /etc/quotagrpadmins. .TP -.B -s, --human-readable -Try to report used space, number of used inodes and limits in more appropriate units -than the default ones. +.B -s, --human-readable[=\f2units\f1] +Try to report used space, number of used inodes and limits in more appropriate +units than the default ones. Units can be also specified explicitely by an +optional argument in format [ +.BR kgt +],[ +.BR kgt +] where the first character specifies space units and the second character +specifies inode units. .TP .B -i, --no-autofs ignore mountpoints mounted by automounter. diff -Nru quota-4.04/warnquota.c quota-4.05/warnquota.c --- quota-4.04/warnquota.c 2016-03-30 08:15:29.000000000 +0000 +++ quota-4.05/warnquota.c 2019-03-29 10:39:28.000000000 +0000 @@ -86,7 +86,6 @@ #define FL_USER 1 #define FL_GROUP 2 #define FL_NOAUTOFS 4 -#define FL_SHORTNUMS 8 #define FL_NODETAILS 16 struct usage { @@ -157,6 +156,7 @@ static quotatable_t *quotatable; static int adminscnt, adminsalloc; static struct adminstable *adminstable; +static enum s2s_unit spaceunit = S2S_NONE, inodeunit = S2S_NONE; /* * Global pointers to list. @@ -412,7 +412,13 @@ } /* search for the offender_name in ldap */ - snprintf(searchbuf, 256, "(%s=%s)", config->ldap_search_attr, user); + if (256 <= snprintf(searchbuf, 256, "(%s=%s)", config->ldap_search_attr, + user)) { + errstr(_("Could not format LDAP search filter for %s user and " + "%s search attribute due to excessive length.\n"), + user, config->ldap_search_attr); + return NULL; + } ret = ldap_search_ext_s(ldapconn, config->ldap_basedn, LDAP_SCOPE_SUBTREE, searchbuf, NULL, 0, NULL, NULL, NULL, @@ -504,7 +510,7 @@ char *cc_to = lookup_user(config, config->cc_to); if (cc_to) { - fprintf(fp, "Cc: %s\n", config->cc_to); + fprintf(fp, "Cc: %s\n", cc_to); free(cc_to); } } @@ -548,9 +554,9 @@ difftime2str(dqb->dqb_btime, timebuf); else timebuf[0] = '\0'; - space2str(toqb(dqb->dqb_curspace), numbuf[0], flags & FL_SHORTNUMS); - space2str(dqb->dqb_bsoftlimit, numbuf[1], flags & FL_SHORTNUMS); - space2str(dqb->dqb_bhardlimit, numbuf[2], flags & FL_SHORTNUMS); + space2str(toqb(dqb->dqb_curspace), numbuf[0], spaceunit); + space2str(dqb->dqb_bsoftlimit, numbuf[1], spaceunit); + space2str(dqb->dqb_bhardlimit, numbuf[2], spaceunit); fprintf(fp, "%c%c %7s %7s %7s %6s", dqb->dqb_bsoftlimit && toqb(dqb->dqb_curspace) >= dqb->dqb_bsoftlimit ? '+' : '-', dqb->dqb_isoftlimit && dqb->dqb_curinodes >= dqb->dqb_isoftlimit ? '+' : '-', @@ -559,9 +565,9 @@ difftime2str(dqb->dqb_itime, timebuf); else timebuf[0] = '\0'; - number2str(dqb->dqb_curinodes, numbuf[0], flags & FL_SHORTNUMS); - number2str(dqb->dqb_isoftlimit, numbuf[1], flags & FL_SHORTNUMS); - number2str(dqb->dqb_ihardlimit, numbuf[2], flags & FL_SHORTNUMS); + number2str(dqb->dqb_curinodes, numbuf[0], inodeunit); + number2str(dqb->dqb_isoftlimit, numbuf[1], inodeunit); + number2str(dqb->dqb_ihardlimit, numbuf[2], inodeunit); fprintf(fp, " %7s %5s %5s %6s\n\n", numbuf[0], numbuf[1], numbuf[2], timebuf); } } @@ -893,7 +899,14 @@ if (config->use_ldap_mail) { if (!config->ldap_uri[0]) { - snprintf(config->ldap_uri, CNF_BUFFER, "ldap://%s:%d", config->ldap_host, config->ldap_port); + if (CNF_BUFFER <= snprintf(config->ldap_uri, CNF_BUFFER, + "ldap://%s:%d", config->ldap_host, + config->ldap_port)) { + errstr(_("Could not format LDAP URI because " + "it's longer than %d bytes.\n"), + CNF_BUFFER); + return -1; + } errstr(_("LDAP library version >= 2.3 detected. Please use LDAP_URI instead of hostname and port.\nGenerated URI %s\n"), config->ldap_uri); } } @@ -1016,7 +1029,12 @@ errstr(_("Usage:\n warnquota [-ugsid] [-F quotaformat] [-c configfile] [-q quotatabfile] [-a adminsfile] [filesystem...]\n\n\ -u, --user warn users\n\ -g, --group warn groups\n\ --s, --human-readable send information in more human friendly units\n\ +-s, --human-readable[=units] display numbers in human friendly units (MB,\n\ + GB, ...). Units can be also specified\n\ + explicitely by an optional argument in format\n\ + [kgt],[kgt] where the first character specifies\n\ + space units and the second character specifies\n\ + inode units\n\ -i, --no-autofs avoid autofs mountpoints\n\ -d, --no-details do not send quota information itself\n\ -F, --format=formatname use quotafiles of specific format\n\ @@ -1042,12 +1060,12 @@ { "quota-tab", 1, NULL, 'q' }, { "admins-file", 1, NULL, 'a' }, { "no-autofs", 0, NULL, 'i' }, - { "human-readable", 0, NULL, 's' }, + { "human-readable", 2, NULL, 's' }, { "no-details", 0, NULL, 'd' }, { NULL, 0, NULL, 0 } }; - while ((ret = getopt_long(argcnt, argstr, "ugVF:hc:q:a:isd", long_opts, NULL)) != -1) { + while ((ret = getopt_long(argcnt, argstr, "ugVF:hc:q:a:is::d", long_opts, NULL)) != -1) { switch (ret) { case '?': case 'h': @@ -1078,7 +1096,11 @@ flags |= FL_NOAUTOFS; break; case 's': - flags |= FL_SHORTNUMS; + inodeunit = spaceunit = S2S_AUTO; + if (optarg) { + if (unitopt2unit(optarg, &spaceunit, &inodeunit) < 0) + die(1, _("Bad output format units for human readable output: %s\n"), optarg); + } break; case 'd': flags |= FL_NODETAILS; diff -Nru quota-4.04/xqmstats.c quota-4.05/xqmstats.c --- quota-4.04/xqmstats.c 2013-03-27 07:38:47.000000000 +0000 +++ quota-4.05/xqmstats.c 2019-03-29 10:39:28.000000000 +0000 @@ -35,6 +35,7 @@ if ((stats = fopen(XQMSTATS, "r")) == NULL) { if ((stats = fopen(STATFILE, "r")) == NULL) { errstr(_("The running kernel does not support XFS\n")); + fclose(xqm); return 1; } }