From 7d5ca7898529b95d4c81e441312900af0d7beac3 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 28 Sep 2021 14:12:06 +0900 Subject: [PATCH] Imported Upstream version 2.5.0 --- Makefile.am | 3 + Makefile.in | 312 ++++++++++++++++++------------- aclocal.m4 | 191 +++++++++---------- build-aux/ar-lib | 4 +- build-aux/compile | 8 +- build-aux/config.guess | 489 ++++++++++++++++++++++++------------------------- build-aux/config.sub | 297 +++++++++++++----------------- build-aux/depcomp | 8 +- build-aux/install-sh | 45 +++-- build-aux/ltmain.sh | 77 ++------ build-aux/missing | 14 +- build-aux/test-driver | 8 +- configure | 446 +++++++++++++++++++++++++++++++------------- configure.ac | 3 +- include/attributes.h | 4 +- include/config.h.in | 11 ++ include/walk_tree.h | 1 + libattr/libattr.c | 20 +- libattr/syscalls.c | 26 +-- libmisc/quote.c | 2 +- libmisc/unquote.c | 2 +- libmisc/walk_tree.c | 166 ++++++++++------- m4/libtool.m4 | 33 +--- man/Makemodule.am | 3 +- man/man1/attr.1 | 27 ++- man/man1/getfattr.1 | 18 +- man/man1/setfattr.1 | 22 ++- man/man3/attr_get.3 | 5 +- man/man3/attr_list.3 | 5 +- man/man3/attr_multi.3 | 3 +- man/man3/attr_remove.3 | 3 +- man/man3/attr_set.3 | 3 +- po/POTFILES.in | 22 +-- po/attr.pot | 167 ++++++++--------- po/cs.gmo | Bin 5485 -> 3860 bytes po/cs.po | 179 +++++++++--------- po/de.gmo | Bin 3734 -> 6268 bytes po/de.po | 191 ++++++++++--------- po/en@boldquot.gmo | Bin 6132 -> 6214 bytes po/en@boldquot.po | 184 ++++++++++--------- po/en@quot.gmo | Bin 6032 -> 6114 bytes po/en@quot.po | 184 ++++++++++--------- po/es.gmo | Bin 5288 -> 3688 bytes po/es.po | 179 +++++++++--------- po/fr.gmo | Bin 4127 -> 2481 bytes po/fr.po | 181 +++++++++--------- po/gl.gmo | Bin 5291 -> 3666 bytes po/gl.po | 179 +++++++++--------- po/nl.gmo | Bin 3919 -> 2372 bytes po/nl.po | 177 +++++++++--------- po/pl.gmo | Bin 5417 -> 3696 bytes po/pl.po | 179 +++++++++--------- po/sv.gmo | Bin 3800 -> 2278 bytes po/sv.po | 177 +++++++++--------- test/attr.test | 6 + test/run | 2 +- tools/attr.c | 2 +- tools/getfattr.c | 12 +- tools/setfattr.c | 2 +- xattr.conf | 1 + 60 files changed, 2263 insertions(+), 2020 deletions(-) diff --git a/Makefile.am b/Makefile.am index a3e8353..e5d3f75 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,6 +23,9 @@ dist_doc_DATA = dist_man_MANS = dist_sysconf_DATA = xattr.conf +update-po: + $(MAKE) -C po $@ + include doc/Makemodule.am include examples/Makemodule.am include include/Makemodule.am diff --git a/Makefile.in b/Makefile.in index deb6df6..e31e322 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -115,6 +115,11 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = libattr.pc CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \ + "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" \ + "$(DESTDIR)$(docdir)" "$(DESTDIR)$(sysconfdir)" \ + "$(DESTDIR)$(pkgconfdir)" "$(DESTDIR)$(pkgincludedir)" +PROGRAMS = $(bin_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -142,18 +147,13 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" \ - "$(DESTDIR)$(docdir)" "$(DESTDIR)$(sysconfdir)" \ - "$(DESTDIR)$(pkgconfdir)" "$(DESTDIR)$(pkgincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) libattr_la_LIBADD = am__dirstamp = $(am__leading_dot)dirstamp -am_libattr_la_OBJECTS = libattr/libattr_la-attr_copy_action.lo \ - libattr/libattr_la-attr_copy_check.lo \ - libattr/libattr_la-attr_copy_fd.lo \ - libattr/libattr_la-attr_copy_file.lo \ - libattr/libattr_la-libattr.lo libattr/libattr_la-syscalls.lo +am_libattr_la_OBJECTS = libattr/la-attr_copy_action.lo \ + libattr/la-attr_copy_check.lo libattr/la-attr_copy_fd.lo \ + libattr/la-attr_copy_file.lo libattr/la-libattr.lo \ + libattr/la-syscalls.lo libattr_la_OBJECTS = $(am_libattr_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -167,7 +167,6 @@ am_libmisc_la_OBJECTS = libmisc/high_water_alloc.lo \ libmisc/next_line.lo libmisc/quote.lo libmisc/unquote.lo \ libmisc/walk_tree.lo libmisc_la_OBJECTS = $(am_libmisc_la_OBJECTS) -PROGRAMS = $(bin_PROGRAMS) am_attr_OBJECTS = tools/attr.$(OBJEXT) attr_OBJECTS = $(am_attr_OBJECTS) am__DEPENDENCIES_1 = libattr.la libmisc.la @@ -192,7 +191,18 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = libattr/$(DEPDIR)/la-attr_copy_action.Plo \ + libattr/$(DEPDIR)/la-attr_copy_check.Plo \ + libattr/$(DEPDIR)/la-attr_copy_fd.Plo \ + libattr/$(DEPDIR)/la-attr_copy_file.Plo \ + libattr/$(DEPDIR)/la-libattr.Plo \ + libattr/$(DEPDIR)/la-syscalls.Plo \ + libmisc/$(DEPDIR)/high_water_alloc.Plo \ + libmisc/$(DEPDIR)/next_line.Plo libmisc/$(DEPDIR)/quote.Plo \ + libmisc/$(DEPDIR)/unquote.Plo libmisc/$(DEPDIR)/walk_tree.Plo \ + tools/$(DEPDIR)/attr.Po tools/$(DEPDIR)/getfattr.Po \ + tools/$(DEPDIR)/setfattr.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -242,7 +252,8 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope check recheck distdir dist dist-all distcheck + cscope check recheck distdir distdir-am dist dist-all \ + distcheck am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -739,8 +750,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; $(srcdir)/doc/Makemodule.am $(srcdir)/examples/Makemodule.am $(srcdir)/include/Makemodule.am $(srcdir)/libattr/Makemodule.am $(srcdir)/libmisc/Makemodule.am $(srcdir)/man/Makemodule.am $(srcdir)/man/man1/Makemodule.am $(srcdir)/man/man3/Makemodule.am $(srcdir)/test/Makemodule.am $(srcdir)/tools/Makemodule.am $(am__empty): @@ -769,6 +780,55 @@ distclean-hdr: -rm -f include/config.h include/stamp-h1 libattr.pc: $(top_builddir)/config.status $(srcdir)/libattr.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -821,17 +881,17 @@ libattr/$(am__dirstamp): libattr/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) libattr/$(DEPDIR) @: > libattr/$(DEPDIR)/$(am__dirstamp) -libattr/libattr_la-attr_copy_action.lo: libattr/$(am__dirstamp) \ +libattr/la-attr_copy_action.lo: libattr/$(am__dirstamp) \ libattr/$(DEPDIR)/$(am__dirstamp) -libattr/libattr_la-attr_copy_check.lo: libattr/$(am__dirstamp) \ +libattr/la-attr_copy_check.lo: libattr/$(am__dirstamp) \ libattr/$(DEPDIR)/$(am__dirstamp) -libattr/libattr_la-attr_copy_fd.lo: libattr/$(am__dirstamp) \ +libattr/la-attr_copy_fd.lo: libattr/$(am__dirstamp) \ libattr/$(DEPDIR)/$(am__dirstamp) -libattr/libattr_la-attr_copy_file.lo: libattr/$(am__dirstamp) \ +libattr/la-attr_copy_file.lo: libattr/$(am__dirstamp) \ libattr/$(DEPDIR)/$(am__dirstamp) -libattr/libattr_la-libattr.lo: libattr/$(am__dirstamp) \ +libattr/la-libattr.lo: libattr/$(am__dirstamp) \ libattr/$(DEPDIR)/$(am__dirstamp) -libattr/libattr_la-syscalls.lo: libattr/$(am__dirstamp) \ +libattr/la-syscalls.lo: libattr/$(am__dirstamp) \ libattr/$(DEPDIR)/$(am__dirstamp) libattr.la: $(libattr_la_OBJECTS) $(libattr_la_DEPENDENCIES) $(EXTRA_libattr_la_DEPENDENCIES) @@ -855,55 +915,6 @@ libmisc/walk_tree.lo: libmisc/$(am__dirstamp) \ libmisc.la: $(libmisc_la_OBJECTS) $(libmisc_la_DEPENDENCIES) $(EXTRA_libmisc_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libmisc_la_OBJECTS) $(libmisc_la_LIBADD) $(LIBS) -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - || test -f $$p1 \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list tools/$(am__dirstamp): @$(MKDIR_P) tools @: > tools/$(am__dirstamp) @@ -940,20 +951,26 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@libattr/$(DEPDIR)/libattr_la-attr_copy_action.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libattr/$(DEPDIR)/libattr_la-attr_copy_check.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libattr/$(DEPDIR)/libattr_la-attr_copy_fd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libattr/$(DEPDIR)/libattr_la-attr_copy_file.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libattr/$(DEPDIR)/libattr_la-libattr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libattr/$(DEPDIR)/libattr_la-syscalls.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libmisc/$(DEPDIR)/high_water_alloc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libmisc/$(DEPDIR)/next_line.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libmisc/$(DEPDIR)/quote.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libmisc/$(DEPDIR)/unquote.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libmisc/$(DEPDIR)/walk_tree.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/attr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/getfattr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/setfattr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libattr/$(DEPDIR)/la-attr_copy_action.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libattr/$(DEPDIR)/la-attr_copy_check.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libattr/$(DEPDIR)/la-attr_copy_fd.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libattr/$(DEPDIR)/la-attr_copy_file.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libattr/$(DEPDIR)/la-libattr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libattr/$(DEPDIR)/la-syscalls.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libmisc/$(DEPDIR)/high_water_alloc.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libmisc/$(DEPDIR)/next_line.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libmisc/$(DEPDIR)/quote.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libmisc/$(DEPDIR)/unquote.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libmisc/$(DEPDIR)/walk_tree.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/attr.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/getfattr.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/setfattr.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -979,47 +996,47 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -libattr/libattr_la-attr_copy_action.lo: libattr/attr_copy_action.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -MT libattr/libattr_la-attr_copy_action.lo -MD -MP -MF libattr/$(DEPDIR)/libattr_la-attr_copy_action.Tpo -c -o libattr/libattr_la-attr_copy_action.lo `test -f 'libattr/attr_copy_action.c' || echo '$(srcdir)/'`libattr/attr_copy_action.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libattr/$(DEPDIR)/libattr_la-attr_copy_action.Tpo libattr/$(DEPDIR)/libattr_la-attr_copy_action.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libattr/attr_copy_action.c' object='libattr/libattr_la-attr_copy_action.lo' libtool=yes @AMDEPBACKSLASH@ +libattr/la-attr_copy_action.lo: libattr/attr_copy_action.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -MT libattr/la-attr_copy_action.lo -MD -MP -MF libattr/$(DEPDIR)/la-attr_copy_action.Tpo -c -o libattr/la-attr_copy_action.lo `test -f 'libattr/attr_copy_action.c' || echo '$(srcdir)/'`libattr/attr_copy_action.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libattr/$(DEPDIR)/la-attr_copy_action.Tpo libattr/$(DEPDIR)/la-attr_copy_action.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libattr/attr_copy_action.c' object='libattr/la-attr_copy_action.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -c -o libattr/libattr_la-attr_copy_action.lo `test -f 'libattr/attr_copy_action.c' || echo '$(srcdir)/'`libattr/attr_copy_action.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -c -o libattr/la-attr_copy_action.lo `test -f 'libattr/attr_copy_action.c' || echo '$(srcdir)/'`libattr/attr_copy_action.c -libattr/libattr_la-attr_copy_check.lo: libattr/attr_copy_check.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -MT libattr/libattr_la-attr_copy_check.lo -MD -MP -MF libattr/$(DEPDIR)/libattr_la-attr_copy_check.Tpo -c -o libattr/libattr_la-attr_copy_check.lo `test -f 'libattr/attr_copy_check.c' || echo '$(srcdir)/'`libattr/attr_copy_check.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libattr/$(DEPDIR)/libattr_la-attr_copy_check.Tpo libattr/$(DEPDIR)/libattr_la-attr_copy_check.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libattr/attr_copy_check.c' object='libattr/libattr_la-attr_copy_check.lo' libtool=yes @AMDEPBACKSLASH@ +libattr/la-attr_copy_check.lo: libattr/attr_copy_check.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -MT libattr/la-attr_copy_check.lo -MD -MP -MF libattr/$(DEPDIR)/la-attr_copy_check.Tpo -c -o libattr/la-attr_copy_check.lo `test -f 'libattr/attr_copy_check.c' || echo '$(srcdir)/'`libattr/attr_copy_check.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libattr/$(DEPDIR)/la-attr_copy_check.Tpo libattr/$(DEPDIR)/la-attr_copy_check.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libattr/attr_copy_check.c' object='libattr/la-attr_copy_check.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -c -o libattr/libattr_la-attr_copy_check.lo `test -f 'libattr/attr_copy_check.c' || echo '$(srcdir)/'`libattr/attr_copy_check.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -c -o libattr/la-attr_copy_check.lo `test -f 'libattr/attr_copy_check.c' || echo '$(srcdir)/'`libattr/attr_copy_check.c -libattr/libattr_la-attr_copy_fd.lo: libattr/attr_copy_fd.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -MT libattr/libattr_la-attr_copy_fd.lo -MD -MP -MF libattr/$(DEPDIR)/libattr_la-attr_copy_fd.Tpo -c -o libattr/libattr_la-attr_copy_fd.lo `test -f 'libattr/attr_copy_fd.c' || echo '$(srcdir)/'`libattr/attr_copy_fd.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libattr/$(DEPDIR)/libattr_la-attr_copy_fd.Tpo libattr/$(DEPDIR)/libattr_la-attr_copy_fd.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libattr/attr_copy_fd.c' object='libattr/libattr_la-attr_copy_fd.lo' libtool=yes @AMDEPBACKSLASH@ +libattr/la-attr_copy_fd.lo: libattr/attr_copy_fd.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -MT libattr/la-attr_copy_fd.lo -MD -MP -MF libattr/$(DEPDIR)/la-attr_copy_fd.Tpo -c -o libattr/la-attr_copy_fd.lo `test -f 'libattr/attr_copy_fd.c' || echo '$(srcdir)/'`libattr/attr_copy_fd.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libattr/$(DEPDIR)/la-attr_copy_fd.Tpo libattr/$(DEPDIR)/la-attr_copy_fd.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libattr/attr_copy_fd.c' object='libattr/la-attr_copy_fd.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -c -o libattr/libattr_la-attr_copy_fd.lo `test -f 'libattr/attr_copy_fd.c' || echo '$(srcdir)/'`libattr/attr_copy_fd.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -c -o libattr/la-attr_copy_fd.lo `test -f 'libattr/attr_copy_fd.c' || echo '$(srcdir)/'`libattr/attr_copy_fd.c -libattr/libattr_la-attr_copy_file.lo: libattr/attr_copy_file.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -MT libattr/libattr_la-attr_copy_file.lo -MD -MP -MF libattr/$(DEPDIR)/libattr_la-attr_copy_file.Tpo -c -o libattr/libattr_la-attr_copy_file.lo `test -f 'libattr/attr_copy_file.c' || echo '$(srcdir)/'`libattr/attr_copy_file.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libattr/$(DEPDIR)/libattr_la-attr_copy_file.Tpo libattr/$(DEPDIR)/libattr_la-attr_copy_file.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libattr/attr_copy_file.c' object='libattr/libattr_la-attr_copy_file.lo' libtool=yes @AMDEPBACKSLASH@ +libattr/la-attr_copy_file.lo: libattr/attr_copy_file.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -MT libattr/la-attr_copy_file.lo -MD -MP -MF libattr/$(DEPDIR)/la-attr_copy_file.Tpo -c -o libattr/la-attr_copy_file.lo `test -f 'libattr/attr_copy_file.c' || echo '$(srcdir)/'`libattr/attr_copy_file.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libattr/$(DEPDIR)/la-attr_copy_file.Tpo libattr/$(DEPDIR)/la-attr_copy_file.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libattr/attr_copy_file.c' object='libattr/la-attr_copy_file.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -c -o libattr/libattr_la-attr_copy_file.lo `test -f 'libattr/attr_copy_file.c' || echo '$(srcdir)/'`libattr/attr_copy_file.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -c -o libattr/la-attr_copy_file.lo `test -f 'libattr/attr_copy_file.c' || echo '$(srcdir)/'`libattr/attr_copy_file.c -libattr/libattr_la-libattr.lo: libattr/libattr.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -MT libattr/libattr_la-libattr.lo -MD -MP -MF libattr/$(DEPDIR)/libattr_la-libattr.Tpo -c -o libattr/libattr_la-libattr.lo `test -f 'libattr/libattr.c' || echo '$(srcdir)/'`libattr/libattr.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libattr/$(DEPDIR)/libattr_la-libattr.Tpo libattr/$(DEPDIR)/libattr_la-libattr.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libattr/libattr.c' object='libattr/libattr_la-libattr.lo' libtool=yes @AMDEPBACKSLASH@ +libattr/la-libattr.lo: libattr/libattr.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -MT libattr/la-libattr.lo -MD -MP -MF libattr/$(DEPDIR)/la-libattr.Tpo -c -o libattr/la-libattr.lo `test -f 'libattr/libattr.c' || echo '$(srcdir)/'`libattr/libattr.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libattr/$(DEPDIR)/la-libattr.Tpo libattr/$(DEPDIR)/la-libattr.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libattr/libattr.c' object='libattr/la-libattr.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -c -o libattr/libattr_la-libattr.lo `test -f 'libattr/libattr.c' || echo '$(srcdir)/'`libattr/libattr.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -c -o libattr/la-libattr.lo `test -f 'libattr/libattr.c' || echo '$(srcdir)/'`libattr/libattr.c -libattr/libattr_la-syscalls.lo: libattr/syscalls.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -MT libattr/libattr_la-syscalls.lo -MD -MP -MF libattr/$(DEPDIR)/libattr_la-syscalls.Tpo -c -o libattr/libattr_la-syscalls.lo `test -f 'libattr/syscalls.c' || echo '$(srcdir)/'`libattr/syscalls.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libattr/$(DEPDIR)/libattr_la-syscalls.Tpo libattr/$(DEPDIR)/libattr_la-syscalls.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libattr/syscalls.c' object='libattr/libattr_la-syscalls.lo' libtool=yes @AMDEPBACKSLASH@ +libattr/la-syscalls.lo: libattr/syscalls.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -MT libattr/la-syscalls.lo -MD -MP -MF libattr/$(DEPDIR)/la-syscalls.Tpo -c -o libattr/la-syscalls.lo `test -f 'libattr/syscalls.c' || echo '$(srcdir)/'`libattr/syscalls.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libattr/$(DEPDIR)/la-syscalls.Tpo libattr/$(DEPDIR)/la-syscalls.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libattr/syscalls.c' object='libattr/la-syscalls.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -c -o libattr/libattr_la-syscalls.lo `test -f 'libattr/syscalls.c' || echo '$(srcdir)/'`libattr/syscalls.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libattr_la_CFLAGS) $(CFLAGS) -c -o libattr/la-syscalls.lo `test -f 'libattr/syscalls.c' || echo '$(srcdir)/'`libattr/syscalls.c mostlyclean-libtool: -rm -f *.lo @@ -1428,7 +1445,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -1464,7 +1481,10 @@ recheck: all @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -1654,12 +1674,12 @@ distcleancheck: distclean check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-recursive -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(DATA) $(HEADERS) +all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(MANS) $(DATA) $(HEADERS) install-binPROGRAMS: install-libLTLIBRARIES installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(sysconfdir)" "$(DESTDIR)$(pkgconfdir)" "$(DESTDIR)$(pkgincludedir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(sysconfdir)" "$(DESTDIR)$(pkgconfdir)" "$(DESTDIR)$(pkgincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -1708,7 +1728,20 @@ clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf libattr/$(DEPDIR) libmisc/$(DEPDIR) tools/$(DEPDIR) + -rm -f libattr/$(DEPDIR)/la-attr_copy_action.Plo + -rm -f libattr/$(DEPDIR)/la-attr_copy_check.Plo + -rm -f libattr/$(DEPDIR)/la-attr_copy_fd.Plo + -rm -f libattr/$(DEPDIR)/la-attr_copy_file.Plo + -rm -f libattr/$(DEPDIR)/la-libattr.Plo + -rm -f libattr/$(DEPDIR)/la-syscalls.Plo + -rm -f libmisc/$(DEPDIR)/high_water_alloc.Plo + -rm -f libmisc/$(DEPDIR)/next_line.Plo + -rm -f libmisc/$(DEPDIR)/quote.Plo + -rm -f libmisc/$(DEPDIR)/unquote.Plo + -rm -f libmisc/$(DEPDIR)/walk_tree.Plo + -rm -f tools/$(DEPDIR)/attr.Po + -rm -f tools/$(DEPDIR)/getfattr.Po + -rm -f tools/$(DEPDIR)/setfattr.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-tags @@ -1759,7 +1792,20 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf libattr/$(DEPDIR) libmisc/$(DEPDIR) tools/$(DEPDIR) + -rm -f libattr/$(DEPDIR)/la-attr_copy_action.Plo + -rm -f libattr/$(DEPDIR)/la-attr_copy_check.Plo + -rm -f libattr/$(DEPDIR)/la-attr_copy_fd.Plo + -rm -f libattr/$(DEPDIR)/la-attr_copy_file.Plo + -rm -f libattr/$(DEPDIR)/la-libattr.Plo + -rm -f libattr/$(DEPDIR)/la-syscalls.Plo + -rm -f libmisc/$(DEPDIR)/high_water_alloc.Plo + -rm -f libmisc/$(DEPDIR)/next_line.Plo + -rm -f libmisc/$(DEPDIR)/quote.Plo + -rm -f libmisc/$(DEPDIR)/unquote.Plo + -rm -f libmisc/$(DEPDIR)/walk_tree.Plo + -rm -f tools/$(DEPDIR)/attr.Po + -rm -f tools/$(DEPDIR)/getfattr.Po + -rm -f tools/$(DEPDIR)/setfattr.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1787,15 +1833,15 @@ uninstall-man: uninstall-man1 uninstall-man3 install-strip .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ - am--refresh check check-TESTS check-am clean clean-binPROGRAMS \ - clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \ - clean-noinstLTLIBRARIES cscope cscopelist-am ctags ctags-am \ - dist dist-all dist-bzip2 dist-gzip dist-lzip dist-shar \ - dist-tarZ dist-xz dist-zip distcheck distclean \ - distclean-compile distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-binPROGRAMS install-data \ + am--depfiles am--refresh check check-TESTS check-am clean \ + clean-binPROGRAMS clean-cscope clean-generic \ + clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ + cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ + dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ + distcheck distclean distclean-compile distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-binPROGRAMS install-data \ install-data-am install-data-hook install-data-local \ install-dist_docDATA install-dist_sysconfDATA install-dvi \ install-dvi-am install-exec install-exec-am install-html \ @@ -1816,6 +1862,9 @@ uninstall-man: uninstall-man1 uninstall-man3 .PRECIOUS: Makefile +update-po: + $(MAKE) -C po $@ + install-attributes_h: include/attributes.h $(SUBST_INSTALL_HEADER) "$<" "$(DESTDIR)$(pkgincludedir)" install-error_context_h: include/error_context.h @@ -1849,8 +1898,7 @@ install-data-hook: echo $(LN_S) $$dst $$ln; \ $(LN_S) $$dst $$ln; \ done; \ - done; \ - rmdir */ 2>/dev/null || : + done # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/aclocal.m4 b/aclocal.m4 index bfe121d..cbf8bcf 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to. 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'.])]) -# Copyright (C) 2002-2017 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # 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.15' +[am__api_version='1.16' 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.15.1], [], +m4_if([$1], [1.16.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,12 +51,12 @@ m4_define([_AM_AUTOCONF_VERSION], []) # 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.15.1])dnl +[AM_AUTOMAKE_VERSION([1.16.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-2017 Free Software Foundation, Inc. +# Copyright (C) 2011-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -118,7 +118,7 @@ AC_SUBST([AR])dnl # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -170,7 +170,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -201,7 +201,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -392,13 +392,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 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_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -406,49 +405,41 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -457,18 +448,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # ----------------------------- # This macro should only be invoked once -- use via AC_REQUIRE. # -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -555,8 +545,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -623,7 +613,7 @@ 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: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -665,7 +655,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -686,7 +676,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -707,7 +697,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -715,49 +705,42 @@ AC_SUBST([am__leading_dot])]) # AM_MAKE_INCLUDE() # ----------------- -# Check to see how make treats includes. +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -796,7 +779,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -825,7 +808,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -872,7 +855,7 @@ 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. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -891,7 +874,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -972,7 +955,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1032,7 +1015,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1060,7 +1043,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2017 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1079,7 +1062,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2017 Free Software Foundation, Inc. +# Copyright (C) 2004-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/build-aux/ar-lib b/build-aux/ar-lib index 05094d3..0baa4f6 100755 --- a/build-aux/ar-lib +++ b/build-aux/ar-lib @@ -4,7 +4,7 @@ me=ar-lib scriptversion=2012-03-01.08; # UTC -# Copyright (C) 2010-2017 Free Software Foundation, Inc. +# Copyright (C) 2010-2018 Free Software Foundation, Inc. # Written by Peter Rosin . # # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ scriptversion=2012-03-01.08; # UTC # 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 . +# 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 diff --git a/build-aux/compile b/build-aux/compile index 2ab71e4..99e5052 100755 --- a/build-aux/compile +++ b/build-aux/compile @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC # 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 . +# 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 @@ -340,7 +340,7 @@ exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/build-aux/config.guess b/build-aux/config.guess index 3ecb90b..256083a 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-01-01' +timestamp='2018-03-08' # 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 @@ -107,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; dummy=$tmp/dummy ; tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; + ,,) echo "int x;" > "$dummy.c" ; for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; @@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in +case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) # If the system lacks a compiler, then just pick glibc. # We could probably try harder. LIBC=gnu - eval $set_cc_for_build - cat <<-EOF > $dummy.c + eval "$set_cc_for_build" + cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) LIBC=uclibc @@ -149,13 +149,20 @@ Linux|GNU|GNU/*) LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + + # If ldd exists, use it to detect musl libc. + if command -v ldd >/dev/null && \ + ldd --version 2>&1 | grep -q ^musl + then + LIBC=musl + fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -169,30 +176,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - /sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || \ + "/sbin/$sysctl" 2>/dev/null || \ + "/usr/sbin/$sysctl" 2>/dev/null || \ echo unknown)` - case "${UNAME_MACHINE_ARCH}" in + 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 ;; 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}-unknown + 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}"-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in earm*) os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build + eval "$set_cc_for_build" if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -208,10 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ;; esac # Determine ABI tags. - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` ;; esac # The OS release @@ -219,51 +226,51 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in + case "$UNAME_VERSION" in Debian*) release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` + 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}${abi}" + echo "$machine-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" exit ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" exit ;; *:MidnightBSD:*:*) - echo ${UNAME_MACHINE}-unknown-midnightbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" exit ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" exit ;; *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:Sortix:*:*) - echo ${UNAME_MACHINE}-unknown-sortix + echo "$UNAME_MACHINE"-unknown-sortix exit ;; *:Redox:*:*) - echo ${UNAME_MACHINE}-unknown-redox + echo "$UNAME_MACHINE"-unknown-redox exit ;; mips:OSF1:*.*) echo mips-dec-osf1 @@ -319,7 +326,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # 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 @@ -328,10 +335,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo m68k-unknown-sysv4 exit ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos + echo "$UNAME_MACHINE"-unknown-amigaos exit ;; *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos + echo "$UNAME_MACHINE"-unknown-morphos exit ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -343,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} + echo arm-acorn-riscix"$UNAME_RELEASE" exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos @@ -370,19 +377,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} + echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build + eval "$set_cc_for_build" 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. @@ -395,13 +402,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in SUN_ARCH=x86_64 fi fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in @@ -410,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" exit ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" 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} + echo m68k-sun-sunos"$UNAME_RELEASE" ;; sun4) - echo sparc-sun-sunos${UNAME_RELEASE} + echo sparc-sun-sunos"$UNAME_RELEASE" ;; esac exit ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} + echo sparc-auspex-sunos"$UNAME_RELEASE" exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not @@ -439,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} + echo m68k-milan-mint"$UNAME_RELEASE" exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} + echo m68k-hades-mint"$UNAME_RELEASE" exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} + echo m68k-unknown-mint"$UNAME_RELEASE" exit ;; m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} + echo m68k-apple-machten"$UNAME_RELEASE" exit ;; powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} + echo powerpc-apple-machten"$UNAME_RELEASE" exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} + echo mips-dec-ultrix"$UNAME_RELEASE" exit ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} + echo vax-dec-ultrix"$UNAME_RELEASE" exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} + echo clipper-intergraph-clix"$UNAME_RELEASE" exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ int main (int argc, char *argv[]) { @@ -497,11 +504,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && + dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} + echo mips-mips-riscos"$UNAME_RELEASE" exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax @@ -527,17 +534,17 @@ EOF AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] + if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ + [ "$TARGET_BINARY_INTERFACE"x = x ] then - echo m88k-dg-dgux${UNAME_RELEASE} + echo m88k-dg-dgux"$UNAME_RELEASE" else - echo m88k-dg-dguxbcs${UNAME_RELEASE} + echo m88k-dg-dguxbcs"$UNAME_RELEASE" fi else - echo i586-dg-dgux${UNAME_RELEASE} + echo i586-dg-dgux"$UNAME_RELEASE" fi exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) @@ -554,7 +561,7 @@ EOF echo m68k-tektronix-bsd exit ;; *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id @@ -566,14 +573,14 @@ EOF if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #include main() @@ -584,7 +591,7 @@ EOF exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then echo "$SYSTEM_NAME" else @@ -598,7 +605,7 @@ EOF exit ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc @@ -607,9 +614,9 @@ EOF 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} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} + echo "$IBM_ARCH"-ibm-aix"$IBM_REV" exit ;; *:AIX:*:*) echo rs6000-ibm-aix @@ -618,7 +625,7 @@ EOF echo romp-ibm-bsd4.4 exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx @@ -633,28 +640,28 @@ EOF echo m68k-hp-bsd4.4 exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + case "$UNAME_MACHINE" in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in + case "$sc_cpu_version" in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in + case "$sc_kernel_bits" in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + if [ "$HP_ARCH" = "" ]; then + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE #include @@ -687,13 +694,13 @@ EOF 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 + eval "$set_cc_for_build" # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -712,15 +719,15 @@ EOF HP_ARCH=hppa64 fi fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} + echo "$HP_ARCH"-hp-hpux"$HPUX_REV" exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #include int main () @@ -745,7 +752,7 @@ EOF exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; @@ -766,9 +773,9 @@ EOF exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk + echo "$UNAME_MACHINE"-unknown-osf1mk else - echo ${UNAME_MACHINE}-unknown-osf1 + echo "$UNAME_MACHINE"-unknown-osf1 fi exit ;; parisc*:Lites*:*:*) @@ -793,109 +800,109 @@ EOF echo c4-convex-bsd exit ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + 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_REL=`echo ${UNAME_RELEASE} | 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_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" exit ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} + echo sparc-unknown-bsdi"$UNAME_RELEASE" exit ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in + case "$UNAME_PROCESSOR" in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin + echo "$UNAME_MACHINE"-pc-cygwin exit ;; *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 + echo "$UNAME_MACHINE"-pc-mingw64 exit ;; *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 + echo "$UNAME_MACHINE"-pc-mingw32 exit ;; *:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys + echo "$UNAME_MACHINE"-pc-msys exit ;; i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 + echo "$UNAME_MACHINE"-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case "$UNAME_MACHINE" in x86) - echo i586-pc-interix${UNAME_RELEASE} + echo i586-pc-interix"$UNAME_RELEASE" exit ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} + echo x86_64-unknown-interix"$UNAME_RELEASE" exit ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} + echo ia64-unknown-interix"$UNAME_RELEASE" exit ;; esac ;; i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin + echo "$UNAME_MACHINE"-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" exit ;; i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix + echo "$UNAME_MACHINE"-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -909,63 +916,63 @@ EOF esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) - eval $set_cc_for_build + eval "$set_cc_for_build" if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; e2k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; k1om:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #undef CPU #undef ${UNAME_MACHINE} #undef ${UNAME_MACHINE}el @@ -979,81 +986,70 @@ EOF #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" + test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } ;; mips64el:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} + echo or1k-unknown-linux-"$LIBC" exit ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-unknown-linux-"$LIBC" exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-"$LIBC" exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; + PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; + *) echo hppa-unknown-linux-"$LIBC" ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-"$LIBC" exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} + echo powerpc-unknown-linux-"$LIBC" exit ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} + echo powerpc64le-unknown-linux-"$LIBC" exit ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} + echo powerpcle-unknown-linux-"$LIBC" exit ;; riscv32:Linux:*:* | riscv64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - eval $set_cc_for_build - X86_64_ABI= - # If there is a compiler, see if it is configured for 32-bit objects. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_X32 >/dev/null - then - X86_64_ABI=x32 - fi - fi - echo ${UNAME_MACHINE}-pc-linux-${LIBC}${X86_64_ABI} + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1067,34 +1063,34 @@ EOF # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx + echo "$UNAME_MACHINE"-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop + echo "$UNAME_MACHINE"-unknown-stop exit ;; i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos + echo "$UNAME_MACHINE"-unknown-atheos exit ;; i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable + echo "$UNAME_MACHINE"-pc-syllable exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} + echo i386-unknown-lynxos"$UNAME_RELEASE" exit ;; i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp + echo "$UNAME_MACHINE"-pc-msdosdjgpp exit ;; i*86:*:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" fi exit ;; i*86:*:5:[678]*) @@ -1104,12 +1100,12 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1119,9 +1115,9 @@ EOF && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv32 + echo "$UNAME_MACHINE"-pc-sysv32 fi exit ;; pc:*:*:*) @@ -1141,9 +1137,9 @@ EOF exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 fi exit ;; mini*:CTIX:SYS*5:*) @@ -1163,9 +1159,9 @@ EOF test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; @@ -1174,28 +1170,28 @@ EOF test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} + echo m68k-unknown-lynxos"$UNAME_RELEASE" exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} + echo sparc-unknown-lynxos"$UNAME_RELEASE" exit ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} + echo rs6000-unknown-lynxos"$UNAME_RELEASE" exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} + echo powerpc-unknown-lynxos"$UNAME_RELEASE" exit ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} + echo mips-dde-sysv"$UNAME_RELEASE" exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 @@ -1206,7 +1202,7 @@ EOF *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 + echo "$UNAME_MACHINE"-sni-sysv4 else echo ns32k-sni-sysv fi @@ -1226,23 +1222,23 @@ EOF exit ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos + echo "$UNAME_MACHINE"-stratus-vos exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos exit ;; mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} + echo m68k-apple-aux"$UNAME_RELEASE" exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv"$UNAME_RELEASE" else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv"$UNAME_RELEASE" fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. @@ -1261,39 +1257,39 @@ EOF echo x86_64-unknown-haiku exit ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} + echo sx4-nec-superux"$UNAME_RELEASE" exit ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} + echo sx5-nec-superux"$UNAME_RELEASE" exit ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} + echo sx6-nec-superux"$UNAME_RELEASE" exit ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} + echo sx7-nec-superux"$UNAME_RELEASE" exit ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} + echo sx8-nec-superux"$UNAME_RELEASE" exit ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} + echo sx8r-nec-superux"$UNAME_RELEASE" exit ;; SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux${UNAME_RELEASE} + echo sxace-nec-superux"$UNAME_RELEASE" exit ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} + echo powerpc-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build + eval "$set_cc_for_build" if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + 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) | \ @@ -1321,7 +1317,7 @@ EOF # that Apple uses in portable devices. UNAME_PROCESSOR=x86_64 fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` @@ -1329,22 +1325,25 @@ EOF UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" exit ;; *:QNX:*:4*) echo i386-pc-qnx exit ;; NEO-*:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} + echo neo-tandem-nsk"$UNAME_RELEASE" exit ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} + echo nse-tandem-nsk"$UNAME_RELEASE" exit ;; NSR-*:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} + echo nsr-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSV-*:NONSTOP_KERNEL:*:*) + echo nsv-tandem-nsk"$UNAME_RELEASE" exit ;; NSX-*:NONSTOP_KERNEL:*:*) - echo nsx-tandem-nsk${UNAME_RELEASE} + echo nsx-tandem-nsk"$UNAME_RELEASE" exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux @@ -1353,7 +1352,7 @@ EOF echo bs2000-siemens-sysv exit ;; DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 @@ -1364,7 +1363,7 @@ EOF else UNAME_MACHINE="$cputype" fi - echo ${UNAME_MACHINE}-unknown-plan9 + echo "$UNAME_MACHINE"-unknown-plan9 exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 @@ -1385,14 +1384,14 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux"$UNAME_RELEASE" exit ;; *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in + case "$UNAME_MACHINE" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; V*) echo vax-dec-vms ; exit ;; @@ -1401,16 +1400,16 @@ EOF 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 + echo "$UNAME_MACHINE"-pc-rdos exit ;; i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros + echo "$UNAME_MACHINE"-pc-aros exit ;; x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx + echo "$UNAME_MACHINE"-unknown-esx exit ;; amd64:Isilon\ OneFS:*:*) echo x86_64-unknown-onefs @@ -1419,7 +1418,7 @@ esac echo "$0: unable to guess system type" >&2 -case "${UNAME_MACHINE}:${UNAME_SYSTEM}" in +case "$UNAME_MACHINE:$UNAME_SYSTEM" in mips:Linux | mips64:Linux) # If we got here on MIPS GNU/Linux, output extra information. cat >&2 </dev/null` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} +UNAME_MACHINE = "$UNAME_MACHINE" +UNAME_RELEASE = "$UNAME_RELEASE" +UNAME_SYSTEM = "$UNAME_SYSTEM" +UNAME_VERSION = "$UNAME_VERSION" EOF exit 1 # Local variables: -# eval: (add-hook 'write-file-functions 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/build-aux/config.sub b/build-aux/config.sub index 47515cc..20f7cf2 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-01-01' +timestamp='2018-05-05' # 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 @@ -94,7 +94,7 @@ while test $# -gt 0 ; do *local*) # First pass through any local machine types. - echo $1 + echo "$1" exit ;; * ) @@ -110,28 +110,48 @@ case $# in exit 1;; esac -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -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* | netbsd*-eabi* | \ - kopensolaris*-gnu* | cloudabi*-eabi* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; +# Spilt fields of configuration type +IFS="-" read -r field1 field2 field3 field4 <&2 + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; # Recognize the basic CPU types with company name. @@ -378,7 +403,7 @@ case $basic_machine in | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | csky-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | e2k-* | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -419,6 +444,7 @@ case $basic_machine in | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ + | nfp-* \ | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ @@ -457,7 +483,7 @@ case $basic_machine in # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) - basic_machine=i386-unknown + basic_machine=i386-pc os=-bsd ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) @@ -491,7 +517,7 @@ case $basic_machine in basic_machine=x86_64-pc ;; amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; amdahl) basic_machine=580-amdahl @@ -536,7 +562,7 @@ case $basic_machine in os=-linux ;; blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; bluegene*) @@ -544,13 +570,13 @@ case $basic_machine in os=-cnk ;; c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c90) basic_machine=c90-cray @@ -648,7 +674,7 @@ case $basic_machine in os=$os"spe" ;; e500v[12]-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=$os"spe" ;; ebmon29k) @@ -740,9 +766,6 @@ case $basic_machine in hp9k8[0-9][0-9] | hp8[0-9][0-9]) basic_machine=hppa1.0-hp ;; - hppa-next) - os=-nextstep3 - ;; hppaosf) basic_machine=hppa1.1-hp os=-osf @@ -755,26 +778,26 @@ case $basic_machine in basic_machine=i370-ibm ;; i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv ;; i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; i386mach) basic_machine=i386-mach os=-mach ;; - i386-vsta | vsta) + vsta) basic_machine=i386-unknown os=-vsta ;; @@ -793,19 +816,16 @@ case $basic_machine in os=-sysv ;; leon-*|leon[3-9]-*) - basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` ;; m68knommu) basic_machine=m68k-unknown os=-linux ;; m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; - m88k-omron*) - basic_machine=m88k-omron - ;; magnum | m3230) basic_machine=mips-mips os=-sysv @@ -836,29 +856,11 @@ case $basic_machine in basic_machine=m68k-atari os=-mint ;; - mipsEE* | ee | ps2) - basic_machine=mips64r5900el-scei - case $os in - -linux*) - ;; - *) - os=-elf - ;; - esac - ;; - iop) - basic_machine=mipsel-scei - os=-irx - ;; - dvp) - basic_machine=dvp-scei - os=-elf - ;; mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` ;; mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown ;; monitor) basic_machine=m68k-rom68k @@ -877,7 +879,7 @@ case $basic_machine in os=-msdos ;; ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` ;; msys) basic_machine=i686-pc @@ -964,6 +966,9 @@ case $basic_machine in nsr-tandem) basic_machine=nsr-tandem ;; + nsv-tandem) + basic_machine=nsv-tandem + ;; nsx-tandem) basic_machine=nsx-tandem ;; @@ -999,7 +1004,7 @@ case $basic_machine in os=-linux ;; parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; pbd) @@ -1015,7 +1020,7 @@ case $basic_machine in basic_machine=i386-pc ;; pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc @@ -1030,16 +1035,16 @@ case $basic_machine in basic_machine=i786-pc ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould @@ -1049,23 +1054,23 @@ case $basic_machine in ppc | ppcbe) basic_machine=powerpc-unknown ;; ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ps2) basic_machine=i386-ibm @@ -1119,17 +1124,10 @@ case $basic_machine in sequent) basic_machine=i386-sequent ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; sh5el) basic_machine=sh5le-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) + simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -1148,7 +1146,7 @@ case $basic_machine in os=-sysv4 ;; strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; sun2) basic_machine=m68000-sun @@ -1262,9 +1260,6 @@ case $basic_machine in basic_machine=a29k-wrs os=-vxworks ;; - wasm32) - basic_machine=wasm32-unknown - ;; w65*) basic_machine=w65-wdc os=-none @@ -1284,20 +1279,12 @@ case $basic_machine in basic_machine=xps100-honeywell ;; xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` ;; ymp) basic_machine=ymp-cray os=-unicos ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; none) basic_machine=none-none os=-none @@ -1326,10 +1313,6 @@ case $basic_machine in vax) basic_machine=vax-dec ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; pdp11) basic_machine=pdp11-dec ;; @@ -1339,9 +1322,6 @@ case $basic_machine in sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; cydra) basic_machine=cydra-cydrome ;; @@ -1361,7 +1341,7 @@ case $basic_machine in # Make sure to match an already-canonicalized machine name. ;; *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; esac @@ -1369,10 +1349,10 @@ esac # Here we canonicalize certain aliases for manufacturers. case $basic_machine in *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` ;; *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` ;; *) ;; @@ -1380,7 +1360,7 @@ esac # Decode manufacturer-specific aliases for certain operating systems. -if [ x"$os" != x"" ] +if [ x$os != x ] then case $os in # First match some system type aliases that might get confused @@ -1395,15 +1375,16 @@ case $os in -solaris) os=-solaris2 ;; - -svr4*) - os=-sysv4 - ;; -unixware*) os=-sysv4.2uw ;; -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; + # es1800 is here to avoid being matched by es* (a different OS) + -es1800*) + os=-ose + ;; # Now accept the basic system types. # The portable systems comes first. # Each alternative MUST end in a * to match a version number. @@ -1416,25 +1397,26 @@ case $os in | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ | -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* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \ | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -morphos* | -superux* | -rtmk* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme*) + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ + | -midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1451,12 +1433,12 @@ case $os in -nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + -sim | -xray | -os68k* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) - os=`echo $os | sed -e 's|mac|macos|'` + os=`echo "$os" | sed -e 's|mac|macos|'` ;; -linux-dietlibc) os=-linux-dietlibc @@ -1465,10 +1447,10 @@ case $os in os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` + os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` + os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; -opened*) os=-openedition @@ -1479,12 +1461,6 @@ case $os in -wince*) os=-wince ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; -utek*) os=-bsd ;; @@ -1531,7 +1507,7 @@ case $os in -oss*) os=-sysv3 ;; - -svr4) + -svr4*) os=-sysv4 ;; -svr3) @@ -1546,18 +1522,9 @@ case $os in -ose*) os=-ose ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; - -aros*) - os=-aros - ;; -zvmoe) os=-zvmoe ;; @@ -1583,10 +1550,16 @@ case $os in ;; -none) ;; + -*-eabi) + case $basic_machine in + arm*) + ;; + esac + ;; *) # Get rid of the `-' at the beginning of $os. os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; esac @@ -1682,9 +1655,6 @@ case $basic_machine in *-be) os=-beos ;; - *-haiku) - os=-haiku - ;; *-ibm) os=-aix ;; @@ -1739,9 +1709,6 @@ case $basic_machine in i370-*) os=-mvs ;; - *-next) - os=-nextstep3 - ;; *-gould) os=-sysv ;; @@ -1851,15 +1818,15 @@ case $basic_machine in vendor=stratus ;; esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo $basic_machine$os +echo "$basic_machine$os" exit # Local variables: -# eval: (add-hook 'write-file-functions 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/build-aux/depcomp b/build-aux/depcomp index b39f98f..65cbf70 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 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 @@ -16,7 +16,7 @@ scriptversion=2016-01-11.22; # UTC # 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 . +# 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 @@ -783,7 +783,7 @@ exit 0 # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/build-aux/install-sh b/build-aux/install-sh index 0360b79..8175c64 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-11.20; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -271,15 +271,18 @@ do fi dst=$dst_arg - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. + # If destination is a directory, append the input filename. if test -d "$dst"; then 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"` + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac dstdir_status=0 else dstdir=`dirname "$dst"` @@ -288,6 +291,11 @@ do fi fi + case $dstdir in + */) dstdirslash=$dstdir;; + *) dstdirslash=$dstdir/;; + esac + obsolete_mkdir_used=false if test $dstdir_status != 0; then @@ -324,34 +332,43 @@ do # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) + # Note that $RANDOM variable is not portable (e.g. dash); Use it + # here however when possible just to lower collision chance. tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p' feature. if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/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"` + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_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"` + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" } } then posix_mkdir=: fi - rmdir "$tmpdir/d" "$tmpdir" + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" else # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null fi trap '' 0;; esac;; @@ -427,8 +444,8 @@ do else # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ + dsttmp=${dstdirslash}_inst.$$_ + rmtmp=${dstdirslash}_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 @@ -493,7 +510,7 @@ do done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh index b2549ee..7f3523d 100644 --- a/build-aux/ltmain.sh +++ b/build-aux/ltmain.sh @@ -64,7 +64,7 @@ package_revision=2.4.6 # libraries, which are installed to $pkgauxdir. # Set a version string for this script. -scriptversion=2015-10-04.22; # UTC +scriptversion=2015-01-20.17; # UTC # General shell script boiler plate, and helper functions. # Written by Gary V. Vaughan, 2004 @@ -1091,57 +1091,6 @@ func_relative_path () } -# func_quote ARG -# -------------- -# Aesthetically quote one ARG, store the result into $func_quote_result. Note -# that we keep attention to performance here (so far O(N) complexity as long as -# func_append is O(1)). -func_quote () -{ - $debug_cmd - - func_quote_result=$1 - - case $func_quote_result in - *[\\\`\"\$]*) - case $func_quote_result in - *[\[\*\?]*) - func_quote_result=`$ECHO "$func_quote_result" | $SED "$sed_quote_subst"` - return 0 - ;; - esac - - func_quote_old_IFS=$IFS - for _G_char in '\' '`' '"' '$' - do - # STATE($1) PREV($2) SEPARATOR($3) - set start "" "" - func_quote_result=dummy"$_G_char$func_quote_result$_G_char"dummy - IFS=$_G_char - for _G_part in $func_quote_result - do - case $1 in - quote) - func_append func_quote_result "$3$2" - set quote "$_G_part" "\\$_G_char" - ;; - start) - set first "" "" - func_quote_result= - ;; - first) - set quote "$_G_part" "" - ;; - esac - done - IFS=$func_quote_old_IFS - done - ;; - *) ;; - esac -} - - # func_quote_for_eval ARG... # -------------------------- # Aesthetically quote ARGs to be evaled later. @@ -1158,8 +1107,12 @@ func_quote_for_eval () func_quote_for_eval_unquoted_result= func_quote_for_eval_result= while test 0 -lt $#; do - func_quote "$1" - _G_unquoted_arg=$func_quote_result + case $1 in + *[\\\`\"\$]*) + _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; + *) + _G_unquoted_arg=$1 ;; + esac if test -n "$func_quote_for_eval_unquoted_result"; then func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" else @@ -2171,7 +2124,7 @@ fi # a configuration failure hint, and exit. func_fatal_configuration () { - func__fatal_error ${1+"$@"} \ + func_fatal_error ${1+"$@"} \ "See the $PACKAGE documentation for more information." \ "Fatal configuration error." } @@ -5305,8 +5258,7 @@ else if test \"\$libtool_execute_magic\" != \"$magic\"; then file=\"\$0\"" - func_quote "$ECHO" - qECHO=$func_quote_result + qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` $ECHO "\ # A function that is used when there is no print builtin or printf. @@ -7322,12 +7274,10 @@ func_mode_link () # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization # -specs=* GCC specs files # -stdlib=* select c++ std lib with clang - # -fsanitize=* Clang/GCC memory and address sanitizer - # -fuse-ld=* Linker select flags for GCC -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -specs=*|-fsanitize=*|-fuse-ld=*) + -specs=*) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" @@ -10558,8 +10508,8 @@ EOF relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" fi done - func_quote "(cd `pwd`; $relink_command)" - relink_command=$func_quote_result + relink_command="(cd `pwd`; $relink_command)" + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` fi # Only actually do things if not in dry run mode. @@ -10805,8 +10755,7 @@ EOF done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - func_quote "$relink_command" - relink_command=$func_quote_result + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` if test yes = "$hardcode_automatic"; then relink_command= fi diff --git a/build-aux/missing b/build-aux/missing index c6e3795..625aeb1 100755 --- a/build-aux/missing +++ b/build-aux/missing @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC # 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 . +# 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 @@ -101,9 +101,9 @@ else exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,7 +207,7 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/build-aux/test-driver b/build-aux/test-driver index 0218a01..b8521a4 100755 --- a/build-aux/test-driver +++ b/build-aux/test-driver @@ -1,9 +1,9 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2017 Free Software Foundation, Inc. +# Copyright (C) 2011-2018 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 @@ -16,7 +16,7 @@ scriptversion=2016-01-11.22; # UTC # 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 . +# 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 @@ -140,7 +140,7 @@ echo ":copy-in-global-log: $gcopy" >> $trs_file # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/configure b/configure index 5c3eea8..3fec49b 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for attr 2.4.48. +# Generated by GNU Autoconf 2.69 for attr 2.5.0. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='attr' PACKAGE_TARNAME='attr' -PACKAGE_VERSION='2.4.48' -PACKAGE_STRING='attr 2.4.48' +PACKAGE_VERSION='2.5.0' +PACKAGE_STRING='attr 2.5.0' PACKAGE_BUGREPORT='acl-devel@nongnu.org' PACKAGE_URL='' @@ -694,7 +694,6 @@ am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE -am__quote am__include DEPDIR OBJEXT @@ -768,12 +767,14 @@ PACKAGE_VERSION PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +am__quote' ac_subst_files='' ac_user_opts=' enable_option_checking enable_silent_rules enable_dependency_tracking +enable_largefile enable_shared enable_static with_pic @@ -1338,7 +1339,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures attr 2.4.48 to adapt to many kinds of systems. +\`configure' configures attr 2.5.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1408,7 +1409,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of attr 2.4.48:";; + short | recursive ) echo "Configuration of attr 2.5.0:";; esac cat <<\_ACEOF @@ -1422,6 +1423,7 @@ Optional Features: do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build + --disable-largefile omit support for large files --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -1526,7 +1528,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -attr configure 2.4.48 +attr configure 2.5.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1949,7 +1951,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by attr $as_me 2.4.48, which was +It was created by attr $as_me 2.5.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2332,7 +2334,7 @@ ac_config_headers="$ac_config_headers include/config.h" -am__api_version='1.15' +am__api_version='1.16' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2818,7 +2820,7 @@ fi # Define the identity of the package. PACKAGE='attr' - VERSION='2.4.48' + VERSION='2.5.0' cat >>confdefs.h <<_ACEOF @@ -2848,8 +2850,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The @@ -2900,7 +2902,7 @@ 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: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -3802,45 +3804,45 @@ DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" - -am_make=${MAKE-make} -cat > confinc << 'END' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : @@ -4776,6 +4778,206 @@ $as_echo "#define EXPORT extern" >>confdefs.h fi +# Check whether --enable-largefile was given. +if test "${enable_largefile+set}" = set; then : + enableval=$enable_largefile; +fi + +if test "$enable_largefile" != no; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +$as_echo_n "checking for special C compiler options needed for large files... " >&6; } +if ${ac_cv_sys_largefile_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF + if ac_fn_c_try_compile "$LINENO"; then : + break +fi +rm -f core conftest.err conftest.$ac_objext + CC="$CC -n32" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_largefile_CC=' -n32'; break +fi +rm -f core conftest.err conftest.$ac_objext + break + done + CC=$ac_save_CC + rm -f conftest.$ac_ext + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +$as_echo "$ac_cv_sys_largefile_CC" >&6; } + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if ${ac_cv_sys_file_offset_bits+:} false; then : + $as_echo_n "(cached) " >&6 +else + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_file_offset_bits=no; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _FILE_OFFSET_BITS 64 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_file_offset_bits=64; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_file_offset_bits=unknown + break +done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +$as_echo "$ac_cv_sys_file_offset_bits" >&6; } +case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits +_ACEOF +;; +esac +rm -rf conftest* + if test $ac_cv_sys_file_offset_bits = unknown; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } +if ${ac_cv_sys_large_files+:} false; then : + $as_echo_n "(cached) " >&6 +else + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_large_files=no; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _LARGE_FILES 1 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_large_files=1; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_large_files=unknown + break +done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +$as_echo "$ac_cv_sys_large_files" >&6; } +case $ac_cv_sys_large_files in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _LARGE_FILES $ac_cv_sys_large_files +_ACEOF +;; +esac +rm -rf conftest* + fi + + +fi + if test -n "$ac_tool_prefix"; then for ac_prog in ar lib "link -lib" @@ -5652,11 +5854,6 @@ else lt_cv_sys_max_cmd_len=8192; ;; - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; - amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@ -7425,10 +7622,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*linux*|powerpc64le-*linux*) + powerpcle-*linux*) LD="${LD-ld} -m elf64lppc" ;; - powerpc-*linux*|powerpc64-*linux*) + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -11347,11 +11544,11 @@ darwin* | rhapsody*) version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='$libname$release$versuffix$shared_ext $libname$release$major$shared_ext $libname$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' @@ -11377,14 +11574,7 @@ freebsd* | dragonfly*) *) objformat=elf ;; esac fi - # Handle Gentoo/FreeBSD as it was Linux - case $host_vendor in - gentoo) - version_type=linux ;; - *) - version_type=freebsd-$objformat ;; - esac - + version_type=freebsd-$objformat case $version_type in freebsd-elf*) library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' @@ -11396,12 +11586,6 @@ freebsd* | dragonfly*) library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; - linux) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - need_lib_prefix=no - need_version=no - ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -11610,6 +11794,9 @@ fi # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command @@ -11618,7 +11805,7 @@ fi # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -15251,7 +15438,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by attr $as_me 2.4.48, which was +This file was extended by attr $as_me 2.5.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15317,7 +15504,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -attr config.status 2.4.48 +attr config.status 2.5.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -15436,7 +15623,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" # The HP-UX ksh and POSIX shell print the target directory to stdout @@ -16343,29 +16530,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + case $CONFIG_FILES in #( + *\'*) : + eval set x "$CONFIG_FILES" ;; #( + *) : + set x $CONFIG_FILES ;; #( + *) : + ;; +esac shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`$as_dirname -- "$am_mf" || +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$am_mf" : 'X\(//\)[^/]' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -16383,53 +16576,48 @@ $as_echo X"$mf" | q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ + am_filepart=`$as_basename -- "$am_mf" || +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$am_mf" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q } - /^X\(\/\/\)$/{ + /^X\/\(\/\/\)$/{ s//\1/ q } - /^X\(\/\).*/{ + /^X\/\(\/\).*/{ s//\1/ q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + { echo "$as_me:$LINENO: cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles" >&5 + (cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } || am_rc=$? done + if test $am_rc -ne 0; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking). +See \`config.log' for more details" "$LINENO" 5; } + fi + { am_dirpart=; unset am_dirpart;} + { am_filepart=; unset am_filepart;} + { am_mf=; unset am_mf;} + { am_rc=; unset am_rc;} + rm -f conftest-deps.mk } ;; "libtool":C) diff --git a/configure.ac b/configure.ac index 7260ce3..268783d 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ # along with this program. If not, see . # -AC_INIT([attr], [2.4.48], [acl-devel@nongnu.org]) +AC_INIT([attr], [2.5.0], [acl-devel@nongnu.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADER([include/config.h]) @@ -30,6 +30,7 @@ AC_C_CONST AC_TYPE_MODE_T AC_FUNC_ALLOCA AC_FUNC_GCC_VISIBILITY +AC_SYS_LARGEFILE AM_PROG_AR LT_INIT diff --git a/include/attributes.h b/include/attributes.h index 14beb8f..039c817 100644 --- a/include/attributes.h +++ b/include/attributes.h @@ -91,9 +91,9 @@ typedef struct attrlist_ent { /* data from attr_list() */ * Implement a "cursor" for use in successive attr_list() calls. * It provides a way to find the last attribute that was returned in the * last attr_list() call so that we can get the next one without missing - * any. This should be bzero()ed before use and whenever it is desired to + * any. This should be zeroed before use and whenever it is desired to * start over from the beginning of the attribute list. The only valid - * operation on a cursor is to bzero() it. + * operation on a cursor is to zero it. */ typedef struct attrlist_cursor { uint32_t opaque[4]; /* an opaque cookie */ diff --git a/include/config.h.in b/include/config.h.in index 3427c82..1f888f5 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -133,6 +133,17 @@ /* Version number of package */ #undef VERSION +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ +#undef _FILE_OFFSET_BITS + +/* Define for large files, on AIX-style hosts. */ +#undef _LARGE_FILES + /* Define to 1 if on MINIX. */ #undef _MINIX diff --git a/include/walk_tree.h b/include/walk_tree.h index 9f1ec34..b19ec23 100644 --- a/include/walk_tree.h +++ b/include/walk_tree.h @@ -25,6 +25,7 @@ #define WALK_TREE_LOGICAL 0x04 #define WALK_TREE_DEREFERENCE 0x08 #define WALK_TREE_DEREFERENCE_TOPLEVEL 0x10 +#define WALK_TREE_ONE_FILESYSTEM 0x20 #define WALK_TREE_TOPLEVEL 0x100 #define WALK_TREE_SYMLINK 0x200 diff --git a/libattr/libattr.c b/libattr/libattr.c index d6668af..2ebd1c5 100644 --- a/libattr/libattr.c +++ b/libattr/libattr.c @@ -290,7 +290,7 @@ attr_list(const char *path, char *buffer, const int buffersize, int flags, { const char *l; int length, vlength, count = 0; - char lbuf[MAXLISTLEN]; + char lbuf[MAXLISTLEN+1]; char name[MAXNAMELEN+16]; int start_offset, end_offset; @@ -298,14 +298,15 @@ attr_list(const char *path, char *buffer, const int buffersize, int flags, errno = EINVAL; return -1; } - bzero(buffer, sizeof(attrlist_t)); + memset(buffer, 0, sizeof(attrlist_t)); if (flags & ATTR_DONTFOLLOW) - length = llistxattr(path, lbuf, sizeof(lbuf)); + length = llistxattr(path, lbuf, sizeof(lbuf) - 1); else - length = listxattr(path, lbuf, sizeof(lbuf)); + length = listxattr(path, lbuf, sizeof(lbuf) - 1); if (length <= 0) return length; + lbuf[length] = 0; /* not supposed to be necessary */ start_offset = sizeof(attrlist_t); end_offset = buffersize & ~(8-1); /* 8 byte align */ @@ -340,7 +341,7 @@ attr_listf(int fd, char *buffer, const int buffersize, int flags, { const char *l; int length, vlength, count = 0; - char lbuf[MAXLISTLEN]; + char lbuf[MAXLISTLEN+1]; char name[MAXNAMELEN+16]; int start_offset, end_offset; @@ -348,11 +349,12 @@ attr_listf(int fd, char *buffer, const int buffersize, int flags, errno = EINVAL; return -1; } - bzero(buffer, sizeof(attrlist_t)); + memset(buffer, 0, sizeof(attrlist_t)); - length = flistxattr(fd, lbuf, sizeof(lbuf)); + length = flistxattr(fd, lbuf, sizeof(lbuf) - 1); if (length < 0) return length; + lbuf[length] = 0; /* not supposed to be necessary */ start_offset = sizeof(attrlist_t); end_offset = buffersize & ~(8-1); /* 8 byte align */ @@ -391,7 +393,7 @@ attr_single(const char *path, attr_multiop_t *op, int flags) { int r = -1; - errno = -EINVAL; + errno = EINVAL; flags |= op->am_flags; if (op->am_opcode == ATTR_OP_GET) r = attr_get(path, op->am_attrname, op->am_attrvalue, @@ -409,7 +411,7 @@ attr_singlef(const int fd, attr_multiop_t *op, int flags) { int r = -1; - errno = -EINVAL; + errno = EINVAL; flags |= op->am_flags; if (op->am_opcode == ATTR_OP_GET) r = attr_getf(fd, op->am_attrname, op->am_attrvalue, diff --git a/libattr/syscalls.c b/libattr/syscalls.c index 3013aa0..721ad7f 100644 --- a/libattr/syscalls.c +++ b/libattr/syscalls.c @@ -22,6 +22,8 @@ #include "config.h" +#include +#include #include #ifdef HAVE_VISIBILITY_ATTRIBUTE @@ -31,67 +33,67 @@ int libattr_setxattr(const char *path, const char *name, void *value, size_t size, int flags) { - return setxattr(path, name, value, size, flags); + return syscall(__NR_setxattr, path, name, value, size, flags); } int libattr_lsetxattr(const char *path, const char *name, void *value, size_t size, int flags) { - return lsetxattr(path, name, value, size, flags); + return syscall(__NR_lsetxattr, path, name, value, size, flags); } int libattr_fsetxattr(int filedes, const char *name, void *value, size_t size, int flags) { - return fsetxattr(filedes, name, value, size, flags); + return syscall(__NR_fsetxattr, filedes, name, value, size, flags); } ssize_t libattr_getxattr(const char *path, const char *name, void *value, size_t size) { - return getxattr(path, name, value, size); + return syscall(__NR_getxattr, path, name, value, size); } ssize_t libattr_lgetxattr(const char *path, const char *name, void *value, size_t size) { - return lgetxattr(path, name, value, size); + return syscall(__NR_lgetxattr, path, name, value, size); } ssize_t libattr_fgetxattr(int filedes, const char *name, void *value, size_t size) { - return fgetxattr(filedes, name, value, size); + return syscall(__NR_fgetxattr, filedes, name, value, size); } ssize_t libattr_listxattr(const char *path, char *list, size_t size) { - return listxattr(path, list, size); + return syscall(__NR_listxattr, path, list, size); } ssize_t libattr_llistxattr(const char *path, char *list, size_t size) { - return llistxattr(path, list, size); + return syscall(__NR_llistxattr, path, list, size); } ssize_t libattr_flistxattr(int filedes, char *list, size_t size) { - return flistxattr(filedes, list, size); + return syscall(__NR_flistxattr, filedes, list, size); } int libattr_removexattr(const char *path, const char *name) { - return removexattr(path, name); + return syscall(__NR_removexattr, path, name); } int libattr_lremovexattr(const char *path, const char *name) { - return lremovexattr(path, name); + return syscall(__NR_lremovexattr, path, name); } int libattr_fremovexattr(int filedes, const char *name) { - return fremovexattr(filedes, name); + return syscall(__NR_fremovexattr, filedes, name); } #ifdef HAVE_VISIBILITY_ATTRIBUTE diff --git a/libmisc/quote.c b/libmisc/quote.c index 2bb604b..9aa01c0 100644 --- a/libmisc/quote.c +++ b/libmisc/quote.c @@ -1,7 +1,7 @@ /* File: quote.c - Copyright (C) 2003 Andreas Gruenbacher + Copyright (C) 2003 Andreas Gruenbacher This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the diff --git a/libmisc/unquote.c b/libmisc/unquote.c index efee328..05afe32 100644 --- a/libmisc/unquote.c +++ b/libmisc/unquote.c @@ -1,7 +1,7 @@ /* File: unquote.c - Copyright (C) 2003 Andreas Gruenbacher + Copyright (C) 2003 Andreas Gruenbacher This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the diff --git a/libmisc/walk_tree.c b/libmisc/walk_tree.c index 00cea7b..e9a942f 100644 --- a/libmisc/walk_tree.c +++ b/libmisc/walk_tree.c @@ -39,64 +39,76 @@ struct entry_handle { long pos; }; -static struct entry_handle head = { - .next = &head, - .prev = &head, - /* The other fields are unused. */ +struct walk_tree_args { + char path[FILENAME_MAX]; + int walk_flags; + int (*func)(const char *, const struct stat *, int, void *); + void *arg; + int depth; + struct entry_handle dirs; + struct entry_handle *closed; + unsigned int num_dir_handles; + struct stat st; + dev_t dev; }; -static struct entry_handle *closed = &head; -static unsigned int num_dir_handles; -static int walk_tree_visited(dev_t dev, ino_t ino) +static int walk_tree_visited(struct entry_handle *dirs, dev_t dev, ino_t ino) { struct entry_handle *i; - for (i = head.next; i != &head; i = i->next) + for (i = dirs->next; i != dirs; i = i->next) if (i->dev == dev && i->ino == ino) return 1; return 0; } -static int walk_tree_rec(const char *path, int walk_flags, - int (*func)(const char *, const struct stat *, int, - void *), void *arg, int depth) +static int walk_tree_rec(struct walk_tree_args *args) { - int follow_symlinks = (walk_flags & WALK_TREE_LOGICAL) || - ((walk_flags & WALK_TREE_DEREFERENCE) && - !(walk_flags & WALK_TREE_PHYSICAL) && - depth == 0); - int have_dir_stat = 0, flags = walk_flags, err; + int follow_symlinks = (args->walk_flags & WALK_TREE_LOGICAL) || + ((args->walk_flags & WALK_TREE_DEREFERENCE) && + !(args->walk_flags & WALK_TREE_PHYSICAL) && + args->depth == 0); + int have_dir_stat = 0, flags = args->walk_flags, err; struct entry_handle dir; - struct stat st; /* * If (walk_flags & WALK_TREE_PHYSICAL), do not traverse symlinks. * If (walk_flags & WALK_TREE_LOGICAL), traverse all symlinks. * Otherwise, traverse only top-level symlinks. */ - if (depth == 0) + if (args->depth == 0) flags |= WALK_TREE_TOPLEVEL; - if (lstat(path, &st) != 0) - return func(path, NULL, flags | WALK_TREE_FAILED, arg); - if (S_ISLNK(st.st_mode)) { + if (lstat(args->path, &args->st) != 0) + return args->func(args->path, NULL, flags | WALK_TREE_FAILED, + args->arg); + + if (flags & WALK_TREE_ONE_FILESYSTEM) { + if (args->dev == 0) + args->dev = args->st.st_dev; + else if (args->st.st_dev != args->dev) + return 0; + } + + if (S_ISLNK(args->st.st_mode)) { flags |= WALK_TREE_SYMLINK; if ((flags & WALK_TREE_DEREFERENCE) || ((flags & WALK_TREE_TOPLEVEL) && (flags & WALK_TREE_DEREFERENCE_TOPLEVEL))) { - if (stat(path, &st) != 0) - return func(path, NULL, - flags | WALK_TREE_FAILED, arg); - dir.dev = st.st_dev; - dir.ino = st.st_ino; + if (stat(args->path, &args->st) != 0) + return args->func(args->path, NULL, + flags | WALK_TREE_FAILED, + args->arg); + dir.dev = args->st.st_dev; + dir.ino = args->st.st_ino; have_dir_stat = 1; } - } else if (S_ISDIR(st.st_mode)) { - dir.dev = st.st_dev; - dir.ino = st.st_ino; + } else if (S_ISDIR(args->st.st_mode)) { + dir.dev = args->st.st_dev; + dir.ino = args->st.st_ino; have_dir_stat = 1; } - err = func(path, &st, flags, arg); + err = args->func(args->path, &args->st, flags, args->arg); /* * Recurse if WALK_TREE_RECURSIVE and the path is: @@ -104,7 +116,7 @@ static int walk_tree_rec(const char *path, int walk_flags, * a link and follow_symlinks */ if ((flags & WALK_TREE_RECURSIVE) && - ((!(flags & WALK_TREE_SYMLINK) && S_ISDIR(st.st_mode)) || + ((!(flags & WALK_TREE_SYMLINK) && S_ISDIR(args->st.st_mode)) || ((flags & WALK_TREE_SYMLINK) && follow_symlinks))) { struct dirent *entry; @@ -117,24 +129,24 @@ static int walk_tree_rec(const char *path, int walk_flags, * the directory has been visited afterwards. This saves a * system call for each non-directory found. */ - if (have_dir_stat && walk_tree_visited(dir.dev, dir.ino)) + if (have_dir_stat && walk_tree_visited(&args->dirs, dir.dev, dir.ino)) return err; - if (num_dir_handles == 0 && closed->prev != &head) { + if (args->num_dir_handles == 0 && args->closed->prev != &args->dirs) { close_another_dir: /* Close the topmost directory handle still open. */ - closed = closed->prev; - closed->pos = telldir(closed->stream); - closedir(closed->stream); - closed->stream = NULL; - num_dir_handles++; + args->closed = args->closed->prev; + args->closed->pos = telldir(args->closed->stream); + closedir(args->closed->stream); + args->closed->stream = NULL; + args->num_dir_handles++; } - dir.stream = opendir(path); + dir.stream = opendir(args->path); if (!dir.stream) { - if (errno == ENFILE && closed->prev != &head) { + if (errno == ENFILE && args->closed->prev != &args->dirs) { /* Ran out of file descriptors. */ - num_dir_handles = 0; + args->num_dir_handles = 0; goto close_another_dir; } @@ -143,27 +155,27 @@ close_another_dir: * symlink which we didn't follow above. */ if (errno != ENOTDIR && errno != ENOENT) - err += func(path, NULL, flags | - WALK_TREE_FAILED, arg); + err += args->func(args->path, NULL, flags | + WALK_TREE_FAILED, args->arg); return err; } /* See walk_tree_visited() comment above... */ if (!have_dir_stat) { - if (stat(path, &st) != 0) + if (stat(args->path, &args->st) != 0) goto skip_dir; - dir.dev = st.st_dev; - dir.ino = st.st_ino; - if (walk_tree_visited(dir.dev, dir.ino)) + dir.dev = args->st.st_dev; + dir.ino = args->st.st_ino; + if (walk_tree_visited(&args->dirs, dir.dev, dir.ino)) goto skip_dir; } /* Insert into the list of handles. */ - dir.next = head.next; - dir.prev = &head; + dir.next = args->dirs.next; + dir.prev = &args->dirs; dir.prev->next = &dir; dir.next->prev = &dir; - num_dir_handles--; + args->num_dir_handles--; while ((entry = readdir(dir.stream)) != NULL) { char *path_end; @@ -171,40 +183,45 @@ close_another_dir: if (!strcmp(entry->d_name, ".") || !strcmp(entry->d_name, "..")) continue; - path_end = strchr(path, 0); - if ((path_end - path) + strlen(entry->d_name) + 1 >= + path_end = strchr(args->path, 0); + if ((path_end - args->path) + strlen(entry->d_name) + 1 >= FILENAME_MAX) { errno = ENAMETOOLONG; - err += func(path, NULL, - flags | WALK_TREE_FAILED, arg); + err += args->func(args->path, NULL, + flags | WALK_TREE_FAILED, + args->arg); continue; } *path_end++ = '/'; strcpy(path_end, entry->d_name); - err += walk_tree_rec(path, walk_flags, func, arg, - depth + 1); + args->depth++; + err += walk_tree_rec(args); + args->depth--; *--path_end = 0; if (!dir.stream) { /* Reopen the directory handle. */ - dir.stream = opendir(path); + dir.stream = opendir(args->path); if (!dir.stream) - return err + func(path, NULL, flags | - WALK_TREE_FAILED, arg); + return err + args->func(args->path, + NULL, + flags | WALK_TREE_FAILED, + args->arg); seekdir(dir.stream, dir.pos); - closed = closed->next; - num_dir_handles--; + args->closed = args->closed->next; + args->num_dir_handles--; } } /* Remove from the list of handles. */ dir.prev->next = dir.next; dir.next->prev = dir.prev; - num_dir_handles++; + args->num_dir_handles++; skip_dir: if (closedir(dir.stream) != 0) - err += func(path, NULL, flags | WALK_TREE_FAILED, arg); + err += args->func(args->path, NULL, + flags | WALK_TREE_FAILED, args->arg); } return err; } @@ -213,21 +230,30 @@ int walk_tree(const char *path, int walk_flags, unsigned int num, int (*func)(const char *, const struct stat *, int, void *), void *arg) { - char path_copy[FILENAME_MAX]; + struct walk_tree_args args; - num_dir_handles = num; - if (num_dir_handles < 1) { + args.num_dir_handles = num; + if (args.num_dir_handles < 1) { struct rlimit rlimit; - num_dir_handles = 1; + args.num_dir_handles = 1; if (getrlimit(RLIMIT_NOFILE, &rlimit) == 0 && rlimit.rlim_cur >= 2) - num_dir_handles = rlimit.rlim_cur / 2; + args.num_dir_handles = rlimit.rlim_cur / 2; } + args.dirs.next = &args.dirs; + args.dirs.prev = &args.dirs; + args.closed = &args.dirs; if (strlen(path) >= FILENAME_MAX) { errno = ENAMETOOLONG; return func(path, NULL, WALK_TREE_FAILED, arg); } - strcpy(path_copy, path); - return walk_tree_rec(path_copy, walk_flags, func, arg, 0); + strcpy(args.path, path); + args.walk_flags = walk_flags; + args.func = func; + args.arg = arg; + args.depth = 0; + args.dev = 0; + + return walk_tree_rec(&args); } diff --git a/m4/libtool.m4 b/m4/libtool.m4 index ae7c906..a644432 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1417,10 +1417,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*linux*|powerpc64le-*linux*) + powerpcle-*linux*) LD="${LD-ld} -m elf64lppc" ;; - powerpc-*linux*|powerpc64-*linux*) + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1708,11 +1708,6 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; - amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@ -2641,11 +2636,11 @@ darwin* | rhapsody*) version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='$libname$release$versuffix$shared_ext $libname$release$major$shared_ext $libname$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' @@ -2671,14 +2666,7 @@ freebsd* | dragonfly*) *) objformat=elf ;; esac fi - # Handle Gentoo/FreeBSD as it was Linux - case $host_vendor in - gentoo) - version_type=linux ;; - *) - version_type=freebsd-$objformat ;; - esac - + version_type=freebsd-$objformat case $version_type in freebsd-elf*) library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' @@ -2690,12 +2678,6 @@ freebsd* | dragonfly*) library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; - linux) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - need_lib_prefix=no - need_version=no - ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -2885,6 +2867,9 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command @@ -2893,7 +2878,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on diff --git a/man/Makemodule.am b/man/Makemodule.am index 860654f..c3c64ad 100644 --- a/man/Makemodule.am +++ b/man/Makemodule.am @@ -21,5 +21,4 @@ install-data-hook: echo $(LN_S) $$dst $$ln; \ $(LN_S) $$dst $$ln; \ done; \ - done; \ - rmdir */ 2>/dev/null || : + done diff --git a/man/man1/attr.1 b/man/man1/attr.1 index 392464c..84e80de 100644 --- a/man/man1/attr.1 +++ b/man/man1/attr.1 @@ -193,13 +193,22 @@ program will. The list option present in the IRIX version of this command is not supported. .I getfattr provides a mechanism to retrieve all of the attribute names. +.SH AUTHOR +Andreas Gruenbacher, +.RI < andreas.gruenbacher@gmail.com > +and the SGI XFS development team, +.RI < linux-xfs@oss.sgi.com >. +.P +Please send your bug reports or comments to +.RI < https://savannah.nongnu.org/bugs/?group=attr > +or +.RI < acl-devel@nongnu.org >. .SH "SEE ALSO" -getfattr(1), -setfattr(1), -attr_get(3), -attr_set(3), -attr_multi(3), -attr_remove(3), -attr(5), -and -xfsdump(8). +.BR getfattr (1), +.BR setfattr (1), +.BR attr_get (3), +.BR attr_set (3), +.BR attr_multi (3), +.BR attr_remove (3), +.BR attr (5), +.BR xfsdump (8) diff --git a/man/man1/getfattr.1 b/man/man1/getfattr.1 index 08aa374..95da3fb 100644 --- a/man/man1/getfattr.1 +++ b/man/man1/getfattr.1 @@ -35,7 +35,8 @@ For each file, .B getfattr displays the file name, and the set of extended attribute names (and optionally values) which -are associated with that file. +are associated with that file. Per default only attributes in the user +namespace are displayed, see \f3\-m\f1. .PP The output format of .B "getfattr \-d" @@ -65,8 +66,7 @@ pairs associated with the specified file. Dump the value of the named extended attribute. .TP .BR \-d ", " \-\-dump -Dump the values of all extended attributes associated with -.IR pathname . +Dump the values of all matched extended attributes. .TP .BR \-e " \f2en\f1, " \-\-encoding "=\f2en\f1" Encode values after retrieving them. @@ -74,7 +74,7 @@ Valid values of .I en are "text", "hex", and "base64". Values encoded as text strings are enclosed in double quotes ("), -while strings encoded as hexidecimal and base64 are prefixed with +while strings encoded as hexadecimal and base64 are prefixed with 0x and 0s, respectively. .TP .BR \-h ", " \-\-no-dereference @@ -129,10 +129,14 @@ All remaining parameters are interpreted as file names, even if they start with a dash character. .SH AUTHOR Andreas Gruenbacher, -.RI < a.gruenbacher@bestbits.at > +.RI < andreas.gruenbacher@gmail.com > and the SGI XFS development team, .RI < linux-xfs@oss.sgi.com >. .P -Please send your bug reports or comments to these addresses. +Please send your bug reports or comments to +.RI < https://savannah.nongnu.org/bugs/?group=attr > +or +.RI < acl-devel@nongnu.org >. .SH "SEE ALSO" -setfattr(1), and attr(5). +.BR setfattr (1), +.BR attr (5) diff --git a/man/man1/setfattr.1 b/man/man1/setfattr.1 index 62055fd..50dd58f 100644 --- a/man/man1/setfattr.1 +++ b/man/man1/setfattr.1 @@ -94,12 +94,28 @@ Print help explaining the command line options. End of command line options. All remaining parameters are interpreted as file names, even if they start with a dash character. +.SH EXAMPLES +Add extended attribute to user namespace: +.PP +.nf +.B "$ setfattr -n user.foo -v bar file.txt +.fi +.PP +To add md5sum of the file as an extended attribute: +.PP +.nf +.B "# setfattr -n trusted.md5sum -v d41d8cd98f00b204e00998ecf8427e file.txt +.fi .SH AUTHOR Andreas Gruenbacher, -.RI < a.gruenbacher@bestbits.at > +.RI < andreas.gruenbacher@gmail.com > and the SGI XFS development team, .RI < linux-xfs@oss.sgi.com >. .P -Please send your bug reports or comments to these addresses. +Please send your bug reports or comments to +.RI < https://savannah.nongnu.org/bugs/?group=attr > +or +.RI < acl-devel@nongnu.org >. .SH "SEE ALSO" -getfattr(1), and attr(5). +.BR getfattr (1), +.BR attr (5) diff --git a/man/man3/attr_get.3 b/man/man3/attr_get.3 index 7908340..a3352e2 100644 --- a/man/man3/attr_get.3 +++ b/man/man3/attr_get.3 @@ -164,7 +164,7 @@ filesystem object. The value of the given attribute is too large to fit into the buffer. The integer that the .I valuelength -argument points to has been modified to show the actual numnber +argument points to has been modified to show the actual number of bytes that would be required to store the value of that attribute. .TP .SM @@ -197,5 +197,4 @@ is set appropriately. .BR attr_list (3), .BR attr_multi (3), .BR attr_remove (3), -and -.BR attr_set (3). +.BR attr_set (3) diff --git a/man/man3/attr_list.3 b/man/man3/attr_list.3 index be192d8..42ab92d 100644 --- a/man/man3/attr_list.3 +++ b/man/man3/attr_list.3 @@ -27,7 +27,7 @@ attr_list, attr_listf \- list the names of the user attributes of a filesystem o .PP .sp .nf -.B #include +.B #include .sp .B "int attr_list (const char \(**path, char \(**buffer, " .B " const int buffersize, int flags," @@ -281,5 +281,4 @@ is set to indicate the error. .BR attr (1), .BR attr_multi (3), .BR attr_remove (3), -and -.BR attr_set (3). +.BR attr_set (3) diff --git a/man/man3/attr_multi.3 b/man/man3/attr_multi.3 index db0381c..e685f00 100644 --- a/man/man3/attr_multi.3 +++ b/man/man3/attr_multi.3 @@ -289,5 +289,4 @@ call itself, not the result of any of the sub-operations. .BR attr_get (3), .BR attr_list (3), .BR attr_remove (3), -and -.BR attr_set (3). +.BR attr_set (3) diff --git a/man/man3/attr_remove.3 b/man/man3/attr_remove.3 index 6fd6a3d..d06d2ad 100644 --- a/man/man3/attr_remove.3 +++ b/man/man3/attr_remove.3 @@ -167,5 +167,4 @@ is set appropriately. .BR attr_get (3), .BR attr_list (3), .BR attr_multi (3), -and -.BR attr_set (3). +.BR attr_set (3) diff --git a/man/man3/attr_set.3 b/man/man3/attr_set.3 index 9f49c48..d2ebe7b 100644 --- a/man/man3/attr_set.3 +++ b/man/man3/attr_set.3 @@ -227,5 +227,4 @@ is set appropriately. .BR attr_get (3), .BR attr_list (3), .BR attr_multi (3), -and -.BR attr_remove (3). +.BR attr_remove (3) diff --git a/po/POTFILES.in b/po/POTFILES.in index a4a12c2..862fdb1 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,23 +1,23 @@ # updated automatically by po/update-potfiles -include/libattr.h -include/nls.h -include/attributes.h include/error_context.h include/misc.h +include/nls.h include/walk_tree.h -libattr/attr_copy_action.c -libattr/attr_copy_file.c +include/libattr.h +include/attributes.h libattr/libattr.h +libattr/attr_copy_action.c libattr/attr_copy_check.c -libattr/libattr.c -libattr/syscalls.c libattr/attr_copy_fd.c -libmisc/unquote.c -libmisc/walk_tree.c -libmisc/next_line.c +libattr/attr_copy_file.c +libattr/syscalls.c +libattr/libattr.c libmisc/high_water_alloc.c +libmisc/next_line.c libmisc/quote.c -tools/attr.c +libmisc/unquote.c +libmisc/walk_tree.c tools/setfattr.c tools/getfattr.c +tools/attr.c diff --git a/po/attr.pot b/po/attr.pot index 3ec4ef9..61dd275 100644 --- a/po/attr.pot +++ b/po/attr.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: attr 2.4.48\n" +"Project-Id-Version: attr 2.5.0\n" "Report-Msgid-Bugs-To: acl-devel@nongnu.org\n" -"POT-Creation-Date: 2018-06-18 22:17-0400\n" +"POT-Creation-Date: 2021-03-11 19:52+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,100 +17,30 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #: libattr/attr_copy_fd.c:80 libattr/attr_copy_fd.c:95 +#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #, c-format msgid "listing attributes of %s" msgstr "" -#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 #: libattr/attr_copy_fd.c:115 libattr/attr_copy_fd.c:132 +#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 #, c-format msgid "getting attribute %s of %s" msgstr "" -#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 #: libattr/attr_copy_fd.c:145 libattr/attr_copy_fd.c:164 +#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 #, c-format msgid "setting attributes for %s" msgstr "" -#: libattr/attr_copy_file.c:150 libattr/attr_copy_fd.c:152 +#: libattr/attr_copy_fd.c:152 libattr/attr_copy_file.c:150 #, c-format msgid "setting attribute %s for %s" msgstr "" -#: tools/attr.c:49 -#, c-format -msgid "" -"Usage: %s [-LRSq] -s attrname [-V attrvalue] pathname # set value\n" -" %s [-LRSq] -g attrname pathname # get value\n" -" %s [-LRSq] -r attrname pathname # remove attr\n" -" %s [-LRq] -l pathname # list attrs \n" -" -s reads a value from stdin and -g writes a value to stdout\n" -msgstr "" - -#: tools/attr.c:87 tools/attr.c:104 tools/attr.c:113 tools/attr.c:122 -#, c-format -msgid "Only one of -s, -g, -r, or -l allowed\n" -msgstr "" - -#: tools/attr.c:95 tools/attr.c:161 -#, c-format -msgid "-V only allowed with -s\n" -msgstr "" - -#: tools/attr.c:140 -#, c-format -msgid "Unrecognized option: %c\n" -msgstr "" - -#: tools/attr.c:147 -#, c-format -msgid "A filename to operate on is required\n" -msgstr "" - -#: tools/attr.c:179 -#, c-format -msgid "Could not set \"%s\" for %s\n" -msgstr "" - -#: tools/attr.c:184 -#, c-format -msgid "Attribute \"%s\" set to a %d byte value for %s:\n" -msgstr "" - -#: tools/attr.c:202 -#, c-format -msgid "Could not get \"%s\" for %s\n" -msgstr "" - -#: tools/attr.c:207 -#, c-format -msgid "Attribute \"%s\" had a %d byte value for %s:\n" -msgstr "" - -#: tools/attr.c:220 -#, c-format -msgid "Could not remove \"%s\" for %s\n" -msgstr "" - -#: tools/attr.c:238 -#, c-format -msgid "Could not list %s\n" -msgstr "" - -#: tools/attr.c:248 -#, c-format -msgid "Attribute \"%s\" has a %d byte value for %s\n" -msgstr "" - -#: tools/attr.c:260 -#, c-format -msgid "At least one of -s, -g, -r, or -l is required\n" -msgstr "" - -#: tools/setfattr.c:75 tools/getfattr.c:99 +#: tools/setfattr.c:75 tools/getfattr.c:100 msgid "No such attribute" msgstr "" @@ -129,7 +59,7 @@ msgstr "" msgid "%s %s -- set extended attributes\n" msgstr "" -#: tools/setfattr.c:181 tools/getfattr.c:380 +#: tools/setfattr.c:181 tools/getfattr.c:385 #, c-format msgid "Usage: %s %s\n" msgstr "" @@ -160,17 +90,17 @@ msgid "" "Try `%s --help' for more information.\n" msgstr "" -#: tools/getfattr.c:260 +#: tools/getfattr.c:265 #, c-format msgid "%s: Removing leading '/' from absolute path names\n" msgstr "" -#: tools/getfattr.c:378 +#: tools/getfattr.c:383 #, c-format msgid "%s %s -- get extended attributes\n" msgstr "" -#: tools/getfattr.c:383 +#: tools/getfattr.c:388 #, c-format msgid "" " -n, --name=name get the named extended attribute value\n" @@ -179,6 +109,7 @@ msgid "" " --match=pattern only get attributes with names matching pattern\n" " --only-values print the bare values only\n" " -h, --no-dereference do not dereference symbolic links\n" +" --one-file-system skip files on different filesystems\n" " --absolute-names don't strip leading '/' in pathnames\n" " -R, --recursive recurse into subdirectories\n" " -L, --logical logical walk, follow symbolic links\n" @@ -187,14 +118,84 @@ msgid "" " --help this help text\n" msgstr "" -#: tools/getfattr.c:479 +#: tools/getfattr.c:489 #, c-format msgid "%s: invalid regular expression \"%s\"\n" msgstr "" -#: tools/getfattr.c:493 +#: tools/getfattr.c:503 #, c-format msgid "" "Usage: %s %s\n" "Try `%s --help' for more information.\n" msgstr "" + +#: tools/attr.c:49 +#, c-format +msgid "" +"Usage: %s [-LRSq] -s attrname [-V attrvalue] pathname # set value\n" +" %s [-LRSq] -g attrname pathname # get value\n" +" %s [-LRSq] -r attrname pathname # remove attr\n" +" %s [-LRq] -l pathname # list attrs \n" +" -s reads a value from stdin and -g writes a value to stdout\n" +msgstr "" + +#: tools/attr.c:87 tools/attr.c:104 tools/attr.c:113 tools/attr.c:122 +#, c-format +msgid "Only one of -s, -g, -r, or -l allowed\n" +msgstr "" + +#: tools/attr.c:95 tools/attr.c:161 +#, c-format +msgid "-V only allowed with -s\n" +msgstr "" + +#: tools/attr.c:140 +#, c-format +msgid "Unrecognized option: %c\n" +msgstr "" + +#: tools/attr.c:147 +#, c-format +msgid "A filename to operate on is required\n" +msgstr "" + +#: tools/attr.c:179 +#, c-format +msgid "Could not set \"%s\" for %s\n" +msgstr "" + +#: tools/attr.c:184 +#, c-format +msgid "Attribute \"%s\" set to a %d byte value for %s:\n" +msgstr "" + +#: tools/attr.c:202 +#, c-format +msgid "Could not get \"%s\" for %s\n" +msgstr "" + +#: tools/attr.c:207 +#, c-format +msgid "Attribute \"%s\" had a %d byte value for %s:\n" +msgstr "" + +#: tools/attr.c:220 +#, c-format +msgid "Could not remove \"%s\" for %s\n" +msgstr "" + +#: tools/attr.c:238 +#, c-format +msgid "Could not list %s\n" +msgstr "" + +#: tools/attr.c:248 +#, c-format +msgid "Attribute \"%s\" has a %d byte value for %s\n" +msgstr "" + +#: tools/attr.c:260 +#, c-format +msgid "At least one of -s, -g, -r, or -l is required\n" +msgstr "" diff --git a/po/cs.gmo b/po/cs.gmo index cb136fc1ecf8faeecbb818cfc1ebe70ffda27002..eed26c628a781e56da1a0e474540db812b629178 100644 GIT binary patch delta 662 zcmYk)KP&@r6u|L!)fV-qRn^wNs+@|np{d3oLJ*6g2C2G zSR^bWF^R<>A|?qD2H$sggO~h#?zzkF_ul*UJ-eT>o}&H(AqKqliy79V!5^aP6Y0Qh z97fCY2=nAuIEx=RiG?PS5!}Ee?xF5?j1zc`IsC#b+llFSU#wssFLrSd8(w~nUF3H- ziqEJUhXQV4CeD)=u!uXjO7SPC`+W!9?_)k+_Lk=pp7gUv7BNjebx^8E+R! zVHvga8kVq*deA-A=`c#wdL@lcx3dczB7Z=g;3x8#(=9bff~CRaCBllcEbUwm=WHi* zL>f#@n4p9;`4`-qcnl zM+hV&R0%|Th>8GTkaDnch~R=!AvV6jg##C)9&+G-iUfZE65qFLyD_PG()hD8yYJ1L z@0;hFC;mLsxH~#@OTeDTcn)J|pAe_Pdm!7V`-ONE{0#gB<137ln1=^4-UO#H{|=l7 ze+TEl@q-xPRqz;i9h?Affm7i3;EO^u#2cFk z{t9y7e?U%f?2r%_!Ex{%A6Wvr3P^X`~?o38cWEAa;L_n;7wQoC@vns zV0$b>`pfqVVhB`RplSjlHw2OvD2;&Hsr<)5L77b$nlK}nS$>`@%a;{3&p(~lM9V6o z$Wg?LHmPfo@@+iGC<@&|HBuByuc}56z~%sUwG#Av(}xB}ke)Zt*RZoJ4zT%K}{x|SmyQm!D4I(IgA8e!Nht0JSKGan#D75dcRMeTdF z^eDZ&4XwD5lOD@Z>Vb`^z7#rHp`L)qdn-FmLlEM)_yJ`1HA+Clw^S@H=QHb=X4z| zOe*0O-aAyqYG~Z}egPZVlEU|qCQ~igE>6N`XTkmnsfm1X6?!A>2*d>uStKampljUU7u9j3UzsZs;YuZ`;lI7T0{UXoL=o~zf zuL|j_tbef5>7WKGnzc||M}Kv!p0rFkX;Mk~-E3-k%t~(2Y2Sem$+|Bot~olcmY@*( z^2ymOYi}RLwE$8z6>Z;uq}#VSu&!|8OHg)DGjTK@@-~g9(t~!psGO{mw#%~4o@@{5 zBwuM8eI(l-L!-}sIDE8GR3@VGk6#;IE$FblQDJ=tG?Kx$)qvH-Z4R_8?NFJd*?exuh>efbaSs-;@pE%wLSd;UIsdSY~YC=-W&xd3ma6~Mc? nOOi}k``b5?R?q1H{e^2pQL>JI5}YE?@%C-Iwz+la>cM{jX}D5E diff --git a/po/cs.po b/po/cs.po index a5fae2b..e133c88 100644 --- a/po/cs.po +++ b/po/cs.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: attr 2.4.41\n" "Report-Msgid-Bugs-To: acl-devel@nongnu.org\n" -"POT-Creation-Date: 2018-06-18 22:17-0400\n" +"POT-Creation-Date: 2021-03-11 19:52+0100\n" "PO-Revision-Date: 2008-04-09 16:30+0200\n" "Last-Translator: Petr Pisar \n" "Language-Team: Czech \n" @@ -28,106 +28,30 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #: libattr/attr_copy_fd.c:80 libattr/attr_copy_fd.c:95 +#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #, c-format msgid "listing attributes of %s" msgstr "vypisuji atribut souboru %s" -#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 #: libattr/attr_copy_fd.c:115 libattr/attr_copy_fd.c:132 +#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 #, c-format msgid "getting attribute %s of %s" msgstr "získávám atribut %s souboru %s" -#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 #: libattr/attr_copy_fd.c:145 libattr/attr_copy_fd.c:164 +#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 #, c-format msgid "setting attributes for %s" msgstr "nastavuji atributy souboru %s" -#: libattr/attr_copy_file.c:150 libattr/attr_copy_fd.c:152 +#: libattr/attr_copy_fd.c:152 libattr/attr_copy_file.c:150 #, c-format msgid "setting attribute %s for %s" msgstr "nastavuji atribut %s souboru %s" -#: tools/attr.c:49 -#, c-format -msgid "" -"Usage: %s [-LRSq] -s attrname [-V attrvalue] pathname # set value\n" -" %s [-LRSq] -g attrname pathname # get value\n" -" %s [-LRSq] -r attrname pathname # remove attr\n" -" %s [-LRq] -l pathname # list attrs \n" -" -s reads a value from stdin and -g writes a value to stdout\n" -msgstr "" -"Užití: %s [-LRSq] -s název_atributu [-V hodnota] cesta # nastaví hodnotu\n" -" %s [-LRSq] -g název_atributu cesta # zjistí hodnotu\n" -" %s [-LRSq] -r název_atributu cesta # odstraní atribut\n" -" %s [-LRq] -l cesta # vypíše atributy\n" -" -s čte hodnotu ze standardního vstupu a -g ji vypisuje na standardní " -"výstup.\n" - -#: tools/attr.c:87 tools/attr.c:104 tools/attr.c:113 tools/attr.c:122 -#, c-format -msgid "Only one of -s, -g, -r, or -l allowed\n" -msgstr "Povolen je právě jeden z přepínačů -s, -g, -r nebo -l\n" - -#: tools/attr.c:95 tools/attr.c:161 -#, c-format -msgid "-V only allowed with -s\n" -msgstr "-V je povoleno sej s -s\n" - -#: tools/attr.c:140 -#, c-format -msgid "Unrecognized option: %c\n" -msgstr "Nerozpoznaný přepínač: %c\n" - -#: tools/attr.c:147 -#, c-format -msgid "A filename to operate on is required\n" -msgstr "Jméno souboru, se kterým se bude pracovat, je vyžadováno.\n" - -#: tools/attr.c:179 -#, c-format -msgid "Could not set \"%s\" for %s\n" -msgstr "Souboru %2$s nelze nastavit atribut „%1$s“\n" - -#: tools/attr.c:184 -#, c-format -msgid "Attribute \"%s\" set to a %d byte value for %s:\n" -msgstr "Atributu „%1$s“ souboru %3$s nastavena %2$dbajtová hodnota:\n" - -#: tools/attr.c:202 -#, c-format -msgid "Could not get \"%s\" for %s\n" -msgstr "Ze souboru %2$s nelze získat atribut „%1$s“\n" - -#: tools/attr.c:207 -#, c-format -msgid "Attribute \"%s\" had a %d byte value for %s:\n" -msgstr "Atribut „%1$s“ souboru %3$s měl %2$dbajtovou hodnotu:\n" - -#: tools/attr.c:220 -#, c-format -msgid "Could not remove \"%s\" for %s\n" -msgstr "Ze souboru %2$s nelze odstranit atribut „%1$s“\n" - -#: tools/attr.c:238 -#, fuzzy, c-format -msgid "Could not list %s\n" -msgstr "Ze souboru %2$s nelze vypsat atribut „%1$s“\n" - -#: tools/attr.c:248 -#, c-format -msgid "Attribute \"%s\" has a %d byte value for %s\n" -msgstr "Atribut „%1$s“ souboru %3$s má %2$dbajtovou hodnotu\n" - -#: tools/attr.c:260 -#, c-format -msgid "At least one of -s, -g, -r, or -l is required\n" -msgstr "Alespoň jeden z přepínačů -s, -g, -r nebo -l je vyžadován\n" - -#: tools/setfattr.c:75 tools/getfattr.c:99 +#: tools/setfattr.c:75 tools/getfattr.c:100 msgid "No such attribute" msgstr "Takový atribut neexistuje" @@ -147,7 +71,7 @@ msgstr "" msgid "%s %s -- set extended attributes\n" msgstr "%s %s – nastaví rozšířené atributy\n" -#: tools/setfattr.c:181 tools/getfattr.c:380 +#: tools/setfattr.c:181 tools/getfattr.c:385 #, c-format msgid "Usage: %s %s\n" msgstr "Použití: %s %s\n" @@ -188,18 +112,18 @@ msgstr "" " %s %s\n" "Pro více informací zkuste „%s --help“.\n" -#: tools/getfattr.c:260 +#: tools/getfattr.c:265 #, c-format msgid "%s: Removing leading '/' from absolute path names\n" msgstr "%s: Odstraňuji úvodní „/“ z absolutní cesty\n" -#: tools/getfattr.c:378 +#: tools/getfattr.c:383 #, c-format msgid "%s %s -- get extended attributes\n" msgstr "%s %s – získá rozšířené atributy\n" -#: tools/getfattr.c:383 -#, c-format +#: tools/getfattr.c:388 +#, fuzzy, c-format msgid "" " -n, --name=name get the named extended attribute value\n" " -d, --dump get all extended attribute values\n" @@ -207,6 +131,7 @@ msgid "" " --match=pattern only get attributes with names matching pattern\n" " --only-values print the bare values only\n" " -h, --no-dereference do not dereference symbolic links\n" +" --one-file-system skip files on different filesystems\n" " --absolute-names don't strip leading '/' in pathnames\n" " -R, --recursive recurse into subdirectories\n" " -L, --logical logical walk, follow symbolic links\n" @@ -228,12 +153,12 @@ msgstr "" " --version vypíše verzi a skončí\n" " --help text této nápovědy\n" -#: tools/getfattr.c:479 +#: tools/getfattr.c:489 #, c-format msgid "%s: invalid regular expression \"%s\"\n" msgstr "%s: chybný regulární výraz „%s“\n" -#: tools/getfattr.c:493 +#: tools/getfattr.c:503 #, c-format msgid "" "Usage: %s %s\n" @@ -241,3 +166,79 @@ msgid "" msgstr "" "Použití: %s %s\n" "Pro více informací zkuste „%s --help“.\n" + +#: tools/attr.c:49 +#, c-format +msgid "" +"Usage: %s [-LRSq] -s attrname [-V attrvalue] pathname # set value\n" +" %s [-LRSq] -g attrname pathname # get value\n" +" %s [-LRSq] -r attrname pathname # remove attr\n" +" %s [-LRq] -l pathname # list attrs \n" +" -s reads a value from stdin and -g writes a value to stdout\n" +msgstr "" +"Užití: %s [-LRSq] -s název_atributu [-V hodnota] cesta # nastaví hodnotu\n" +" %s [-LRSq] -g název_atributu cesta # zjistí hodnotu\n" +" %s [-LRSq] -r název_atributu cesta # odstraní atribut\n" +" %s [-LRq] -l cesta # vypíše atributy\n" +" -s čte hodnotu ze standardního vstupu a -g ji vypisuje na standardní " +"výstup.\n" + +#: tools/attr.c:87 tools/attr.c:104 tools/attr.c:113 tools/attr.c:122 +#, c-format +msgid "Only one of -s, -g, -r, or -l allowed\n" +msgstr "Povolen je právě jeden z přepínačů -s, -g, -r nebo -l\n" + +#: tools/attr.c:95 tools/attr.c:161 +#, c-format +msgid "-V only allowed with -s\n" +msgstr "-V je povoleno sej s -s\n" + +#: tools/attr.c:140 +#, c-format +msgid "Unrecognized option: %c\n" +msgstr "Nerozpoznaný přepínač: %c\n" + +#: tools/attr.c:147 +#, c-format +msgid "A filename to operate on is required\n" +msgstr "Jméno souboru, se kterým se bude pracovat, je vyžadováno.\n" + +#: tools/attr.c:179 +#, c-format +msgid "Could not set \"%s\" for %s\n" +msgstr "Souboru %2$s nelze nastavit atribut „%1$s“\n" + +#: tools/attr.c:184 +#, c-format +msgid "Attribute \"%s\" set to a %d byte value for %s:\n" +msgstr "Atributu „%1$s“ souboru %3$s nastavena %2$dbajtová hodnota:\n" + +#: tools/attr.c:202 +#, c-format +msgid "Could not get \"%s\" for %s\n" +msgstr "Ze souboru %2$s nelze získat atribut „%1$s“\n" + +#: tools/attr.c:207 +#, c-format +msgid "Attribute \"%s\" had a %d byte value for %s:\n" +msgstr "Atribut „%1$s“ souboru %3$s měl %2$dbajtovou hodnotu:\n" + +#: tools/attr.c:220 +#, c-format +msgid "Could not remove \"%s\" for %s\n" +msgstr "Ze souboru %2$s nelze odstranit atribut „%1$s“\n" + +#: tools/attr.c:238 +#, fuzzy, c-format +msgid "Could not list %s\n" +msgstr "Ze souboru %2$s nelze vypsat atribut „%1$s“\n" + +#: tools/attr.c:248 +#, c-format +msgid "Attribute \"%s\" has a %d byte value for %s\n" +msgstr "Atribut „%1$s“ souboru %3$s má %2$dbajtovou hodnotu\n" + +#: tools/attr.c:260 +#, c-format +msgid "At least one of -s, -g, -r, or -l is required\n" +msgstr "Alespoň jeden z přepínačů -s, -g, -r nebo -l je vyžadován\n" diff --git a/po/de.gmo b/po/de.gmo index 1ab2d9917e5fc172d306d9e363713a7ce3ca50fa..eac3401f1bcd91916fc3283d03fc58ea918c8f49 100644 GIT binary patch delta 2355 zcma)-PiP!f9LL`#*-g9IO=FsxHffp{H!Zfw);3M8R#p=+pj6V(;(7=von+qb4o+s) znYURZ!hpT$q0mRY=%GCnJSjE@5n7}TD0os46rlkRo}_3lf>6cp@6F71lQ!B%Wd>ZrNp3tFL za18T{;B(lY-Nwxz_zy@P?%Ty!4ty4*P|tz*V*!4Sf|o(s;A;>*ur+WRTn8t?2|Nto z_`4vbv<2ZI{Xvk@`~pZ3JqMDV4j<4MNVOJ*|BjmVE9y+_Xw1;R#2EOWJ6~X)PwydZMq(7m~}0;7f*G6WlGS&X$3pH0SxZ zMtMH(iA8rw6dYqwK$k|iLRKSWwM16>-9o4kTGjkm(eO!L4Yl;BY`RxXw;tN#317ON zD3FJtd9c`I?NSEuTBC1@8JCpva>ylTiw80#FT#OP&&S&wFk@_mW>??iSna=a{Lu(gKwNE%_jwdp2D za1_L>$>(_EW)^9Z;}l4(;qyoZQSgLeA{J5Ul{|M5IWsMXBX39yuX~n63C9M~rN?ef zrde6>_MS`aS69Aif3Ico!3KEAkirrWs+CBLs-Nq%uthLiy)iF5zv@{|SvbmV?O!RS z$8<-`OjEI&*myFkH@8ag&&I6m2@?)dd3Lq5fmf1g~2H$E%>Dgl!8a4(>y` zM{l#?Se%mLSPK=&(LolJ8?P^^Qyt%{-#YqtLY<$DI!Pc}#=KC;%$LJc7Mh42o~}v@ z8E~4~iK8ENKYf-tukK`at3NZM3*{T`g{0`dn#rC&I$iTPRR33r3(q!c^D?bI%@*Po z`!#z){hWO6lwk^8J8{X?Ah=WzN}(G!7B_+}{O_F}IQN@#XXZZ6zu7NV2v zB|npWy_zui|C=h~~SW2k(<@A}6Q^um{KR4u`yjI~;gD6&>i!;piZnILvpu zSi+vH$T?|>+~mRBzJcb&D>NH!;TZnG0W5KvlQ@H>6AdijTQvWFKo_@h9KWIIXm5M; ze+B!gXVG-Hfe!l%>)W8Ck|vqA3)3m#vUYK>-RZy_$pvk28979njZJWAp#ipYc{4#| zBJ6n7jGpJ$FM7UTuP*3jBG=l8EjX=O{JNu$+8R2PTGrpGir!97>HGA!c4bQXB6C)g z+4VCs{=~!i>f*fzb$_zDI6vxzL9y%yBYv^$h2d!NiXW7Mp!F&HGN!e-+j^G^9bI#u g>(h=Eoy*_Q@A+$*D7ZRZn9%LQRh{k(G}it2KXTDk`~Uy| diff --git a/po/de.po b/po/de.po index 602e63e..29bb287 100644 --- a/po/de.po +++ b/po/de.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: attr-2.2.0\n" "Report-Msgid-Bugs-To: acl-devel@nongnu.org\n" -"POT-Creation-Date: 2018-06-18 22:17-0400\n" +"POT-Creation-Date: 2021-03-11 19:52+0100\n" "PO-Revision-Date: 2003-01-23 01:31+0100\n" "Last-Translator: Andreas Grünbacher \n" "Language-Team: \n" @@ -29,105 +29,30 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #: libattr/attr_copy_fd.c:80 libattr/attr_copy_fd.c:95 +#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #, c-format msgid "listing attributes of %s" msgstr "Auslisten von Attributen von %s" -#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 #: libattr/attr_copy_fd.c:115 libattr/attr_copy_fd.c:132 +#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 #, c-format msgid "getting attribute %s of %s" msgstr "Lesen von Attribut %s von %s" -#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 #: libattr/attr_copy_fd.c:145 libattr/attr_copy_fd.c:164 +#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 #, c-format msgid "setting attributes for %s" msgstr "Setzen von Attributen für %s" -#: libattr/attr_copy_file.c:150 libattr/attr_copy_fd.c:152 +#: libattr/attr_copy_fd.c:152 libattr/attr_copy_file.c:150 #, c-format msgid "setting attribute %s for %s" msgstr "Setzen von Attribut %s für %s" -#: tools/attr.c:49 -#, fuzzy, c-format -msgid "" -"Usage: %s [-LRSq] -s attrname [-V attrvalue] pathname # set value\n" -" %s [-LRSq] -g attrname pathname # get value\n" -" %s [-LRSq] -r attrname pathname # remove attr\n" -" %s [-LRq] -l pathname # list attrs \n" -" -s reads a value from stdin and -g writes a value to stdout\n" -msgstr "" -"Verwendung: %s [-LRq] -s attrname [-V attrvalue] pfadname # Wert setzen\n" -" %s [-LRq] -g attrname pfadname # Wert lesen\n" -" %s [-LRq] -r attrname pfadname # Wert entfernen\n" -" -s liest einen Wert von stdin, -g schreibt einen Wert auf " -"stdout\n" - -#: tools/attr.c:87 tools/attr.c:104 tools/attr.c:113 tools/attr.c:122 -#, fuzzy, c-format -msgid "Only one of -s, -g, -r, or -l allowed\n" -msgstr "Nur eine der Optionen -s, -g, oder -r erlaubt\n" - -#: tools/attr.c:95 tools/attr.c:161 -#, c-format -msgid "-V only allowed with -s\n" -msgstr "-V nur mit -s erlaubt\n" - -#: tools/attr.c:140 -#, c-format -msgid "Unrecognized option: %c\n" -msgstr "Unbekannte Option: %c\n" - -#: tools/attr.c:147 -#, c-format -msgid "A filename to operate on is required\n" -msgstr "Der Name der zu verwendenden Datei ist erforderlich\n" - -#: tools/attr.c:179 -#, c-format -msgid "Could not set \"%s\" for %s\n" -msgstr "Konnte \"%s\" für %s nicht setzen\n" - -#: tools/attr.c:184 -#, c-format -msgid "Attribute \"%s\" set to a %d byte value for %s:\n" -msgstr "Attribut \"%1$s\" von %3$s auf einen %2$d-Byte-Wert gesetzt:\n" - -#: tools/attr.c:202 -#, c-format -msgid "Could not get \"%s\" for %s\n" -msgstr "Konnte \"%s\" von %s nicht lesen\n" - -#: tools/attr.c:207 -#, c-format -msgid "Attribute \"%s\" had a %d byte value for %s:\n" -msgstr "Attribut \"%1$s\" von %3$s hat einen %2$d-Byte-Wert:\n" - -#: tools/attr.c:220 -#, c-format -msgid "Could not remove \"%s\" for %s\n" -msgstr "Konnte \"%s\" von %s nicht entfernen\n" - -#: tools/attr.c:238 -#, fuzzy, c-format -msgid "Could not list %s\n" -msgstr "Konnte \"%s\" für %s nicht setzen\n" - -#: tools/attr.c:248 -#, fuzzy, c-format -msgid "Attribute \"%s\" has a %d byte value for %s\n" -msgstr "Attribut \"%1$s\" von %3$s hat einen %2$d-Byte-Wert:\n" - -#: tools/attr.c:260 -#, fuzzy, c-format -msgid "At least one of -s, -g, -r, or -l is required\n" -msgstr "Eine der Optionen -s, -g, oder -r ist erforderlich\n" - -#: tools/setfattr.c:75 tools/getfattr.c:99 +#: tools/setfattr.c:75 tools/getfattr.c:100 msgid "No such attribute" msgstr "Kein solches Attribut" @@ -137,7 +62,7 @@ msgid "%s: %s: No filename found in line %d, aborting\n" msgstr "%s: %s: Kein Dateiname in Zeile %d gefunden, Abbruch\n" #: tools/setfattr.c:133 -#, fuzzy, c-format +#, c-format msgid "%s: No filename found in line %d of standard input, aborting\n" msgstr "%s: Kein Dateiname in Zeile %d der Standardeingabe gefunden, Abbruch\n" @@ -146,7 +71,7 @@ msgstr "%s: Kein Dateiname in Zeile %d der Standardeingabe gefunden, Abbruch\n" msgid "%s %s -- set extended attributes\n" msgstr "%s %s -- Erweiterte Attribute setzen\n" -#: tools/setfattr.c:181 tools/getfattr.c:380 +#: tools/setfattr.c:181 tools/getfattr.c:385 #, c-format msgid "Usage: %s %s\n" msgstr "Verwendung: %s %s\n" @@ -157,7 +82,7 @@ msgid " %s %s\n" msgstr "" #: tools/setfattr.c:184 -#, fuzzy, c-format +#, c-format msgid "" " -n, --name=name set the value of the named extended attribute\n" " -x, --remove=name remove the named extended attribute\n" @@ -173,28 +98,32 @@ msgstr "" " -v, --value=wert Wert für das erweiterte Attribut\n" " -h, --no-dereference Symbolische Links nicht dereferenzieren\n" " --restore=datei Erweiterte Attribute wiederhestellen\n" +" --raw Wert des Attributs ist nicht codiert\n" " --version Die Version ausgeben\n" " --help Diese Hilfe\n" #: tools/setfattr.c:264 -#, fuzzy, c-format +#, c-format msgid "" "Usage: %s %s\n" " %s %s\n" "Try `%s --help' for more information.\n" -msgstr "Weiterführende Informationen mit `%s --help'.\n" +msgstr "" +"Verwendung: %s %s\n" +" %s %s\n" +"Weiterführende Informationen mit `%s --help'.\n" -#: tools/getfattr.c:260 +#: tools/getfattr.c:265 #, c-format msgid "%s: Removing leading '/' from absolute path names\n" msgstr "%s: Entferne führenden '/' von absoluten Pfadnamen\n" -#: tools/getfattr.c:378 +#: tools/getfattr.c:383 #, c-format msgid "%s %s -- get extended attributes\n" msgstr "%s %s -- erweiterte Attribute lesen\n" -#: tools/getfattr.c:383 +#: tools/getfattr.c:388 #, c-format msgid "" " -n, --name=name get the named extended attribute value\n" @@ -203,6 +132,7 @@ msgid "" " --match=pattern only get attributes with names matching pattern\n" " --only-values print the bare values only\n" " -h, --no-dereference do not dereference symbolic links\n" +" --one-file-system skip files on different filesystems\n" " --absolute-names don't strip leading '/' in pathnames\n" " -R, --recursive recurse into subdirectories\n" " -L, --logical logical walk, follow symbolic links\n" @@ -216,6 +146,7 @@ msgstr "" " --match=muster Nur Attribute, die mit muster übereinstimmen\n" " --only-values Die Attributwerte ohne Codierung ausgeben\n" " -h, --no-dereference Symbolische Links nicht dereferenzieren\n" +" --one-file-system Dateien auf anderen Dateisystemen überspringen\n" " --absolute-names Führende '/' in Pfadnamen nicht entfernen\n" " -R, --recursive In Unterverzeichnisse wechseln\n" " -L, --logical Alle symbolischen Links verfolgen\n" @@ -223,12 +154,12 @@ msgstr "" " --version Die Version ausgeben\n" " --help Diese Hilfe\n" -#: tools/getfattr.c:479 +#: tools/getfattr.c:489 #, c-format msgid "%s: invalid regular expression \"%s\"\n" msgstr "%s: ungültiger regulärer Ausdruck \"%s\"\n" -#: tools/getfattr.c:493 +#: tools/getfattr.c:503 #, c-format msgid "" "Usage: %s %s\n" @@ -236,3 +167,81 @@ msgid "" msgstr "" "Verwendung: %s %s\n" "Weiterführende Informationen mit `%s --help'.\n" + +#: tools/attr.c:49 +#, c-format +msgid "" +"Usage: %s [-LRSq] -s attrname [-V attrvalue] pathname # set value\n" +" %s [-LRSq] -g attrname pathname # get value\n" +" %s [-LRSq] -r attrname pathname # remove attr\n" +" %s [-LRq] -l pathname # list attrs \n" +" -s reads a value from stdin and -g writes a value to stdout\n" +msgstr "" +"Verwendung: %s [-LRSq] -s attrname [-V attrvalue] pfadname # Wert setzen\n" +" %s [-LRSq] -g attrname pfadname # Wert lesen\n" +" %s [-LRSq] -r attrname pfadname # Wert " +"entfernen\n" +" %s [-LRq] -l pfadname # Attribute " +"auflisten\n" +" -s liest einen Wert von stdin, -g schreibt einen Wert auf " +"stdout\n" + +#: tools/attr.c:87 tools/attr.c:104 tools/attr.c:113 tools/attr.c:122 +#, c-format +msgid "Only one of -s, -g, -r, or -l allowed\n" +msgstr "Nur eine der Optionen -s, -g, -r oder -l erlaubt\n" + +#: tools/attr.c:95 tools/attr.c:161 +#, c-format +msgid "-V only allowed with -s\n" +msgstr "-V nur mit -s erlaubt\n" + +#: tools/attr.c:140 +#, c-format +msgid "Unrecognized option: %c\n" +msgstr "Unbekannte Option: %c\n" + +#: tools/attr.c:147 +#, c-format +msgid "A filename to operate on is required\n" +msgstr "Der Name der zu verwendenden Datei ist erforderlich\n" + +#: tools/attr.c:179 +#, c-format +msgid "Could not set \"%s\" for %s\n" +msgstr "Konnte \"%s\" für %s nicht setzen\n" + +#: tools/attr.c:184 +#, c-format +msgid "Attribute \"%s\" set to a %d byte value for %s:\n" +msgstr "Attribut \"%1$s\" von %3$s auf einen %2$d-Byte-Wert gesetzt:\n" + +#: tools/attr.c:202 +#, c-format +msgid "Could not get \"%s\" for %s\n" +msgstr "Konnte \"%s\" von %s nicht lesen\n" + +#: tools/attr.c:207 +#, c-format +msgid "Attribute \"%s\" had a %d byte value for %s:\n" +msgstr "Attribut \"%1$s\" von %3$s hat einen %2$d-Byte-Wert:\n" + +#: tools/attr.c:220 +#, c-format +msgid "Could not remove \"%s\" for %s\n" +msgstr "Konnte \"%s\" von %s nicht entfernen\n" + +#: tools/attr.c:238 +#, c-format +msgid "Could not list %s\n" +msgstr "Konnte %s nicht auflisten\n" + +#: tools/attr.c:248 +#, c-format +msgid "Attribute \"%s\" has a %d byte value for %s\n" +msgstr "Attribut \"%1$s\" von %3$s hat einen %2$d-Byte-Wert\n" + +#: tools/attr.c:260 +#, c-format +msgid "At least one of -s, -g, -r, or -l is required\n" +msgstr "Eine der Optionen -s, -g, -r oder -l ist erforderlich\n" diff --git a/po/en@boldquot.gmo b/po/en@boldquot.gmo index 0f3b667b90d36c3d2d9c1d5da13e8ba527c7dcce..c87f9a2b03816caddaeb64cb08f81ce7b9e33bf1 100644 GIT binary patch delta 724 zcmbW!!Alfj7{~F)-3@nb)m76hNhZ=T-PxU4+tMwwLziu%gIzj!5t@}D-4$mO1ZB@& zL|CE(Bl-ghVNZ4G5G)<@P!V;gQ+V+d#Da&ukFWFxI56{hpLgDQ-{;5tNjIFWWHk{M zc^?vKw1|8c>!-xZ=i!8QIj`OlXssn2`BJ6^*mm~ zmzcvZsDZkAP4Wr6LS3jb&=*folkXhYZ%_~TjN0)5-orzj#(bYizJZ$j$62%fFKY4x zA8Ya?68vZk|1ZJ|y-SS7gx@axH8=Et%|!;ewUr1rKT`VY+o9JjSIZ^OF8T|e9jpcw zZ_%=>;IY4C=~Q5qOV%U5SoD^?QpHRiEvny)q@&?%%Bhv(sY~{Zx8etWxn$p&t9Usp f<78ah8Mj^6awl`y%$VcW_v7oKlN~kN`8@g$L(OfS delta 664 zcmaLU%PT}-7{~Ev#)x5LT*fsbOm1hK8Izf&T#A*5hLTc}W?@4y*`QfqV+bc&y~+;V#(^h;5~ zN}hIGiMQF7{(&>ptA=h%-QsL4YWR`Q)ntNs)->fG_2=Lq_O;pBzOH!^7qF30BL3rmZ} w&|EwgX$YA9uwnKX{%}Je5b=i$GiaIx<6}lNwz{zLZ(ZukwP8&|rIf-=FV$pU?aC{nm0naf>I1xk7h6U0_z?SX3)A=(2k;YS@enhZh>6_9+oL+*w zD|ny27pVI*`AHM}sJ&{EpLCkUdyJ(|;3sPG=p~bU9B)yt;SlbiCU2r9|AU$^nKb{q zhgt`yPwX9D$0lm>W7Kn^)gE(W7&Z9=)Z}xh2Ruie_%%-BdmP8#sL2OXCi%u?(_cqT zzJr?lE7Ep$4gWrb7iN|ig9xu((seidm`%+%I!X&)UZkWN+u;wPv2w|?i~h1_2b)2~ zdumx$u;f3pbSbdPC2P?y7QI!kR543uP4$_C(^zi#8;umQPQ4t@_Sv)Ex*z!El0Cgp j@g}XjlXq=r)OKCVotP}-GmhK%6<-Pe*Kv)R#8m4k)vj*} delta 664 zcmaLUJ1j$S6vy$?s%WdC-mefs8^LXFt7#hvAq)nI1|cjW(!t^#3rPp;jZT7vO_-Xl zguy0WgTyFdw=hY3kJ}hEx&8c4@9F=4e)qlx)4_CC>d`K8$#r8B*((%j5s~R4%S{YY zA7L-vVi=2^B5l}*wK$JH+`<4JV<$df2Y%;&Z+D5*Q%_+zuDT>8jVyNaH%_pO`U3rU zk9xotmY~-y(vMBpjk7q$;2G47-;1q&n@6O9x*qE=ip%sRQ1`jw>xIyFB`GWUsn<%p z!dUtQGN{ROsL9_jimeqQ?Kp!v*fwhNL)7HgsQ>%O*DaOS6H8!|_9I)#G3q(FRQ|>@ zYVuFi&c$xuo;RQ pX4DA9o5SIrP|PqRrs+5Y z3R;>Xh=v-Ih6oD!pLgHT;obLphx@qq+;i*M_oVY24_pY5^u`aS8Bac5MAx?T-u@eXJ33#VC5QUNnj!civ9a2zka{03v>517GM z)P+NqDJ+F+ zvV*(0f_2nFUeLy1NTh&S%;6qtC#pD)EnLDj+L-Avo!r0_`^zC839O=?poUucBl1X_ z*E;^a~4Py>=uVF$-sKf_xMC%{?u9%Me3@&PyL-km2abbu-;aLtCUl z*MtsARFi+v&-Z|rbLDOUT0DEXMd%cblQ@H$5^8jVW(kdUuTpFi>5A=7SDIz3U^VYU K5nm%(xBdX>e>Wfi literal 5288 zcmbVPO^+N$87{yOnD7~bApt~rH_H&RHJ)8N_A+FV9cLvX*|FJO3{qq%HQhBcMS7~n zRo%ND#EA38;vj9mdf1H1rKz8S0Ksz@Jn(2V=czMi+2uu3itx>81rreNzOkW zXKej*jQtx(`>?M?f3$%w;`JB61K=CL9pDE*ns@H&kO}-b@OhvH3gBBn^2d9?E|844 z2-pI0-~f0I_y^!R@NM9e!1sV;$A5vO|Jf%PgGy`*_!4jzcp3P6U;+LA4y5>Xv6%dF z14wcQz#jnr2*fn@ZQS$MS-fBihUM%`Ie-v{3roTU*RXHlhN3SdpG^ zH~TVfy1p7A{E}{P0YkVMLdM`?_D$RfOR$T4Pw`+pUK^fo_!i!T+2lePIaa&$Qx0=J zR5{N_iqprGt9!XJDIR2=JKZmG#gAlGs1^jIBp@xulX`7722D;JyQ4D+&bRwORp|nY(EPzbO|w*c{19aKtttB_-0Ku z4TjWOdw#6*Q83E$umJn=a!oCX)`?)B4{|u4IBlXo`qI^k(LAzZ6kKRUs+=0&Hc9Yf zYPqpFpa1HocFsMVJ>i*>fc^BI)ZH9x2)|qlfb7@mDM#=uCye7}x^J!2bxH;v2|%*|#o7U`XQWbGaQL zmM}&-5-}z0&^T8fCJH{?CH$vQF=Ee=RL5k{>J2fma>0rskDIeUqw&B-W zOx)(70#Jqa7_}QxU%&xZXI3FS>_j<NR||{a#F_U7{K6w3y-WB;&z)< zfFfI-UUdfAosT4%1>D5@)2dk@qa3-FL@&+t4RcqfQplilqvUJ0$kI@D)PI5|an}}` z4LNeQY8s_278W84e36W1y^r0b#?t7P(%&uiOM|MjL!*BS@7qa^Oh;ZN81QnaD8=x% z^j4N*96EGU{u&;IpagFR2aYWokT$Ri{R7NcLBeJJd8o z6TDNm9M0D{xu@#=L0RZmix|#CRBfs>Xa?({G8;v>Pb8uYA?aB52J$B90ZS-18@I0& zSw|%!yGexSRfC}dkSV2OP>_cb^f~%3r(Pt6{MhMS%_dNP%~M;T^C07>9R!K-jD$)k zoDI)tr-h+v0Nz|2ATwgdvX!xV%cO6Yb96D)yCUNHU_*I-jMq7U9 z3e}hV1(}D3D}{&h9d8SlDA+ty9i#G}VZ9j^C=hX|sz3KQ4zU|A-`Jbk zz6Fb~Sp$xOji(b>Kxe`ENhY=VDNjby!I!&5J`g*zd88mtYq3|-j~?IYvv~H$J zQcQ{K1P>%un?$FQCpb{nP=>UeY^6(xRc;l9jxERzv?LQNO_kw^D^g32YT#JLqF`}A zf-rDpGMT_Yug85TsuOz}!@^3H>9IE0G%_olXqjO>wvD!U^1Lf@NeVPGE$bY1pJ!RH zq2gp9YRF3x&_KHAh;WYbB0G5qMrJo*z_8HZ+tBclCN(jznW(|Z1F$oQf|VZpK%efN zif+Xq(Qg%wFhcR4au2pqHQRU~&8E|n@;Ko8k^M|1 zaOf<(7H8Jf%q#c@Sw9Lef6{m}qqn`!lrpe6}nFF~yxesY+7uAj-5T!f3rT&DDbhiMVBhKd*SK(g)jo8`(JDjZ`zE}3kutAj$WGVD}> z)vU49Fe_?^b9$p9hV^q\n" "Language-Team: Spanish\n" @@ -30,106 +30,30 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Spanish\n" -#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #: libattr/attr_copy_fd.c:80 libattr/attr_copy_fd.c:95 +#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #, c-format msgid "listing attributes of %s" msgstr "listando atributos de %s" -#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 #: libattr/attr_copy_fd.c:115 libattr/attr_copy_fd.c:132 +#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 #, c-format msgid "getting attribute %s of %s" msgstr "obteniendo atributo %s de %s" -#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 #: libattr/attr_copy_fd.c:145 libattr/attr_copy_fd.c:164 +#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 #, c-format msgid "setting attributes for %s" msgstr "estableciendo atributos para %s" -#: libattr/attr_copy_file.c:150 libattr/attr_copy_fd.c:152 +#: libattr/attr_copy_fd.c:152 libattr/attr_copy_file.c:150 #, c-format msgid "setting attribute %s for %s" msgstr "estableciendo atributo %s para %s" -#: tools/attr.c:49 -#, c-format -msgid "" -"Usage: %s [-LRSq] -s attrname [-V attrvalue] pathname # set value\n" -" %s [-LRSq] -g attrname pathname # get value\n" -" %s [-LRSq] -r attrname pathname # remove attr\n" -" %s [-LRq] -l pathname # list attrs \n" -" -s reads a value from stdin and -g writes a value to stdout\n" -msgstr "" -"Uso: %s [-LRSq] -s nomatrib ruta [-V valoratr] ruta # establecer valor\n" -" %s [-LRSq] -g nomatrib ruta # obtener valor\n" -" %s [-LRSq] -r nomatrib ruta # borrar atributo\n" -" %s [-LRq] -l ruta # listar atributos \n" -" -s lee un valor de la entrada estándar y -g escribe un valor a la salida " -"estándar\n" - -#: tools/attr.c:87 tools/attr.c:104 tools/attr.c:113 tools/attr.c:122 -#, c-format -msgid "Only one of -s, -g, -r, or -l allowed\n" -msgstr "Sólo está permitido usar uno de -s, -g, -r, o -l\n" - -#: tools/attr.c:95 tools/attr.c:161 -#, c-format -msgid "-V only allowed with -s\n" -msgstr "-V sólo está permitido con -s\n" - -#: tools/attr.c:140 -#, c-format -msgid "Unrecognized option: %c\n" -msgstr "Opción no reconocida: %c\n" - -#: tools/attr.c:147 -#, c-format -msgid "A filename to operate on is required\n" -msgstr "Se necesita un nombre de archivo sobre el que operar\n" - -#: tools/attr.c:179 -#, c-format -msgid "Could not set \"%s\" for %s\n" -msgstr "No se pudo establecer \"%s\" para %s\n" - -#: tools/attr.c:184 -#, c-format -msgid "Attribute \"%s\" set to a %d byte value for %s:\n" -msgstr "Atributo \"%s\" establecido al valor byte %d para %s:\n" - -#: tools/attr.c:202 -#, c-format -msgid "Could not get \"%s\" for %s\n" -msgstr "No se pudo obtener \"%s\" para %s\n" - -#: tools/attr.c:207 -#, c-format -msgid "Attribute \"%s\" had a %d byte value for %s:\n" -msgstr "El atributo \"%s\" tenía el valor byte %d para %s:\n" - -#: tools/attr.c:220 -#, c-format -msgid "Could not remove \"%s\" for %s\n" -msgstr "No se pudo eliminar \"%s\" para %s\n" - -#: tools/attr.c:238 -#, fuzzy, c-format -msgid "Could not list %s\n" -msgstr "No se pudo listar \"%s\" para %s\n" - -#: tools/attr.c:248 -#, c-format -msgid "Attribute \"%s\" has a %d byte value for %s\n" -msgstr "El atributo \"%s\" tiene el valor byte %d para %s\n" - -#: tools/attr.c:260 -#, c-format -msgid "At least one of -s, -g, -r, or -l is required\n" -msgstr "Se necesita al menos uno de -s, -g, -r, o -l\n" - -#: tools/setfattr.c:75 tools/getfattr.c:99 +#: tools/setfattr.c:75 tools/getfattr.c:100 msgid "No such attribute" msgstr "Atributo inexistente" @@ -150,7 +74,7 @@ msgstr "" msgid "%s %s -- set extended attributes\n" msgstr "%s %s -- establecer atributos extendidos\n" -#: tools/setfattr.c:181 tools/getfattr.c:380 +#: tools/setfattr.c:181 tools/getfattr.c:385 #, c-format msgid "Usage: %s %s\n" msgstr "Uso: %s %s\n" @@ -192,18 +116,18 @@ msgstr "" " %s %s\n" "Escriba `%s --help' para más información.\n" -#: tools/getfattr.c:260 +#: tools/getfattr.c:265 #, c-format msgid "%s: Removing leading '/' from absolute path names\n" msgstr "%s: Eliminando '/' inicial en nombres de ruta absolutos\n" -#: tools/getfattr.c:378 +#: tools/getfattr.c:383 #, c-format msgid "%s %s -- get extended attributes\n" msgstr "%s %s -- obtener atributos extendidos\n" -#: tools/getfattr.c:383 -#, c-format +#: tools/getfattr.c:388 +#, fuzzy, c-format msgid "" " -n, --name=name get the named extended attribute value\n" " -d, --dump get all extended attribute values\n" @@ -211,6 +135,7 @@ msgid "" " --match=pattern only get attributes with names matching pattern\n" " --only-values print the bare values only\n" " -h, --no-dereference do not dereference symbolic links\n" +" --one-file-system skip files on different filesystems\n" " --absolute-names don't strip leading '/' in pathnames\n" " -R, --recursive recurse into subdirectories\n" " -L, --logical logical walk, follow symbolic links\n" @@ -232,12 +157,12 @@ msgstr "" " --version mostrar versión y salir\n" " --help este texto de ayuda\n" -#: tools/getfattr.c:479 +#: tools/getfattr.c:489 #, c-format msgid "%s: invalid regular expression \"%s\"\n" msgstr "%s: expresión regular inválida \"%s\"\n" -#: tools/getfattr.c:493 +#: tools/getfattr.c:503 #, c-format msgid "" "Usage: %s %s\n" @@ -245,3 +170,79 @@ msgid "" msgstr "" "Uso: %s %s\n" "Escriba `%s --help' para más información.\n" + +#: tools/attr.c:49 +#, c-format +msgid "" +"Usage: %s [-LRSq] -s attrname [-V attrvalue] pathname # set value\n" +" %s [-LRSq] -g attrname pathname # get value\n" +" %s [-LRSq] -r attrname pathname # remove attr\n" +" %s [-LRq] -l pathname # list attrs \n" +" -s reads a value from stdin and -g writes a value to stdout\n" +msgstr "" +"Uso: %s [-LRSq] -s nomatrib ruta [-V valoratr] ruta # establecer valor\n" +" %s [-LRSq] -g nomatrib ruta # obtener valor\n" +" %s [-LRSq] -r nomatrib ruta # borrar atributo\n" +" %s [-LRq] -l ruta # listar atributos \n" +" -s lee un valor de la entrada estándar y -g escribe un valor a la salida " +"estándar\n" + +#: tools/attr.c:87 tools/attr.c:104 tools/attr.c:113 tools/attr.c:122 +#, c-format +msgid "Only one of -s, -g, -r, or -l allowed\n" +msgstr "Sólo está permitido usar uno de -s, -g, -r, o -l\n" + +#: tools/attr.c:95 tools/attr.c:161 +#, c-format +msgid "-V only allowed with -s\n" +msgstr "-V sólo está permitido con -s\n" + +#: tools/attr.c:140 +#, c-format +msgid "Unrecognized option: %c\n" +msgstr "Opción no reconocida: %c\n" + +#: tools/attr.c:147 +#, c-format +msgid "A filename to operate on is required\n" +msgstr "Se necesita un nombre de archivo sobre el que operar\n" + +#: tools/attr.c:179 +#, c-format +msgid "Could not set \"%s\" for %s\n" +msgstr "No se pudo establecer \"%s\" para %s\n" + +#: tools/attr.c:184 +#, c-format +msgid "Attribute \"%s\" set to a %d byte value for %s:\n" +msgstr "Atributo \"%s\" establecido al valor byte %d para %s:\n" + +#: tools/attr.c:202 +#, c-format +msgid "Could not get \"%s\" for %s\n" +msgstr "No se pudo obtener \"%s\" para %s\n" + +#: tools/attr.c:207 +#, c-format +msgid "Attribute \"%s\" had a %d byte value for %s:\n" +msgstr "El atributo \"%s\" tenía el valor byte %d para %s:\n" + +#: tools/attr.c:220 +#, c-format +msgid "Could not remove \"%s\" for %s\n" +msgstr "No se pudo eliminar \"%s\" para %s\n" + +#: tools/attr.c:238 +#, fuzzy, c-format +msgid "Could not list %s\n" +msgstr "No se pudo listar \"%s\" para %s\n" + +#: tools/attr.c:248 +#, c-format +msgid "Attribute \"%s\" has a %d byte value for %s\n" +msgstr "El atributo \"%s\" tiene el valor byte %d para %s\n" + +#: tools/attr.c:260 +#, c-format +msgid "At least one of -s, -g, -r, or -l is required\n" +msgstr "Se necesita al menos uno de -s, -g, -r, o -l\n" diff --git a/po/fr.gmo b/po/fr.gmo index 06f8cc9caa1e5628f6d64ed2a456bff9e039f601..6cdf5421760f50610b0668a5dcf48311e4f2fb94 100644 GIT binary patch delta 531 zcmXxhzb^w}7{Kx8dWWi3wReOfPSZvjX$fH{;>TzbgH;UGu40v3I!O$+t_%_pljg<_ z`~f1d7>&fnh{gBmz24k&pL?D+chCF2cj>p?;5F;CgfT))5Rb$pabj^}eBv~I8Qqx3 z9QhKiVGS4X3Jdsxqxg$O^lXt?tYQTZF^4UrPat=u@PrvAKCt@%Op$wz$Rg%ZU))2T zKf-Z5!!f+ZT^9L(Gvsb>)OZCq$m_U+H@J-7SfRhn_lZnV*vEAYu!{G%i9cAt)p)d{ z1I&}3;t<~AFm}+xXWYU!^s&?*o#-~|i8N5(KSzuHk|cDnVWB32gnp2X2#f6gngP_) wafvkXKYDnG5m{59r?B4W6wNi6Kaglo`2h$Ck({E4Q=~@9ksE?MZGqW zkNA^|g5ZUx1hJ{7>K>@L?#w2%G@f zu0I3W|961T0RIOZ0>#&pz(;`(0-pgs3)}}1 z@Q*>9y#y{K2y3|DYVrVXwxNd`<|GJN z@>Sdq<3<<~9Fg3Kn=hnqaox}V5ec(NLKs=9UH+l&ny8xUsUlv?Nxe}klj9#**G`X` zTG31vjp{)`&Ibd%Dl zdLt$4C>=?!E3maeD4DNjKF=Ta-P(8O{g z_~(NjqRMF#<1vzMVHodYFQy@cR^-a5F>aHEIOdj&t!Z`DACx0o=!^<&Ugrq#C4?M# zTOg<*58=$*nzSa5U{_Qq$>E{&d`jA|wNuVY2;dDq+NrE@UeA`koePe>sNMol<1lrLns;2FD;FA zp+aMfZ3ANvf22;)2C80;tgDe2*7(_b$&QgrI3pdasG9nu^bJ+o87Fx)*<)u*oDypz z#?VX^my9(N)AX&I^!8rZ7gwAL#*3dL z*F)MKZ0(4_MX|L*+uOsfpNhc~g8?>*8)~Mxh8Ft<7sS>;3@$)qIM{w{u#J7!q_4%k zlg1YkQ)NicH@ZN;O4^eKv90OpNxRao;>xA5Q>s69KZCHDG}t8el`Mz!3!ax#dOBAl zEsZF)21Z~n)-G`0tJj}f24$;1=v}b}JO$GZD)`9r;Cxj`ZJwfR zDjkBntGyLFI~Sf5TNjqQ*%8cb@mxzpL)sZ(<|N0+5v|x=7|upHDkPJjY8*y96=_F} zG-s}CP~K&49Xp<-p|*`j`};*v`BoDK{TiaI;V0~XOf&>sd34BbAKu=iqeF1z;cc=F z{*7#Tc)O*`jx9@D>v41oLk;u86-OVPIGnEmu z{WTVY%T4Dp;(%f($fvTZ3N9~>7&^X0Akh6#W#$=dmZ(t3FDF|(lH^S4ni@o6IsXu9 zo7JlJRH61m9?lY7#!~OGxNKJyW1DDDhQnqYNR zVAkj9%14FAS4HrTlYN3vARc^3VlRO^!<^~}r+d4ItqS8NRByKjCbl|G?OG+Ac+CF+ DPnXYI diff --git a/po/fr.po b/po/fr.po index 66e2156..2d3ba35 100644 --- a/po/fr.po +++ b/po/fr.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: attr\n" "Report-Msgid-Bugs-To: acl-devel@nongnu.org\n" -"POT-Creation-Date: 2018-06-18 22:17-0400\n" +"POT-Creation-Date: 2021-03-11 19:52+0100\n" "PO-Revision-Date: 2005-10-05 20:02+0200\n" "Last-Translator: Guilhelm Panaget \n" "Language-Team: French \n" @@ -26,107 +26,30 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #: libattr/attr_copy_fd.c:80 libattr/attr_copy_fd.c:95 +#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #, c-format msgid "listing attributes of %s" msgstr "affichage des attributs de %s" -#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 #: libattr/attr_copy_fd.c:115 libattr/attr_copy_fd.c:132 +#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 #, c-format msgid "getting attribute %s of %s" msgstr "obtention de l'attribut %s de %s" -#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 #: libattr/attr_copy_fd.c:145 libattr/attr_copy_fd.c:164 +#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 #, c-format msgid "setting attributes for %s" msgstr "positionnement des attributs de %s" -#: libattr/attr_copy_file.c:150 libattr/attr_copy_fd.c:152 +#: libattr/attr_copy_fd.c:152 libattr/attr_copy_file.c:150 #, c-format msgid "setting attribute %s for %s" msgstr "positionnement de l'attribut %s de %s" -#: tools/attr.c:49 -#, fuzzy, c-format -msgid "" -"Usage: %s [-LRSq] -s attrname [-V attrvalue] pathname # set value\n" -" %s [-LRSq] -g attrname pathname # get value\n" -" %s [-LRSq] -r attrname pathname # remove attr\n" -" %s [-LRq] -l pathname # list attrs \n" -" -s reads a value from stdin and -g writes a value to stdout\n" -msgstr "" -"Utilisation :\n" -" %s [-LRSq] -s nom_attr [-V val_attr] chemin # affecter la valeur.\n" -" %s [-LRSq] -g nom_attr chemin # obtenir la valeur.\n" -" %s [-LRSq] -r nom_attr chemin # supprimer " -"l'attribut.\n" -" -s lire la valeur à affecter sur l'entrée standard.\n" -" -g envoyer la valeur sur la sortie standard.\n" - -#: tools/attr.c:87 tools/attr.c:104 tools/attr.c:113 tools/attr.c:122 -#, fuzzy, c-format -msgid "Only one of -s, -g, -r, or -l allowed\n" -msgstr "Un seul des commutateurs -s, -g ou -r est autorisé.\n" - -#: tools/attr.c:95 tools/attr.c:161 -#, c-format -msgid "-V only allowed with -s\n" -msgstr "-V n'est compatible qu'avec -s\n" - -#: tools/attr.c:140 -#, c-format -msgid "Unrecognized option: %c\n" -msgstr "Option inconnue : %c\n" - -#: tools/attr.c:147 -#, c-format -msgid "A filename to operate on is required\n" -msgstr "Le nom du fichier auquel s'applique la commande est nécessaire\n" - -#: tools/attr.c:179 -#, c-format -msgid "Could not set \"%s\" for %s\n" -msgstr "Impossible d'affecter « %s » à %s\n" - -#: tools/attr.c:184 -#, c-format -msgid "Attribute \"%s\" set to a %d byte value for %s:\n" -msgstr "L'attribut « %s » positionné à une valeur de %d octets pour %s :\n" - -#: tools/attr.c:202 -#, c-format -msgid "Could not get \"%s\" for %s\n" -msgstr "Impossible d'obtenir « %s » pour %s\n" - -#: tools/attr.c:207 -#, c-format -msgid "Attribute \"%s\" had a %d byte value for %s:\n" -msgstr "L'attribut « %s » avait une valeur de %d octets pour %s :\n" - -#: tools/attr.c:220 -#, c-format -msgid "Could not remove \"%s\" for %s\n" -msgstr "Impossible de supprimer « %s » de %s\n" - -#: tools/attr.c:238 -#, fuzzy, c-format -msgid "Could not list %s\n" -msgstr "Impossible d'affecter « %s » à %s\n" - -#: tools/attr.c:248 -#, fuzzy, c-format -msgid "Attribute \"%s\" has a %d byte value for %s\n" -msgstr "L'attribut « %s » avait une valeur de %d octets pour %s :\n" - -#: tools/attr.c:260 -#, fuzzy, c-format -msgid "At least one of -s, -g, -r, or -l is required\n" -msgstr "Au moins un des commutateurs -s, -g ou -r est requis.\n" - -#: tools/setfattr.c:75 tools/getfattr.c:99 +#: tools/setfattr.c:75 tools/getfattr.c:100 msgid "No such attribute" msgstr "Attribut inconnu" @@ -147,7 +70,7 @@ msgstr "" msgid "%s %s -- set extended attributes\n" msgstr "%s %s -- positionner les attributs étendus\n" -#: tools/setfattr.c:181 tools/getfattr.c:380 +#: tools/setfattr.c:181 tools/getfattr.c:385 #, c-format msgid "Usage: %s %s\n" msgstr "Utilisation : %s %s\n" @@ -187,18 +110,18 @@ msgstr "" "Utilisation : %s %s\n" "Taper « %s --help » pour plus d'informations.\n" -#: tools/getfattr.c:260 +#: tools/getfattr.c:265 #, c-format msgid "%s: Removing leading '/' from absolute path names\n" msgstr "%s: Suppression des « / » en tête des chemins absolus\n" -#: tools/getfattr.c:378 +#: tools/getfattr.c:383 #, c-format msgid "%s %s -- get extended attributes\n" msgstr "%s %s -- obtenir les attributs étendus\n" -#: tools/getfattr.c:383 -#, c-format +#: tools/getfattr.c:388 +#, fuzzy, c-format msgid "" " -n, --name=name get the named extended attribute value\n" " -d, --dump get all extended attribute values\n" @@ -206,6 +129,7 @@ msgid "" " --match=pattern only get attributes with names matching pattern\n" " --only-values print the bare values only\n" " -h, --no-dereference do not dereference symbolic links\n" +" --one-file-system skip files on different filesystems\n" " --absolute-names don't strip leading '/' in pathnames\n" " -R, --recursive recurse into subdirectories\n" " -L, --logical logical walk, follow symbolic links\n" @@ -230,12 +154,12 @@ msgstr "" " --version afficher la version et quitter\n" " --help afficher cette aide\n" -#: tools/getfattr.c:479 +#: tools/getfattr.c:489 #, c-format msgid "%s: invalid regular expression \"%s\"\n" msgstr "%s: expression rationnelle non valable « %s »\n" -#: tools/getfattr.c:493 +#: tools/getfattr.c:503 #, c-format msgid "" "Usage: %s %s\n" @@ -243,3 +167,80 @@ msgid "" msgstr "" "Utilisation : %s %s\n" "Taper « %s --help » pour plus d'informations.\n" + +#: tools/attr.c:49 +#, fuzzy, c-format +msgid "" +"Usage: %s [-LRSq] -s attrname [-V attrvalue] pathname # set value\n" +" %s [-LRSq] -g attrname pathname # get value\n" +" %s [-LRSq] -r attrname pathname # remove attr\n" +" %s [-LRq] -l pathname # list attrs \n" +" -s reads a value from stdin and -g writes a value to stdout\n" +msgstr "" +"Utilisation :\n" +" %s [-LRSq] -s nom_attr [-V val_attr] chemin # affecter la valeur.\n" +" %s [-LRSq] -g nom_attr chemin # obtenir la valeur.\n" +" %s [-LRSq] -r nom_attr chemin # supprimer " +"l'attribut.\n" +" -s lire la valeur à affecter sur l'entrée standard.\n" +" -g envoyer la valeur sur la sortie standard.\n" + +#: tools/attr.c:87 tools/attr.c:104 tools/attr.c:113 tools/attr.c:122 +#, fuzzy, c-format +msgid "Only one of -s, -g, -r, or -l allowed\n" +msgstr "Un seul des commutateurs -s, -g ou -r est autorisé.\n" + +#: tools/attr.c:95 tools/attr.c:161 +#, c-format +msgid "-V only allowed with -s\n" +msgstr "-V n'est compatible qu'avec -s\n" + +#: tools/attr.c:140 +#, c-format +msgid "Unrecognized option: %c\n" +msgstr "Option inconnue : %c\n" + +#: tools/attr.c:147 +#, c-format +msgid "A filename to operate on is required\n" +msgstr "Le nom du fichier auquel s'applique la commande est nécessaire\n" + +#: tools/attr.c:179 +#, c-format +msgid "Could not set \"%s\" for %s\n" +msgstr "Impossible d'affecter « %s » à %s\n" + +#: tools/attr.c:184 +#, c-format +msgid "Attribute \"%s\" set to a %d byte value for %s:\n" +msgstr "L'attribut « %s » positionné à une valeur de %d octets pour %s :\n" + +#: tools/attr.c:202 +#, c-format +msgid "Could not get \"%s\" for %s\n" +msgstr "Impossible d'obtenir « %s » pour %s\n" + +#: tools/attr.c:207 +#, c-format +msgid "Attribute \"%s\" had a %d byte value for %s:\n" +msgstr "L'attribut « %s » avait une valeur de %d octets pour %s :\n" + +#: tools/attr.c:220 +#, c-format +msgid "Could not remove \"%s\" for %s\n" +msgstr "Impossible de supprimer « %s » de %s\n" + +#: tools/attr.c:238 +#, fuzzy, c-format +msgid "Could not list %s\n" +msgstr "Impossible d'affecter « %s » à %s\n" + +#: tools/attr.c:248 +#, fuzzy, c-format +msgid "Attribute \"%s\" has a %d byte value for %s\n" +msgstr "L'attribut « %s » avait une valeur de %d octets pour %s :\n" + +#: tools/attr.c:260 +#, fuzzy, c-format +msgid "At least one of -s, -g, -r, or -l is required\n" +msgstr "Au moins un des commutateurs -s, -g ou -r est requis.\n" diff --git a/po/gl.gmo b/po/gl.gmo index f330821d1b417cc48159b1cc36ac47a17dcc2c68..f355723e07e46732b4c2e4977e8ae5cf7aac2b32 100644 GIT binary patch delta 662 zcmYk(O)mpc6oBE=>iB3eRrOIyM#j)mq$+lVrH}@HfyA~nAr>-gv6Dz_iAcoGB-Roe z3kxi4G%Um~u#hGe-ZL``Cv)eSlRLTh+;gwS3?=VmPg^Osm zupqACEM8y^-*6CP@gTRcK)!<7nf)-o!Wr^cv@nqnv9W*-`^zdHY23w8JVLz=4|(K? z*D}^{9&@cCdz^3!^&}ruuN|qQg{k(SuoCi{{||dh4?}~_OOnyeaP{QcCf!IwTcknP zgbs?S$-n62yDQAOa=%b5p1u4cbc)7Fios0@HTprbghu;UDOM0p)rvY*uVR!8?=hZ? Jcp3B9_yfZyHYWf8 literal 5291 zcmbVP&5s;M6)zG)!Vn+?FoZ8XyjjL3TeBZtoYj!E>=+A0vE$WdF-VamYPxG?3iotP zs=9Z*C>IVK5F9`v2TsTb4o1o$T8Rr6q~Q!w4xCU)EBGD*S*KrC-;aQw z!}ni--va&v$Z|gfvVP~E6yh52IpAfW2JXU!-vL?P2cL}VpJ)m3ReTfhS>TJn1FX9X zWI2EP6viGG;-5g)|Jlz*e_RD#$M+Dp3;ZMS3h+bVMd0SsLVN>w56Itd0#|^40ImYx zt-c?F5u5m41rjg?E&+cIWdA$@egXJ*U>o=^AjjpYXM})C;u7!`;CFymfjQ@IH|B`V|n%#Fy~SKIid)BLudKbJYYw93E^54_qU@h!>`YhyBM7LLDAH zk7LDthP%a6c=`EEgz!Jx02c^^TOectE*781i?9T{*!Qfzp!h6%TJ|k`$$W*R%+*M5 z^MBPe(Lfhe3^nm!O8P;e^AtZ+Q8?2p3r+hfD|HJ3QWlVwqj9r0{9pkp%NB0+yjSyH zohLRm`Cz-#=|mY}q&mXWMdhhoK!x@SwTJpao2;XDPkDW1vwaC-_>pp?ie$JwhKAbZ zVa(>)VKAi8+S7q4hQTOLVFS*kYEL7H_sL+N4|0gc&g9V_J>?q3cpY0Y3@)@X)lT>E z=1K5lYALq`&5ruRQO{;3q0Hp>*#rDYse0aKaB7G{I5V|*yC4r|k15lN-9zowHkq8Y z9dcBH19$mor<2lovp;h32P(V2LVcTM z_JHP8mOHHSczEcKZ*NB8_R9K2QljDe8hYCpt*A)!bUm(e=AJ1UPYrc;f@j6hcnZTz zk(LO|hJqpR^SlM=n-v}uU9h5y^yt#7mii{sAu;;4gfj3yLZ@jNtXDnj3Iv8Fp1qcA zAF+fn%CU%XS)AOxt4DU9gFGATzOy5o61frL9+?{tG&v}0QgV7wX3D{mvC}@d^TM*f z&=T@4g$zIz+5_ZnpuU6yu1~E3J?vOJg@i^J;7O<7C_$DKs|r@e7ns0gpQHzC26){H zC!owuF0U&CpH4%CVgWZ%@31ZwV3cFGvgi|Q{erb~OF3lFd7$$G#N=H|lV z8%36o$zV5&@KhHVP5_lM9fN`tQqUKuzr?jj4(Py{LQfZPeJxU3qVj-oTn>W7ct=7d zB+jxIeA2P0dIH`&KEY;0#)`SQW@g9PpP-)0ms5E+R?u!ZRc>@PJC|Q*?dmZ~lf3N* zCY3Lh126Y1RwNm&sC}JX%WXc$%Z_z}*3O+hc>^{xmE`wO2fDPew!S6TuE_N*+Sur> zzaZB(*VeF5?&^KR^`%+2hPlgf{R(Yd?rv;7zqXEbw@@RHc6mFa@UB?}i8%ukx z)ICKnsv`WjR(h!3@wRk{hQ$Nj$#roR`}0AG^pJa6jk@%G)VRc`yczG(AZy)z`S#7J z>Fb@f)(xAZMZw93W0=5K!Rk0uCjTxaL*?Mg?Xu|0t?4?}5SO*QS#=*>+Unt=`H|eQ zIyHr?^_WpXRNO&`=9?!w(>&Q8dJwYAA(XsSBRHXJvZOsXQU;f!_G6uxKJL)ef_;nH zD2SRo!d*R;RZNajn_14*DAZ4-p4C)wlf}omC<+|DnAnjz*;3LtKqI52isKP0kjI6tl%2drXVKG-u<+51j zMB`o#B2+Ka2|T)JW!m+CeT{Djrrs+kM^t@}IV6LTsl zR5$b|p~2&<35OFHGcpAeCP8qy&D+6Z1RQ@Soob3A=w2w-5|dxx4;&ODkH#v4RynkT z>)^FxJzt4?wI%K}5r|z<5u91qr_k-8>l-Tv4|A_Kw;pM?2E0s|~1>=pQwLsCzR@Cl66TCvVSI nk(S_ya@D96X1{?|%dwRV1*M*\n" "Language-Team: Galician\n" @@ -30,106 +30,30 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Galician\n" -#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #: libattr/attr_copy_fd.c:80 libattr/attr_copy_fd.c:95 +#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #, c-format msgid "listing attributes of %s" msgstr "listando atributos de %s" -#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 #: libattr/attr_copy_fd.c:115 libattr/attr_copy_fd.c:132 +#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 #, c-format msgid "getting attribute %s of %s" msgstr "obtendo atributo %s de %s" -#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 #: libattr/attr_copy_fd.c:145 libattr/attr_copy_fd.c:164 +#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 #, c-format msgid "setting attributes for %s" msgstr "establecendo atributos para %s" -#: libattr/attr_copy_file.c:150 libattr/attr_copy_fd.c:152 +#: libattr/attr_copy_fd.c:152 libattr/attr_copy_file.c:150 #, c-format msgid "setting attribute %s for %s" msgstr "establecendo atributo %s para %s" -#: tools/attr.c:49 -#, c-format -msgid "" -"Usage: %s [-LRSq] -s attrname [-V attrvalue] pathname # set value\n" -" %s [-LRSq] -g attrname pathname # get value\n" -" %s [-LRSq] -r attrname pathname # remove attr\n" -" %s [-LRq] -l pathname # list attrs \n" -" -s reads a value from stdin and -g writes a value to stdout\n" -msgstr "" -"Uso: %s [-LRSq] -s nomatrib rota [-V valatrib] rota # establecer valor\n" -" %s [-LRSq] -g nomatrib rota # obter valor\n" -" %s [-LRSq] -r nomatrib rota # borrar atributo\n" -" %s [-LRq] -l rota # listar atributos \n" -" -s le un valor da entrada estándar e -g escrebe un valor á saída " -"estándar\n" - -#: tools/attr.c:87 tools/attr.c:104 tools/attr.c:113 tools/attr.c:122 -#, c-format -msgid "Only one of -s, -g, -r, or -l allowed\n" -msgstr "Só se permite un de -s, -g, -r, ou -l\n" - -#: tools/attr.c:95 tools/attr.c:161 -#, c-format -msgid "-V only allowed with -s\n" -msgstr "-V só está permitido con -s\n" - -#: tools/attr.c:140 -#, c-format -msgid "Unrecognized option: %c\n" -msgstr "Opción non recoñecida: %c\n" - -#: tools/attr.c:147 -#, c-format -msgid "A filename to operate on is required\n" -msgstr "Precísase un nome de ficheiro a tratar\n" - -#: tools/attr.c:179 -#, c-format -msgid "Could not set \"%s\" for %s\n" -msgstr "Non se puido establecer \"%s\" para %s\n" - -#: tools/attr.c:184 -#, c-format -msgid "Attribute \"%s\" set to a %d byte value for %s:\n" -msgstr "Atributo \"%s\" establecido ó valor byte %d para %s:\n" - -#: tools/attr.c:202 -#, c-format -msgid "Could not get \"%s\" for %s\n" -msgstr "Non se puido obter \"%s\" para %s\n" - -#: tools/attr.c:207 -#, c-format -msgid "Attribute \"%s\" had a %d byte value for %s:\n" -msgstr "O atributo \"%s\" tiña o valor byte %d para %s:\n" - -#: tools/attr.c:220 -#, c-format -msgid "Could not remove \"%s\" for %s\n" -msgstr "Non se puido eliminar \"%s\" para %s\n" - -#: tools/attr.c:238 -#, fuzzy, c-format -msgid "Could not list %s\n" -msgstr "Non se puido listar \"%s\" para %s\n" - -#: tools/attr.c:248 -#, c-format -msgid "Attribute \"%s\" has a %d byte value for %s\n" -msgstr "O atributo \"%s\" ten o valor byte %d para %s\n" - -#: tools/attr.c:260 -#, c-format -msgid "At least one of -s, -g, -r, or -l is required\n" -msgstr "É preciso alomenos un de -s, -g, -r, ou -l\n" - -#: tools/setfattr.c:75 tools/getfattr.c:99 +#: tools/setfattr.c:75 tools/getfattr.c:100 msgid "No such attribute" msgstr "Non hai tal atributo" @@ -150,7 +74,7 @@ msgstr "" msgid "%s %s -- set extended attributes\n" msgstr "%s %s -- establecer atributos estendidos\n" -#: tools/setfattr.c:181 tools/getfattr.c:380 +#: tools/setfattr.c:181 tools/getfattr.c:385 #, c-format msgid "Usage: %s %s\n" msgstr "Uso: %s %s\n" @@ -192,18 +116,18 @@ msgstr "" " %s %s\n" "Escriba `%s --help' para obter máis información.\n" -#: tools/getfattr.c:260 +#: tools/getfattr.c:265 #, c-format msgid "%s: Removing leading '/' from absolute path names\n" msgstr "%s: Borrando '/' iniciais dos nomes de rota absolutos\n" -#: tools/getfattr.c:378 +#: tools/getfattr.c:383 #, c-format msgid "%s %s -- get extended attributes\n" msgstr "%s %s -- obter atributos estendidos\n" -#: tools/getfattr.c:383 -#, c-format +#: tools/getfattr.c:388 +#, fuzzy, c-format msgid "" " -n, --name=name get the named extended attribute value\n" " -d, --dump get all extended attribute values\n" @@ -211,6 +135,7 @@ msgid "" " --match=pattern only get attributes with names matching pattern\n" " --only-values print the bare values only\n" " -h, --no-dereference do not dereference symbolic links\n" +" --one-file-system skip files on different filesystems\n" " --absolute-names don't strip leading '/' in pathnames\n" " -R, --recursive recurse into subdirectories\n" " -L, --logical logical walk, follow symbolic links\n" @@ -234,12 +159,12 @@ msgstr "" " --version amosar versión e sair\n" " --help este texto de axuda\n" -#: tools/getfattr.c:479 +#: tools/getfattr.c:489 #, c-format msgid "%s: invalid regular expression \"%s\"\n" msgstr "%s: expresión regular incorrecta: \"%s\"\n" -#: tools/getfattr.c:493 +#: tools/getfattr.c:503 #, c-format msgid "" "Usage: %s %s\n" @@ -247,3 +172,79 @@ msgid "" msgstr "" "Uso: %s %s\n" "Escriba `%s --help' para obter máis información.\n" + +#: tools/attr.c:49 +#, c-format +msgid "" +"Usage: %s [-LRSq] -s attrname [-V attrvalue] pathname # set value\n" +" %s [-LRSq] -g attrname pathname # get value\n" +" %s [-LRSq] -r attrname pathname # remove attr\n" +" %s [-LRq] -l pathname # list attrs \n" +" -s reads a value from stdin and -g writes a value to stdout\n" +msgstr "" +"Uso: %s [-LRSq] -s nomatrib rota [-V valatrib] rota # establecer valor\n" +" %s [-LRSq] -g nomatrib rota # obter valor\n" +" %s [-LRSq] -r nomatrib rota # borrar atributo\n" +" %s [-LRq] -l rota # listar atributos \n" +" -s le un valor da entrada estándar e -g escrebe un valor á saída " +"estándar\n" + +#: tools/attr.c:87 tools/attr.c:104 tools/attr.c:113 tools/attr.c:122 +#, c-format +msgid "Only one of -s, -g, -r, or -l allowed\n" +msgstr "Só se permite un de -s, -g, -r, ou -l\n" + +#: tools/attr.c:95 tools/attr.c:161 +#, c-format +msgid "-V only allowed with -s\n" +msgstr "-V só está permitido con -s\n" + +#: tools/attr.c:140 +#, c-format +msgid "Unrecognized option: %c\n" +msgstr "Opción non recoñecida: %c\n" + +#: tools/attr.c:147 +#, c-format +msgid "A filename to operate on is required\n" +msgstr "Precísase un nome de ficheiro a tratar\n" + +#: tools/attr.c:179 +#, c-format +msgid "Could not set \"%s\" for %s\n" +msgstr "Non se puido establecer \"%s\" para %s\n" + +#: tools/attr.c:184 +#, c-format +msgid "Attribute \"%s\" set to a %d byte value for %s:\n" +msgstr "Atributo \"%s\" establecido ó valor byte %d para %s:\n" + +#: tools/attr.c:202 +#, c-format +msgid "Could not get \"%s\" for %s\n" +msgstr "Non se puido obter \"%s\" para %s\n" + +#: tools/attr.c:207 +#, c-format +msgid "Attribute \"%s\" had a %d byte value for %s:\n" +msgstr "O atributo \"%s\" tiña o valor byte %d para %s:\n" + +#: tools/attr.c:220 +#, c-format +msgid "Could not remove \"%s\" for %s\n" +msgstr "Non se puido eliminar \"%s\" para %s\n" + +#: tools/attr.c:238 +#, fuzzy, c-format +msgid "Could not list %s\n" +msgstr "Non se puido listar \"%s\" para %s\n" + +#: tools/attr.c:248 +#, c-format +msgid "Attribute \"%s\" has a %d byte value for %s\n" +msgstr "O atributo \"%s\" ten o valor byte %d para %s\n" + +#: tools/attr.c:260 +#, c-format +msgid "At least one of -s, -g, -r, or -l is required\n" +msgstr "É preciso alomenos un de -s, -g, -r, ou -l\n" diff --git a/po/nl.gmo b/po/nl.gmo index d6a7a4f7b4a8a91e8f81ff25536e28c54990b06a..d37d2b191044f95cea611ac8bccfc7aa02b7c482 100644 GIT binary patch delta 531 zcmXxhJx{`55Ww-Pt%``KEgD}dFA@W$8X*pn@BxUMgCD?%x*AsqD=~3ob2DK!>EP;M z!eU@^bkwMe&Mf?oK0fL7$K6A@>%+i*aa-@M(-GD(u|d2Nn?%Fn#`?t!{u#Xqk$v(* ztYRHY_<-B^hATM4Jf>`sU98|9Uf>#bkUlMWG=)AcvhjuEAHX^Clp|8cEb4=&sQcHr zj<>jqT|8mPXDpC=Q_(fs-@Qz(us^F9|{yFD%p~Nh}e(h%n^%ubD+X9gol^ t|7(&DoV2*6Ko4Qg=;TZ-Zd4ZZmcL1J1ws0<9)3EW9p++=75a$-dj$HPD&znF literal 3919 zcmai0OOIPM6uv-#Hc%dg0_AB6QK&jjlVRFULkG1?t5VUHp_+EZqE4=Jfwm=luvI`Fp^3fd2r=?qd)lyH5kjVK=KWaj&QvQCP#3qe;&j43mDH~R4|}Eg3F?(FkZrd8@xSmiGL8j@;O4k7~^_@ zajwNcuFw}Noq$nFF_U*Qsbl;QS!Pu`&m7H91 z?Ul4w>W+z(PFCvmdf4k{#z#2zo^Y&|!GziZtM%mF8Z(yF+QP{*OSKbFLl5Tzk#%}2 zLs%%S_H#z3Tg=;0Snb%R%6k4%j`D z0z(@2mu04lSmH9ml8RxT&F{V`2WCV;o(^``ngLD;x#8m;GB+HkG*VQ>%*rHBg~d&V zRyyy_<5hRO67k#2R{*NeY@&93>T@{Y;^bCH4>Ocjpr8>3c+$!*awJO(siJ5Ysbf8X z>c_oVd#k8^q=+Ry?T{tMLi3*Dt0qrlUmR4OUVTtii6%>yTq5^cr6XoGB33T%^d=oD zx}}lyCedmemp8)6@~bhw9g3ypPi2esrF!!WZ&q%~ zA@Y!4cZrJmM|tA-x`9k5ML!zJ^nx}z(Rtn2q_XzuI$yQY--2I4&|7S=(Ol*Y=viiq zi>>Ba-dJihAjogZk)mWO3xI;*$khmhAv4(IcADF!WeNw$?hMKv3mUCPnE+4c%fgWwWSQ<@%kF+`X^ro{r6p4LWm;SXeq;kw8g)R; zVudaNK?xZ{6SUOB040%{vP;hsXlUv|GyF2Pm9Dfab#5EkXIeoqIZ@h8wXsdrHbSn9 z>Bx2P-=uGbLy2~b^eT@o+GRndsSsXGN)f_emBu8&yGL2Ot1KBE+ zKuNcOp*-7yK0}UY2DkBvsa0~GS zA9RKR{jG&@p1\n" "Language-Team: Debian l10n Dutch \n" @@ -27,105 +27,30 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #: libattr/attr_copy_fd.c:80 libattr/attr_copy_fd.c:95 +#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #, c-format msgid "listing attributes of %s" msgstr "lijst opmaken met attributen van %s" -#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 #: libattr/attr_copy_fd.c:115 libattr/attr_copy_fd.c:132 +#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 #, c-format msgid "getting attribute %s of %s" msgstr "verkrijgen van attribuut %s van %s" -#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 #: libattr/attr_copy_fd.c:145 libattr/attr_copy_fd.c:164 +#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 #, c-format msgid "setting attributes for %s" msgstr "attributen zetten voor %s" -#: libattr/attr_copy_file.c:150 libattr/attr_copy_fd.c:152 +#: libattr/attr_copy_fd.c:152 libattr/attr_copy_file.c:150 #, c-format msgid "setting attribute %s for %s" msgstr "attribuut %s zetten voor %s" -#: tools/attr.c:49 -#, fuzzy, c-format -msgid "" -"Usage: %s [-LRSq] -s attrname [-V attrvalue] pathname # set value\n" -" %s [-LRSq] -g attrname pathname # get value\n" -" %s [-LRSq] -r attrname pathname # remove attr\n" -" %s [-LRq] -l pathname # list attrs \n" -" -s reads a value from stdin and -g writes a value to stdout\n" -msgstr "" -"Gebruik: %s [-LRSq] -s attr-naam [-V attr-waarde] padnaam # zet waarde\n" -" %s [-LRSq] -g attr-naam padnaam # vraag waarde op\n" -" %s [-LRSq] -r attr-naam padnaam # verwijder attr\n" -" -s leest een waarde van stdin en -g schrijft een waarde naar " -"stdout\n" - -#: tools/attr.c:87 tools/attr.c:104 tools/attr.c:113 tools/attr.c:122 -#, fuzzy, c-format -msgid "Only one of -s, -g, -r, or -l allowed\n" -msgstr "Slechts één van -s, -g of -r is toegestaan\n" - -#: tools/attr.c:95 tools/attr.c:161 -#, c-format -msgid "-V only allowed with -s\n" -msgstr "-V is enkel toegestaan met -s\n" - -#: tools/attr.c:140 -#, c-format -msgid "Unrecognized option: %c\n" -msgstr "Niet herkende optie: %c\n" - -#: tools/attr.c:147 -#, c-format -msgid "A filename to operate on is required\n" -msgstr "Er is een bestandsnaam vereist\n" - -#: tools/attr.c:179 -#, c-format -msgid "Could not set \"%s\" for %s\n" -msgstr "Kon \"%s\" niet zetten voor %s\n" - -#: tools/attr.c:184 -#, c-format -msgid "Attribute \"%s\" set to a %d byte value for %s:\n" -msgstr "Attribuut \"%s\" gezet op een %d-bytewaarde voor %s:\n" - -#: tools/attr.c:202 -#, c-format -msgid "Could not get \"%s\" for %s\n" -msgstr "Kon \"%s\" niet krijgen voor %s\n" - -#: tools/attr.c:207 -#, c-format -msgid "Attribute \"%s\" had a %d byte value for %s:\n" -msgstr "Attribuut \"%s\" had een %d-bytewaarde voor %s:\n" - -#: tools/attr.c:220 -#, c-format -msgid "Could not remove \"%s\" for %s\n" -msgstr "Kon \"%s\" niet verwijderen voor %s\n" - -#: tools/attr.c:238 -#, fuzzy, c-format -msgid "Could not list %s\n" -msgstr "Kon \"%s\" niet zetten voor %s\n" - -#: tools/attr.c:248 -#, fuzzy, c-format -msgid "Attribute \"%s\" has a %d byte value for %s\n" -msgstr "Attribuut \"%s\" had een %d-bytewaarde voor %s:\n" - -#: tools/attr.c:260 -#, fuzzy, c-format -msgid "At least one of -s, -g, -r, or -l is required\n" -msgstr "Minstens één van -s, -g of -r is vereist\n" - -#: tools/setfattr.c:75 tools/getfattr.c:99 +#: tools/setfattr.c:75 tools/getfattr.c:100 msgid "No such attribute" msgstr "Geen dergelijk attribuut" @@ -145,7 +70,7 @@ msgstr "" msgid "%s %s -- set extended attributes\n" msgstr "%s %s -- zet uitgebreide attributen\n" -#: tools/setfattr.c:181 tools/getfattr.c:380 +#: tools/setfattr.c:181 tools/getfattr.c:385 #, c-format msgid "Usage: %s %s\n" msgstr "Gebruik: %s %s\n" @@ -187,18 +112,18 @@ msgstr "" "Gebruik: %s %s\n" "Probeer `%s --help' voor meer informatie.\n" -#: tools/getfattr.c:260 +#: tools/getfattr.c:265 #, c-format msgid "%s: Removing leading '/' from absolute path names\n" msgstr "%s: de leidende '/' in absolute padnamen wordt verwijderd\n" -#: tools/getfattr.c:378 +#: tools/getfattr.c:383 #, c-format msgid "%s %s -- get extended attributes\n" msgstr "%s %s -- verkrijg uitgebreide attributen\n" -#: tools/getfattr.c:383 -#, c-format +#: tools/getfattr.c:388 +#, fuzzy, c-format msgid "" " -n, --name=name get the named extended attribute value\n" " -d, --dump get all extended attribute values\n" @@ -206,6 +131,7 @@ msgid "" " --match=pattern only get attributes with names matching pattern\n" " --only-values print the bare values only\n" " -h, --no-dereference do not dereference symbolic links\n" +" --one-file-system skip files on different filesystems\n" " --absolute-names don't strip leading '/' in pathnames\n" " -R, --recursive recurse into subdirectories\n" " -L, --logical logical walk, follow symbolic links\n" @@ -227,12 +153,12 @@ msgstr "" " --version print versie en sluit af\n" " --help deze helptekst\n" -#: tools/getfattr.c:479 +#: tools/getfattr.c:489 #, c-format msgid "%s: invalid regular expression \"%s\"\n" msgstr "%s: ongeldige reguliere expressie \"%s\"\n" -#: tools/getfattr.c:493 +#: tools/getfattr.c:503 #, c-format msgid "" "Usage: %s %s\n" @@ -240,3 +166,78 @@ msgid "" msgstr "" "Gebruik: %s %s\n" "Probeer `%s --help' voor meer informatie.\n" + +#: tools/attr.c:49 +#, fuzzy, c-format +msgid "" +"Usage: %s [-LRSq] -s attrname [-V attrvalue] pathname # set value\n" +" %s [-LRSq] -g attrname pathname # get value\n" +" %s [-LRSq] -r attrname pathname # remove attr\n" +" %s [-LRq] -l pathname # list attrs \n" +" -s reads a value from stdin and -g writes a value to stdout\n" +msgstr "" +"Gebruik: %s [-LRSq] -s attr-naam [-V attr-waarde] padnaam # zet waarde\n" +" %s [-LRSq] -g attr-naam padnaam # vraag waarde op\n" +" %s [-LRSq] -r attr-naam padnaam # verwijder attr\n" +" -s leest een waarde van stdin en -g schrijft een waarde naar " +"stdout\n" + +#: tools/attr.c:87 tools/attr.c:104 tools/attr.c:113 tools/attr.c:122 +#, fuzzy, c-format +msgid "Only one of -s, -g, -r, or -l allowed\n" +msgstr "Slechts één van -s, -g of -r is toegestaan\n" + +#: tools/attr.c:95 tools/attr.c:161 +#, c-format +msgid "-V only allowed with -s\n" +msgstr "-V is enkel toegestaan met -s\n" + +#: tools/attr.c:140 +#, c-format +msgid "Unrecognized option: %c\n" +msgstr "Niet herkende optie: %c\n" + +#: tools/attr.c:147 +#, c-format +msgid "A filename to operate on is required\n" +msgstr "Er is een bestandsnaam vereist\n" + +#: tools/attr.c:179 +#, c-format +msgid "Could not set \"%s\" for %s\n" +msgstr "Kon \"%s\" niet zetten voor %s\n" + +#: tools/attr.c:184 +#, c-format +msgid "Attribute \"%s\" set to a %d byte value for %s:\n" +msgstr "Attribuut \"%s\" gezet op een %d-bytewaarde voor %s:\n" + +#: tools/attr.c:202 +#, c-format +msgid "Could not get \"%s\" for %s\n" +msgstr "Kon \"%s\" niet krijgen voor %s\n" + +#: tools/attr.c:207 +#, c-format +msgid "Attribute \"%s\" had a %d byte value for %s:\n" +msgstr "Attribuut \"%s\" had een %d-bytewaarde voor %s:\n" + +#: tools/attr.c:220 +#, c-format +msgid "Could not remove \"%s\" for %s\n" +msgstr "Kon \"%s\" niet verwijderen voor %s\n" + +#: tools/attr.c:238 +#, fuzzy, c-format +msgid "Could not list %s\n" +msgstr "Kon \"%s\" niet zetten voor %s\n" + +#: tools/attr.c:248 +#, fuzzy, c-format +msgid "Attribute \"%s\" has a %d byte value for %s\n" +msgstr "Attribuut \"%s\" had een %d-bytewaarde voor %s:\n" + +#: tools/attr.c:260 +#, fuzzy, c-format +msgid "At least one of -s, -g, -r, or -l is required\n" +msgstr "Minstens één van -s, -g of -r is vereist\n" diff --git a/po/pl.gmo b/po/pl.gmo index d1b6659277b9aa20940a7da3a97971b71b4c58fb..2e07d7a34e641e919e5089e47e6c10093010512d 100644 GIT binary patch delta 662 zcmYk)zb`{k6u|M*AJ30crHZ1Z(jTFIR*{H^PLeJnB36U`0i}~cUPKK30ExuJAgr25 zSS?Lh>|$XM6A=-K!S~$v1}Ay_+>`ry?!D)}i|l*MehT{!g^0P&FQ$1OJ^T=5uSgI# zaR6=C6C5YM#d-Y1NzC~~Qdq($9-!7c#WAemFn(i}a+35r6HC~`#16*s$jz^?jr;*K z_>5XOU^yF0Vu3t|dECMkHh+d%@2AdrKT2vE zY{eHW;up^1LNjgUgxjbm@wGVb$5A^sgL=|c)LYbdSlg@tLg!80PPFyp+9qn7&_8O> zHKBtN(&S&XGwyJ6uH1Y#5o9g1X`P~R66WEiggu&|Swf@DRZ7B%bS2?USE^+zZ&mLD LQBQR@bZ-3tqP;fX literal 5417 zcmbVP&5s;M6)(ULG7tg*O!x>C*Q$`)z!upY-?( z;CX!C1Fi%2fj!{-r|<&b1U?D;0dN8M4zLUS6YyE!L*RFTXCLw7F9W}Z?*vFT{j~o6 zJ@5bsu_fRifE&QS0k?opex9-CfMX!}`CA~_^A{k+?>*o} z;G-~_?0E^e3`~J90)Gem7VteF`T1YqH-S$*!Pr-Tmw*)4Z6N9WF%T-*uYp&9e+0e& z{5S9?u)p_3@6VsVs#NXZjRP0Q(D2w~{NSi9Cw&v?fJZtWQv~P{LiVkR5LA~3w`XYL#f)17 zJK>R%6dt~Kev#{#tQ}HTTmZLd>r@4KYW40kdwxV=d1koH`=Q22W>W2?u98$_20D{BXyPywdHP@N~FVFWy3(1_~UhpqHkANl<15VYd9Wj{B^^3bfnzD*fBYbLHv){Wb@kYDGaEB3cgJJd8?6TH>79M0!Bg{SHL&RE#jsu)aFG;OMOXbN-gWX@EP zekc`n3dzR0H&8Um4tPSfIdl8gkU5-WR5z)xylF6W0Axtz=nUlU2-*z&ms2ki174&$ zQ_}_1U$fBU=sc)6Y6niEzawE14$gvQw9}!fW&+VXJV9>wie<;<+L_JNjL^@;l~COD z9dym@Dtg_E-QH?vOC@Mc;+h@kP`r{4tk^bK5k$D6c2%?yn|KiCU6T$vo7cC+W%x{` zBwj@ySmV9rl~u9)yjWS~z24f&_r&tW#FFNofBF>Q|vUA$H^lr_HE$7RIo8bYd0AW>Bz zn;J7=P?Z@kWSW_Kf##{HY^Bl)tz&>DmZc@ARL&C+1z8pPG&*%uRbi{rW@C-MG}T(V zF6Fd-P@tq|@vE^3O(A2grly@6$+0;?vm)ee7SAdwlU6Elp4PTyWds$iv$cC46gZ1E zAMFKX9asTL2C_MD;yBqV%0%1J+vjy!IU(UjHF-9JbCFMp3HR3?uNq3-kD&o0fO$Zm`c6 zdh?;^%TZ>EJ;yC)$jB2VW^dx_z^C;@QEWyjoS6HuQ-2Zc-}0S!jQe)3KDMrW58M-t2Qa+V zMGVdBa*dqC4?S~DGEtuORzY)H(87bdh^?NkixTgTWW6#!&@yXPHD^89oW?fKS7o!I zyFh3TyxkXHK5ER}r(3G|59i^=(KOEiIx4PNl0i`%Sc^75Ek<=%-7y=p$!}lR?BESu VPve>g&ppsPPY^pk3#nS={{UhxD&GJA diff --git a/po/pl.po b/po/pl.po index 16516b4..daba947 100644 --- a/po/pl.po +++ b/po/pl.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: attr-2.4.28\n" "Report-Msgid-Bugs-To: acl-devel@nongnu.org\n" -"POT-Creation-Date: 2018-06-18 22:17-0400\n" +"POT-Creation-Date: 2021-03-11 19:52+0100\n" "PO-Revision-Date: 2006-01-21 21:13+0100\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" @@ -29,106 +29,30 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #: libattr/attr_copy_fd.c:80 libattr/attr_copy_fd.c:95 +#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #, c-format msgid "listing attributes of %s" msgstr "wypisywanie atrybutów %s" -#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 #: libattr/attr_copy_fd.c:115 libattr/attr_copy_fd.c:132 +#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 #, c-format msgid "getting attribute %s of %s" msgstr "odczyt atrybutu %s dla %s" -#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 #: libattr/attr_copy_fd.c:145 libattr/attr_copy_fd.c:164 +#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 #, c-format msgid "setting attributes for %s" msgstr "ustawianie atrybutów dla %s" -#: libattr/attr_copy_file.c:150 libattr/attr_copy_fd.c:152 +#: libattr/attr_copy_fd.c:152 libattr/attr_copy_file.c:150 #, c-format msgid "setting attribute %s for %s" msgstr "ustawianie atrybutu %s dla %s" -#: tools/attr.c:49 -#, c-format -msgid "" -"Usage: %s [-LRSq] -s attrname [-V attrvalue] pathname # set value\n" -" %s [-LRSq] -g attrname pathname # get value\n" -" %s [-LRSq] -r attrname pathname # remove attr\n" -" %s [-LRq] -l pathname # list attrs \n" -" -s reads a value from stdin and -g writes a value to stdout\n" -msgstr "" -"Sk³adnia: %s [-LRSq] -s atrybut [-V warto¶æ] ¶cie¿ka # ustawienie warto¶ci\n" -" %s [-LRSq] -g atrybut ¶cie¿ka # odczytanie warto¶ci\n" -" %s [-LRSq] -r atrybut ¶cie¿ka # usuniêcie atrybutu\n" -" %s [-LRq] -l ¶cie¿ka # lista atrybutów\n" -" -s odczytuje warto¶æ ze standardowego wej¶cia,\n" -" -g zapisuje na standardowe wyj¶cie\n" - -#: tools/attr.c:87 tools/attr.c:104 tools/attr.c:113 tools/attr.c:122 -#, c-format -msgid "Only one of -s, -g, -r, or -l allowed\n" -msgstr "Dozwolone jest tylko jedno z -s, -g, -r lub -l\n" - -#: tools/attr.c:95 tools/attr.c:161 -#, c-format -msgid "-V only allowed with -s\n" -msgstr "-V dozwolone tylko z -s\n" - -#: tools/attr.c:140 -#, c-format -msgid "Unrecognized option: %c\n" -msgstr "Nierozpoznana opcja: %c\n" - -#: tools/attr.c:147 -#, c-format -msgid "A filename to operate on is required\n" -msgstr "Nazwa pliku do operacji jest obowi±zkowa\n" - -#: tools/attr.c:179 -#, c-format -msgid "Could not set \"%s\" for %s\n" -msgstr "Nie mo¿na ustawiæ \"%s\" dla %s\n" - -#: tools/attr.c:184 -#, c-format -msgid "Attribute \"%s\" set to a %d byte value for %s:\n" -msgstr "Atrybut \"%1$s\" dla %3$s ustawiono na warto¶æ %2$d-bajtow±:\n" - -#: tools/attr.c:202 -#, c-format -msgid "Could not get \"%s\" for %s\n" -msgstr "Nie mo¿na odczytaæ \"%s\" dla %s\n" - -#: tools/attr.c:207 -#, c-format -msgid "Attribute \"%s\" had a %d byte value for %s:\n" -msgstr "Atrybut \"%1$s\" dla %3$s mia³ warto¶æ %2$d-bajtow±:\n" - -#: tools/attr.c:220 -#, c-format -msgid "Could not remove \"%s\" for %s\n" -msgstr "Nie mo¿na usun±æ \"%s\" dla %s\n" - -#: tools/attr.c:238 -#, fuzzy, c-format -msgid "Could not list %s\n" -msgstr "Nie mo¿na wypisaæ listy \"%s\" dla %s\n" - -#: tools/attr.c:248 -#, c-format -msgid "Attribute \"%s\" has a %d byte value for %s\n" -msgstr "Atrybut \"%1$s\" dla %3$s ma warto¶æ %2$d-bajtow±\n" - -#: tools/attr.c:260 -#, c-format -msgid "At least one of -s, -g, -r, or -l is required\n" -msgstr "Wymagane jest co najmniej jedno z -s, -g, -r lub -l\n" - -#: tools/setfattr.c:75 tools/getfattr.c:99 +#: tools/setfattr.c:75 tools/getfattr.c:100 msgid "No such attribute" msgstr "Nie ma takiego atrybutu" @@ -149,7 +73,7 @@ msgstr "" msgid "%s %s -- set extended attributes\n" msgstr "%s %s -- ustawianie rozszerzonych atrybutów\n" -#: tools/setfattr.c:181 tools/getfattr.c:380 +#: tools/setfattr.c:181 tools/getfattr.c:385 #, c-format msgid "Usage: %s %s\n" msgstr "Sk³adnia: %s %s\n" @@ -190,18 +114,18 @@ msgstr "" " %s %s\n" "`%s --help' wy¶wietli wiêcej informacji.\n" -#: tools/getfattr.c:260 +#: tools/getfattr.c:265 #, c-format msgid "%s: Removing leading '/' from absolute path names\n" msgstr "%s: Usuniêcie wiod±cego '/' ze ¶cie¿ek bezwzglêdnych\n" -#: tools/getfattr.c:378 +#: tools/getfattr.c:383 #, c-format msgid "%s %s -- get extended attributes\n" msgstr "%s %s -- odczyt rozszerzonych atrybutów\n" -#: tools/getfattr.c:383 -#, c-format +#: tools/getfattr.c:388 +#, fuzzy, c-format msgid "" " -n, --name=name get the named extended attribute value\n" " -d, --dump get all extended attribute values\n" @@ -209,6 +133,7 @@ msgid "" " --match=pattern only get attributes with names matching pattern\n" " --only-values print the bare values only\n" " -h, --no-dereference do not dereference symbolic links\n" +" --one-file-system skip files on different filesystems\n" " --absolute-names don't strip leading '/' in pathnames\n" " -R, --recursive recurse into subdirectories\n" " -L, --logical logical walk, follow symbolic links\n" @@ -235,12 +160,12 @@ msgstr "" " --version wy¶wietlenie informacji o wersji i zakoñczenie\n" " --help ten tekst pomocy\n" -#: tools/getfattr.c:479 +#: tools/getfattr.c:489 #, c-format msgid "%s: invalid regular expression \"%s\"\n" msgstr "%s: b³êdne wyra¿enie regularne \"%s\"\n" -#: tools/getfattr.c:493 +#: tools/getfattr.c:503 #, c-format msgid "" "Usage: %s %s\n" @@ -248,3 +173,79 @@ msgid "" msgstr "" "Sk³adnia: %s %s\n" "`%s --help' wy¶wietli wiêcej informacji.\n" + +#: tools/attr.c:49 +#, c-format +msgid "" +"Usage: %s [-LRSq] -s attrname [-V attrvalue] pathname # set value\n" +" %s [-LRSq] -g attrname pathname # get value\n" +" %s [-LRSq] -r attrname pathname # remove attr\n" +" %s [-LRq] -l pathname # list attrs \n" +" -s reads a value from stdin and -g writes a value to stdout\n" +msgstr "" +"Sk³adnia: %s [-LRSq] -s atrybut [-V warto¶æ] ¶cie¿ka # ustawienie warto¶ci\n" +" %s [-LRSq] -g atrybut ¶cie¿ka # odczytanie warto¶ci\n" +" %s [-LRSq] -r atrybut ¶cie¿ka # usuniêcie atrybutu\n" +" %s [-LRq] -l ¶cie¿ka # lista atrybutów\n" +" -s odczytuje warto¶æ ze standardowego wej¶cia,\n" +" -g zapisuje na standardowe wyj¶cie\n" + +#: tools/attr.c:87 tools/attr.c:104 tools/attr.c:113 tools/attr.c:122 +#, c-format +msgid "Only one of -s, -g, -r, or -l allowed\n" +msgstr "Dozwolone jest tylko jedno z -s, -g, -r lub -l\n" + +#: tools/attr.c:95 tools/attr.c:161 +#, c-format +msgid "-V only allowed with -s\n" +msgstr "-V dozwolone tylko z -s\n" + +#: tools/attr.c:140 +#, c-format +msgid "Unrecognized option: %c\n" +msgstr "Nierozpoznana opcja: %c\n" + +#: tools/attr.c:147 +#, c-format +msgid "A filename to operate on is required\n" +msgstr "Nazwa pliku do operacji jest obowi±zkowa\n" + +#: tools/attr.c:179 +#, c-format +msgid "Could not set \"%s\" for %s\n" +msgstr "Nie mo¿na ustawiæ \"%s\" dla %s\n" + +#: tools/attr.c:184 +#, c-format +msgid "Attribute \"%s\" set to a %d byte value for %s:\n" +msgstr "Atrybut \"%1$s\" dla %3$s ustawiono na warto¶æ %2$d-bajtow±:\n" + +#: tools/attr.c:202 +#, c-format +msgid "Could not get \"%s\" for %s\n" +msgstr "Nie mo¿na odczytaæ \"%s\" dla %s\n" + +#: tools/attr.c:207 +#, c-format +msgid "Attribute \"%s\" had a %d byte value for %s:\n" +msgstr "Atrybut \"%1$s\" dla %3$s mia³ warto¶æ %2$d-bajtow±:\n" + +#: tools/attr.c:220 +#, c-format +msgid "Could not remove \"%s\" for %s\n" +msgstr "Nie mo¿na usun±æ \"%s\" dla %s\n" + +#: tools/attr.c:238 +#, fuzzy, c-format +msgid "Could not list %s\n" +msgstr "Nie mo¿na wypisaæ listy \"%s\" dla %s\n" + +#: tools/attr.c:248 +#, c-format +msgid "Attribute \"%s\" has a %d byte value for %s\n" +msgstr "Atrybut \"%1$s\" dla %3$s ma warto¶æ %2$d-bajtow±\n" + +#: tools/attr.c:260 +#, c-format +msgid "At least one of -s, -g, -r, or -l is required\n" +msgstr "Wymagane jest co najmniej jedno z -s, -g, -r lub -l\n" diff --git a/po/sv.gmo b/po/sv.gmo index cf565db5fd4566dcd5ea6c758bf6cc88f7d36e83..610e85694ce48f08248948ee342aa0e50fc77a07 100644 GIT binary patch delta 530 zcmXxgJ4*vW6o%oGWYt`}C7X!1;HpWZtdd9?K|4Wg?EDAOS}YaQSlLQi8^Kb9U}xbE z2-=B_mWmKWThsV{yW_BDo;|bdnKScJe$Thw3SQe76T~dhCCbD}f{F2s^Z4WRlV+>r z4cx#c*6|7}_>7a-$0`<6X3MyaE4Yu-*hcng*{xf6#5^B9F)Dx~v1^fCch8ZsHcI?iuQKFI|4;@+VBNzYP-_9N03%D51g}#ON*hIfuF(pBN+l u#{e(fbhNS7sA=>S-<%d0*_db^*IYdcc)~C^Xm&n4KXtK~{_XU0ugO2%RxMco literal 3800 zcmai0O^+kR8Sd~EZ~}y{5E2k?EJg;gpGI4g$Zk9z_g@w&BaN|geE;{Ji2nzk#W&rXBzwT?z#ZUUfzJWI z1pWs2EpQ9?1Mo%Q)_qCR2mS^4Tj0mQXMmqJ-~R$Wg72?@K_2)ZzJCC|1bp!4QSK6u z*WUyF4p;-90{$KN0c`&q_&?bE%mc6y^WXg<`t|fLqn-;uwz~ulfL{RF?r(ss=UyDj z{yqz2yDtIRzZsD2{S3%)`gimFHSh_1e-C8)AAJY|_#E(6;447ZI|u$6__yZ!pUwA| zK$snL0K&sL;phGc$>TuQjUy7cm%!8nVGYmSct3{mD~t{X)FlX60=L6?2t)EP20{`Z zq;L7Koe7aJXGjPmXKIgM)IOQ2sLB=bWJ>D8N|_Y@$f|P1sIC;vrLI*63Q|^(*0Zt| zjmQe5)*D4V%PN*tW^B{KWPAO7Kgx!g<_J&EOHaKDCiKowFIOM-$U5qcq*v$9^sg z(n@l8sCTwUg<)%R&PoX24L;hbaqWCDUu7@OC~U7R`FfNVn5nEQqSPBKrEOM>rH(d) zcRO=S>ggGpSgq|XI%TrB&L)@nfnOJ2&P4IX`%PM+<8uYOZOm3QBu2WOmxgPvsFsn+ zl|E5tRbF@s(_A8*WXlu&gb0a0UAO+&4v!Muuww`%LweKFq|ho{jESvb4C0T}DcVBS z%aL^z62ltryqD|*xr8&)v5K;;PDoik7?fy{l2ci& zrGqD>Q$B>VyXCu`M7&Gk2H+OjTe!QS^aTQNY2_8l!V8pV=gS9@uQ z)ln{S`{6f@4%*v~5^)@-Q+qkE(7bW`Wn1esTn@gSL48!!NmfgaL!vgV@)2u-$d#|h z`Km)D?-&%l%}ntToVR6#LPJ`|o#Y)aGsPLk--)k%cR=rl`r(r51rKKySH3W?5FGr3qdEM8w=ndo+MYHhi4-PxPCy5edo-i?=K7*3^~{<;3n z%VN;Ep-R-DxaPAW6@RKTFZM0=j5YevT$1-ExAw(lr-B#aH6(pVJKKX@ zv3*_)c4=p4ICw>DpWEKXMsY*U3ofSRK5W_^h@Alqc8BNAzqmcXzBi<=#J-cpYl-$U zq}QY=l%_WiG^$-Wx=`ASX_zz3RNt#tA!o80Nf7%=&W7|h%Cqn}U8qXo=NCDI*7d{3 z+V&y&dFR^IYgbmW81%P0m#qOk!H|Oz9&sBuTWVRDKhijt4zb-UycN5$J3^;P(B0NJan+sj#jKJ9)6r@xs;i@^1jjYkWWI3eo%pa3)>=l%RIQ5| zW|9qjIJK#yaDbubJ(@z7o$Q{WF6gjJN^69=8yT^Ck`ZS|#)A?=dyPhb%8|F_@x%;| z9%qPE2UbKoX~dSD_cST`sVnBxD66Z+Kz3sTA&yjjh+hN^NqX2+wDjVqlJvq%rCT1@ zHog@pBKROQMcjAspH`?Wgt2?J%ZiSs^FfQ{*SsBR5_(+`B=Kp>pz~s${A>m51cO6oDV- zBL}WJNQ>3w;-tWVsbX$exUDj;D##;+S)60jHiJ& z0zFoR)`yjEYnbl=^Wzmb-a3Zs9T*ZE$-Yh9V$KZOT>3~sXflN6-jZXus3?>Z+!*(I zR>99zYW2$x~gI_FR}JlROcJorQ0omC4+-kL7(>t>>5 zmdQwxm&_bf1}wK^%F|P?A35B+&_G}Uesysbc7r1`zTRu38C-Fzw!`!nj0&8I7`Cmn Roo4HyWjVbPIJwg3`4O&dS&RSx diff --git a/po/sv.po b/po/sv.po index 7a71b67..bb135bd 100644 --- a/po/sv.po +++ b/po/sv.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: attr 2.4.25-1\n" "Report-Msgid-Bugs-To: acl-devel@nongnu.org\n" -"POT-Creation-Date: 2018-06-18 22:17-0400\n" +"POT-Creation-Date: 2021-03-11 19:52+0100\n" "PO-Revision-Date: 2006-01-21 18:46+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -29,105 +29,30 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #: libattr/attr_copy_fd.c:80 libattr/attr_copy_fd.c:95 +#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 #, c-format msgid "listing attributes of %s" msgstr "listar attribut för %s" -#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 #: libattr/attr_copy_fd.c:115 libattr/attr_copy_fd.c:132 +#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 #, c-format msgid "getting attribute %s of %s" msgstr "hämtar attribut %s för %s" -#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 #: libattr/attr_copy_fd.c:145 libattr/attr_copy_fd.c:164 +#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 #, c-format msgid "setting attributes for %s" msgstr "sätter attribut för %s" -#: libattr/attr_copy_file.c:150 libattr/attr_copy_fd.c:152 +#: libattr/attr_copy_fd.c:152 libattr/attr_copy_file.c:150 #, c-format msgid "setting attribute %s for %s" msgstr "sätter attribut %s för %s" -#: tools/attr.c:49 -#, fuzzy, c-format -msgid "" -"Usage: %s [-LRSq] -s attrname [-V attrvalue] pathname # set value\n" -" %s [-LRSq] -g attrname pathname # get value\n" -" %s [-LRSq] -r attrname pathname # remove attr\n" -" %s [-LRq] -l pathname # list attrs \n" -" -s reads a value from stdin and -g writes a value to stdout\n" -msgstr "" -"Användning: %s [-LRSq] -s attrnamn [-V attrvärde] sökväg # sätt värde\n" -" %s [-LRSq] -g attrnamn sökväg # hämta värde\n" -" %s [-LRSq] -r attrnamn sökväg # ta bort attr\n" -" -s läser ett värde från standard in och -g skriver ett värde till " -"standard ut\n" - -#: tools/attr.c:87 tools/attr.c:104 tools/attr.c:113 tools/attr.c:122 -#, fuzzy, c-format -msgid "Only one of -s, -g, -r, or -l allowed\n" -msgstr "Endast en av -s, -g eller -r tillåts\n" - -#: tools/attr.c:95 tools/attr.c:161 -#, c-format -msgid "-V only allowed with -s\n" -msgstr "-V tillåts endast med -s\n" - -#: tools/attr.c:140 -#, c-format -msgid "Unrecognized option: %c\n" -msgstr "Okänd flagga: %c\n" - -#: tools/attr.c:147 -#, c-format -msgid "A filename to operate on is required\n" -msgstr "Ett filnamn att operera på krävs\n" - -#: tools/attr.c:179 -#, c-format -msgid "Could not set \"%s\" for %s\n" -msgstr "Kunde inte sätta \"%s\" för %s\n" - -#: tools/attr.c:184 -#, c-format -msgid "Attribute \"%s\" set to a %d byte value for %s:\n" -msgstr "Attribut \"%s\" satt till ett %d bytevärde för %s:\n" - -#: tools/attr.c:202 -#, c-format -msgid "Could not get \"%s\" for %s\n" -msgstr "Kunde inte hämta \"%s\" för %s\n" - -#: tools/attr.c:207 -#, c-format -msgid "Attribute \"%s\" had a %d byte value for %s:\n" -msgstr "Attribut \"%s\" har ett %d bytevärde för %s:\n" - -#: tools/attr.c:220 -#, c-format -msgid "Could not remove \"%s\" for %s\n" -msgstr "Kunde inte ta bort \"%s\" för %s\n" - -#: tools/attr.c:238 -#, fuzzy, c-format -msgid "Could not list %s\n" -msgstr "Kunde inte sätta \"%s\" för %s\n" - -#: tools/attr.c:248 -#, fuzzy, c-format -msgid "Attribute \"%s\" has a %d byte value for %s\n" -msgstr "Attribut \"%s\" har ett %d bytevärde för %s:\n" - -#: tools/attr.c:260 -#, fuzzy, c-format -msgid "At least one of -s, -g, -r, or -l is required\n" -msgstr "Åtminstone en av -s, -g eller -r krävs\n" - -#: tools/setfattr.c:75 tools/getfattr.c:99 +#: tools/setfattr.c:75 tools/getfattr.c:100 msgid "No such attribute" msgstr "Inget sådant attribut" @@ -146,7 +71,7 @@ msgstr "%s: Inget filnamn hittades p msgid "%s %s -- set extended attributes\n" msgstr "%s %s -- sätt utökade attribut\n" -#: tools/setfattr.c:181 tools/getfattr.c:380 +#: tools/setfattr.c:181 tools/getfattr.c:385 #, c-format msgid "Usage: %s %s\n" msgstr "Användning: %s %s\n" @@ -186,18 +111,18 @@ msgstr "" "Användning: %s %s\n" "Försök med \"%s --help\" för mer information.\n" -#: tools/getfattr.c:260 +#: tools/getfattr.c:265 #, c-format msgid "%s: Removing leading '/' from absolute path names\n" msgstr "%s: Ta bort inledande \"/\" från absoluta sökvägar\n" -#: tools/getfattr.c:378 +#: tools/getfattr.c:383 #, c-format msgid "%s %s -- get extended attributes\n" msgstr "%s %s -- hämta utökade attribut\n" -#: tools/getfattr.c:383 -#, c-format +#: tools/getfattr.c:388 +#, fuzzy, c-format msgid "" " -n, --name=name get the named extended attribute value\n" " -d, --dump get all extended attribute values\n" @@ -205,6 +130,7 @@ msgid "" " --match=pattern only get attributes with names matching pattern\n" " --only-values print the bare values only\n" " -h, --no-dereference do not dereference symbolic links\n" +" --one-file-system skip files on different filesystems\n" " --absolute-names don't strip leading '/' in pathnames\n" " -R, --recursive recurse into subdirectories\n" " -L, --logical logical walk, follow symbolic links\n" @@ -227,12 +153,12 @@ msgstr "" " --version skriv ut version och avsluta\n" " --help den här hjälptexten\n" -#: tools/getfattr.c:479 +#: tools/getfattr.c:489 #, c-format msgid "%s: invalid regular expression \"%s\"\n" msgstr "%s: ogiltigt reguljärt uttryck \"%s\"\n" -#: tools/getfattr.c:493 +#: tools/getfattr.c:503 #, c-format msgid "" "Usage: %s %s\n" @@ -240,3 +166,78 @@ msgid "" msgstr "" "Användning: %s %s\n" "Försök med \"%s --help\" för mer information.\n" + +#: tools/attr.c:49 +#, fuzzy, c-format +msgid "" +"Usage: %s [-LRSq] -s attrname [-V attrvalue] pathname # set value\n" +" %s [-LRSq] -g attrname pathname # get value\n" +" %s [-LRSq] -r attrname pathname # remove attr\n" +" %s [-LRq] -l pathname # list attrs \n" +" -s reads a value from stdin and -g writes a value to stdout\n" +msgstr "" +"Användning: %s [-LRSq] -s attrnamn [-V attrvärde] sökväg # sätt värde\n" +" %s [-LRSq] -g attrnamn sökväg # hämta värde\n" +" %s [-LRSq] -r attrnamn sökväg # ta bort attr\n" +" -s läser ett värde från standard in och -g skriver ett värde till " +"standard ut\n" + +#: tools/attr.c:87 tools/attr.c:104 tools/attr.c:113 tools/attr.c:122 +#, fuzzy, c-format +msgid "Only one of -s, -g, -r, or -l allowed\n" +msgstr "Endast en av -s, -g eller -r tillåts\n" + +#: tools/attr.c:95 tools/attr.c:161 +#, c-format +msgid "-V only allowed with -s\n" +msgstr "-V tillåts endast med -s\n" + +#: tools/attr.c:140 +#, c-format +msgid "Unrecognized option: %c\n" +msgstr "Okänd flagga: %c\n" + +#: tools/attr.c:147 +#, c-format +msgid "A filename to operate on is required\n" +msgstr "Ett filnamn att operera på krävs\n" + +#: tools/attr.c:179 +#, c-format +msgid "Could not set \"%s\" for %s\n" +msgstr "Kunde inte sätta \"%s\" för %s\n" + +#: tools/attr.c:184 +#, c-format +msgid "Attribute \"%s\" set to a %d byte value for %s:\n" +msgstr "Attribut \"%s\" satt till ett %d bytevärde för %s:\n" + +#: tools/attr.c:202 +#, c-format +msgid "Could not get \"%s\" for %s\n" +msgstr "Kunde inte hämta \"%s\" för %s\n" + +#: tools/attr.c:207 +#, c-format +msgid "Attribute \"%s\" had a %d byte value for %s:\n" +msgstr "Attribut \"%s\" har ett %d bytevärde för %s:\n" + +#: tools/attr.c:220 +#, c-format +msgid "Could not remove \"%s\" for %s\n" +msgstr "Kunde inte ta bort \"%s\" för %s\n" + +#: tools/attr.c:238 +#, fuzzy, c-format +msgid "Could not list %s\n" +msgstr "Kunde inte sätta \"%s\" för %s\n" + +#: tools/attr.c:248 +#, fuzzy, c-format +msgid "Attribute \"%s\" has a %d byte value for %s\n" +msgstr "Attribut \"%s\" har ett %d bytevärde för %s:\n" + +#: tools/attr.c:260 +#, fuzzy, c-format +msgid "At least one of -s, -g, -r, or -l is required\n" +msgstr "Åtminstone en av -s, -g eller -r krävs\n" diff --git a/test/attr.test b/test/attr.test index 9f750b0..6ce2f9b 100644 --- a/test/attr.test +++ b/test/attr.test @@ -391,3 +391,9 @@ Test for proper recursion of directory structures with -L -P -R > $ rm -R 1 + +Test for large-file support + + $ dd bs=65536 seek=32768 if=/dev/null of=large-file 2>/dev/null ||: + $ sh -c 'if test -f large-file; then getfattr large-file; fi' + $ rm large-file diff --git a/test/run b/test/run index 4b1f8d0..07e916c 100755 --- a/test/run +++ b/test/run @@ -106,7 +106,7 @@ for (;;) { if (defined $line) { # Substitute %VAR and %{VAR} with environment variables. $line =~ s[%(\w+)][$ENV{$1}]eg; - $line =~ s[%{(\w+)}][$ENV{$1}]eg; + $line =~ s[%\{(\w+)}][$ENV{$1}]eg; } if (defined $line) { if ($line =~ s/^\s*< ?//) { diff --git a/tools/attr.c b/tools/attr.c index c8aa0b4..312aef1 100644 --- a/tools/attr.c +++ b/tools/attr.c @@ -228,7 +228,7 @@ main(int argc, char **argv) perror("malloc"); exit(1); } - bzero((char *)&cursor, sizeof(cursor)); + memset(&cursor, 0, sizeof(cursor)); do { error = attr_list(filename, buffer, BUFSIZE, attrflags, &cursor); diff --git a/tools/getfattr.c b/tools/getfattr.c index 72a8852..abdd0d4 100644 --- a/tools/getfattr.c +++ b/tools/getfattr.c @@ -2,7 +2,7 @@ File: getfattr.c (Linux Extended Attributes) - Copyright (C) 2001-2002 Andreas Gruenbacher + Copyright (C) 2001-2002 Andreas Gruenbacher Copyright (C) 2001-2002 Silicon Graphics, Inc. All Rights Reserved. This program is free software: you can redistribute it and/or modify it @@ -46,6 +46,7 @@ struct option long_options[] = { { "only-values", 0, 0, 'v' }, { "no-dereference", 0, 0, 'h' }, { "absolute-names", 0, 0, 'a' }, + { "one-file-system", 0, 0, 1 }, { "recursive", 0, 0, 'R' }, { "logical", 0, 0, 'L' }, { "physical", 0, 0, 'P' }, @@ -110,6 +111,10 @@ int well_enough_printable(const char *value, size_t size) { size_t n, nonpr = 0; + /* Don't count the NULL terminator if there is one */ + if (size && !value[size - 1]) + size--; + for (n=0; n < size; n++) if (!isprint(*value++)) nonpr++; @@ -386,6 +391,7 @@ void help(void) " --match=pattern only get attributes with names matching pattern\n" " --only-values print the bare values only\n" " -h, --no-dereference do not dereference symbolic links\n" +" --one-file-system skip files on different filesystems\n" " --absolute-names don't strip leading '/' in pathnames\n" " -R, --recursive recurse into subdirectories\n" " -L, --logical logical walk, follow symbolic links\n" @@ -461,6 +467,10 @@ int main(int argc, char *argv[]) walk_flags |= WALK_TREE_RECURSIVE; break; + case 1: /* one filesystem */ + walk_flags |= WALK_TREE_ONE_FILESYSTEM; + break; + case 'V': printf("%s " VERSION "\n", progname); return 0; diff --git a/tools/setfattr.c b/tools/setfattr.c index ad8f35d..b2e1df0 100644 --- a/tools/setfattr.c +++ b/tools/setfattr.c @@ -2,7 +2,7 @@ File: setfattr.c (Linux Extended Attributes) - Copyright (C) 2001-2002 Andreas Gruenbacher + Copyright (C) 2001-2002 Andreas Gruenbacher Copyright (C) 2001-2002 Silicon Graphics, Inc. All Rights Reserved. This program is free software: you can redistribute it and/or modify it diff --git a/xattr.conf b/xattr.conf index dcbc12c..1affac5 100644 --- a/xattr.conf +++ b/xattr.conf @@ -19,3 +19,4 @@ trusted.SGI_MAC_FILE skip # xfs specific xfsroot.* skip # xfs specific; obsolete user.Beagle.* skip # ignore Beagle index data security.evm skip # may only be written by kernel +afs.* skip # AFS metadata and ACLs -- 2.7.4