diff -Nru mc-4.8.10/AUTHORS mc-4.8.11/AUTHORS --- mc-4.8.10/AUTHORS 2013-06-25 21:29:13.000000000 +0000 +++ mc-4.8.11/AUTHORS 2013-10-15 09:52:40.000000000 +0000 @@ -61,7 +61,9 @@ Egmont Koblinger Support of 256 colors - Support of extended mouse clicks beyond 223 + Support of extended mouse clicks beyond 223 column + Support of bracketed paste mode of xterm + (http://invisible-island.net/xterm/ctlseqs/ctlseqs.html#Bracketed%20Paste%20Mode) Erwin van Eijk diff -Nru mc-4.8.10/Makefile.am mc-4.8.11/Makefile.am --- mc-4.8.10/Makefile.am 2013-06-25 21:29:13.000000000 +0000 +++ mc-4.8.11/Makefile.am 2013-11-29 18:27:07.000000000 +0000 @@ -17,7 +17,16 @@ CONFIG_STATUS_DEPENDENCIES = $(top_srcdir)/version.h -.PHONY: update-version +.PHONY: update-version \ + cppcheck \ + cppcheck-error \ + cppcheck-information \ + cppcheck-performance \ + cppcheck-portability \ + cppcheck-style \ + cppcheck-warning \ + cppcheck-all + update-version: @if test -x $(top_srcdir)/maint/utils/version.sh; then \ @@ -30,3 +39,89 @@ fi $(top_srcdir)/version.h: update-version + +CPPCHECK_CMD = cppcheck \ + --inline-suppr \ + --error-exitcode=0 \ + -j 4 \ + --force \ + -I $(top_srcdir)/lib \ + --language=c \ + --std=c99 + +CPPCHECK_DIRS = \ + "$(top_srcdir)/lib" \ + "$(top_srcdir)/src" + +CPPCHECK_OUT_PREFIX = $(top_builddir)/cppcheck- + +CPPCHECK_OUT_EXT = log.txt + +CPPCHECK_SED_FILTER = \ + -e '/\/src\/vfs\/smbfs\//d' \ + -e '/is reassigned a value before the old one has been used./d' \ + -e '/ Unmatched suppression: /d' \ + -e "/Skipping configuration '.*' since the value of '.*' is unknown./d" + +cppcheck: + $(CPPCHECK_CMD) --enable=all $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)all.$(CPPCHECK_OUT_EXT); + $(SED) -i $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)all.$(CPPCHECK_OUT_EXT) + +cppcheck-all: cppcheck + +cppcheck-information: + $(CPPCHECK_CMD) --enable=information $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)information.$(CPPCHECK_OUT_EXT); + $(SED) -i $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)information.$(CPPCHECK_OUT_EXT) + +cppcheck-performance: + $(CPPCHECK_CMD) --enable=performance $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)performance.$(CPPCHECK_OUT_EXT); + $(SED) -i $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)performance.$(CPPCHECK_OUT_EXT) + +cppcheck-portability: + $(CPPCHECK_CMD) --enable=portability $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)portability.$(CPPCHECK_OUT_EXT); + $(SED) -i $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)portability.$(CPPCHECK_OUT_EXT) + +cppcheck-style: + $(CPPCHECK_CMD) --enable=style $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)style.$(CPPCHECK_OUT_EXT); + $(SED) -i $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)style.$(CPPCHECK_OUT_EXT) + +cppcheck-warning: + $(CPPCHECK_CMD) --enable=warning $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)warning.$(CPPCHECK_OUT_EXT); + $(SED) -i $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)warning.$(CPPCHECK_OUT_EXT) + +cppcheck-unusedFunction: + $(CPPCHECK_CMD) --enable=unusedFunction $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)unusedFunction.$(CPPCHECK_OUT_EXT); + $(SED) -i $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)unusedFunction.$(CPPCHECK_OUT_EXT) + +cppcheck-missingInclude: + $(CPPCHECK_CMD) --enable=missingInclude $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)missingInclude.$(CPPCHECK_OUT_EXT); + $(SED) -i $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)missingInclude.$(CPPCHECK_OUT_EXT) + +cppcheck-split-all: \ + cppcheck-information \ + cppcheck-performance \ + cppcheck-portability \ + cppcheck-style \ + cppcheck-warning \ + cppcheck-unusedFunction \ + cppcheck-missingInclude + +INDENT_CMD = indent \ + --gnu-style \ + --format-first-column-comments \ + --indent-level4 \ + --brace-indent0 \ + --line-length100 \ + --no-tabs \ + --blank-lines-after-procedures + +INDENT_DIRS = \ + "$(top_srcdir)/lib" \ + "$(top_srcdir)/src" \ + "$(top_srcdir)/tests" + +indent: + for directory in $(INDENT_DIRS); do \ + find "$${directory}" -name '*.[ch]' -print0 | \ + xargs -0 $(INDENT_CMD); \ + done diff -Nru mc-4.8.10/Makefile.in mc-4.8.11/Makefile.in --- mc-4.8.10/Makefile.in 2013-08-02 18:56:35.000000000 +0000 +++ mc-4.8.11/Makefile.in 2013-11-29 18:45:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,20 +81,20 @@ host_triplet = @host@ @HAVE_TESTS_TRUE@am__append_1 = tests subdir = . -DIST_COMMON = README $(am__configure_deps) $(dist_noinst_HEADERS) \ - $(dist_noinst_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/intl/Makefile.in ABOUT-NLS \ + $(dist_noinst_SCRIPTS) $(dist_noinst_HEADERS) COPYING \ + config/compile config/config.guess config/config.rpath \ + config/config.sub config/depcomp config/install-sh \ + config/missing config/mkinstalldirs config/ltmain.sh \ $(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \ $(top_srcdir)/config/config.rpath \ $(top_srcdir)/config/config.sub \ $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ - $(top_srcdir)/config/missing \ - $(top_srcdir)/config/mkinstalldirs $(top_srcdir)/configure \ - $(top_srcdir)/intl/Makefile.in ABOUT-NLS AUTHORS COPYING \ - ChangeLog INSTALL NEWS config/compile config/config.guess \ - config/config.rpath config/config.sub config/depcomp \ - config/install-sh config/ltmain.sh config/missing \ - config/mkinstalldirs + $(top_srcdir)/config/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -143,13 +171,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -158,9 +187,30 @@ HEADERS = $(dist_noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -424,6 +474,41 @@ dist_noinst_HEADERS = $(top_srcdir)/version.h ACLOCAL_AMFLAGS = -I m4 CONFIG_STATUS_DEPENDENCIES = $(top_srcdir)/version.h +CPPCHECK_CMD = cppcheck \ + --inline-suppr \ + --error-exitcode=0 \ + -j 4 \ + --force \ + -I $(top_srcdir)/lib \ + --language=c \ + --std=c99 + +CPPCHECK_DIRS = \ + "$(top_srcdir)/lib" \ + "$(top_srcdir)/src" + +CPPCHECK_OUT_PREFIX = $(top_builddir)/cppcheck- +CPPCHECK_OUT_EXT = log.txt +CPPCHECK_SED_FILTER = \ + -e '/\/src\/vfs\/smbfs\//d' \ + -e '/is reassigned a value before the old one has been used./d' \ + -e '/ Unmatched suppression: /d' \ + -e "/Skipping configuration '.*' since the value of '.*' is unknown./d" + +INDENT_CMD = indent \ + --gnu-style \ + --format-first-column-comments \ + --indent-level4 \ + --brace-indent0 \ + --line-length100 \ + --no-tabs \ + --blank-lines-after-procedures + +INDENT_DIRS = \ + "$(top_srcdir)/lib" \ + "$(top_srcdir)/src" \ + "$(top_srcdir)/tests" + all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -495,14 +580,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -523,31 +607,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -563,12 +629,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -580,15 +641,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -597,18 +654,16 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" - cscope: cscope.files test ! -s cscope.files \ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) - clean-cscope: -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive -cscope.files: clean-cscope cscopelist-recursive cscopelist - -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -742,9 +797,9 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ @@ -912,29 +967,35 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-cscope \ - clean-generic clean-libtool cscope cscopelist \ - cscopelist-recursive ctags ctags-recursive dist dist-all \ - dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am - +.MAKE: $(am__recursive_targets) all install-am install-strip -.PHONY: update-version +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool 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-generic \ + distclean-hdr distclean-libtool distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am + + +.PHONY: update-version \ + cppcheck \ + cppcheck-error \ + cppcheck-information \ + cppcheck-performance \ + cppcheck-portability \ + cppcheck-style \ + cppcheck-warning \ + cppcheck-all update-version: @if test -x $(top_srcdir)/maint/utils/version.sh; then \ @@ -948,6 +1009,55 @@ $(top_srcdir)/version.h: update-version +cppcheck: + $(CPPCHECK_CMD) --enable=all $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)all.$(CPPCHECK_OUT_EXT); + $(SED) -i $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)all.$(CPPCHECK_OUT_EXT) + +cppcheck-all: cppcheck + +cppcheck-information: + $(CPPCHECK_CMD) --enable=information $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)information.$(CPPCHECK_OUT_EXT); + $(SED) -i $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)information.$(CPPCHECK_OUT_EXT) + +cppcheck-performance: + $(CPPCHECK_CMD) --enable=performance $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)performance.$(CPPCHECK_OUT_EXT); + $(SED) -i $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)performance.$(CPPCHECK_OUT_EXT) + +cppcheck-portability: + $(CPPCHECK_CMD) --enable=portability $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)portability.$(CPPCHECK_OUT_EXT); + $(SED) -i $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)portability.$(CPPCHECK_OUT_EXT) + +cppcheck-style: + $(CPPCHECK_CMD) --enable=style $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)style.$(CPPCHECK_OUT_EXT); + $(SED) -i $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)style.$(CPPCHECK_OUT_EXT) + +cppcheck-warning: + $(CPPCHECK_CMD) --enable=warning $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)warning.$(CPPCHECK_OUT_EXT); + $(SED) -i $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)warning.$(CPPCHECK_OUT_EXT) + +cppcheck-unusedFunction: + $(CPPCHECK_CMD) --enable=unusedFunction $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)unusedFunction.$(CPPCHECK_OUT_EXT); + $(SED) -i $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)unusedFunction.$(CPPCHECK_OUT_EXT) + +cppcheck-missingInclude: + $(CPPCHECK_CMD) --enable=missingInclude $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)missingInclude.$(CPPCHECK_OUT_EXT); + $(SED) -i $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)missingInclude.$(CPPCHECK_OUT_EXT) + +cppcheck-split-all: \ + cppcheck-information \ + cppcheck-performance \ + cppcheck-portability \ + cppcheck-style \ + cppcheck-warning \ + cppcheck-unusedFunction \ + cppcheck-missingInclude + +indent: + for directory in $(INDENT_DIRS); do \ + find "$${directory}" -name '*.[ch]' -print0 | \ + xargs -0 $(INDENT_CMD); \ + 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. .NOEXPORT: diff -Nru mc-4.8.10/NEWS mc-4.8.11/NEWS --- mc-4.8.10/NEWS 2013-08-02 18:51:44.000000000 +0000 +++ mc-4.8.11/NEWS 2013-11-29 18:42:44.000000000 +0000 @@ -1,3 +1,49 @@ +Version 4.8.11 + +- Core + * Live update of panels size when editing layout (#3060) + * Support "Compute totals" option in move file operation (#2075) + +- VFS + * rpm extfs + - show dependency version (#2812) + - support tar payload (#3064) + - improve support for EPOCH tag (#1588) + - add support for PREINPROG/POSTINPROG/PREUNPROG/POSTUNPROG, VERIFYSCRIPTPROG and TRIGGERSCRIPTS/TRIGGERSCRIPTPROG tags (#1588) + +- Editor + * Support "bracketed paste mode" of xterm (#2661) + * Clarify Java syntax highlighting (#3057) + +- Misc + * Print warnings about unknown '--with-' / '--enable-' configure options (#3029) + * Code cleanup and refactoring (#3051, #3066) + +- Fixes + * FTBFS on GNU Hurd (#3053, #3071) + * Segfault while moving files (#3059, #3105) + * Broken handling of mc command line arguments (#3047) + * Copy/move doesn't work if num_history_items_recorded=0 (#3076) + * No subdir path completion in current dir, if stub is not starting with './' (#3018) + * Deprecated "find -perm +xxx" syntax is used (#3089) + * Home, End, Shift-Fn keys don't work in tmux (#2978) + * Improper [en|dis]abling of layout dialog split adjustment buttons (#3061) + * Bogus strings in 'Confirmation' config dialog (#2271) + * "Configure options" first entry not highlighted (#3084) + * "Setup saved to ~/.config/mc/ini" message is misleading (#3096) + * F3 doesn't work on .so files in FreeBSD 9.x (#3101) + * Typo in mc.lib: "less=%filename +%linenog" instead of "+%lineno" (part of #3044) + * Wrong order of filename and line number for external editor (part of #3044) + * mcedit: tabs are lost when text is pasted (#1797 as part of #2661) + * mcedit: question on large file treats Escape as Yes (#3107) + * Broken case-sensitive search in editor/viewer/diffviewer (#3069) + * Changes to files in nested .zip archives are lost (#3070) + * Incorrect handling of filenames with spaces with unrar v5 (#3073) + * iso9660 VFS: filenames truncating in ISO file listing (#3091) + * vfs_path_from_str_flags() doesn't support VPF_STRIP_HOME (#3098) + * Bright colors are used as background colors in 16-color skins (#3050) + * Various defects in documentation (#3052, #3092) + Version 4.8.10 - Core @@ -699,7 +745,7 @@ * Incorrect key event handling in "Listing mode" dialog (#2045) * Usability of field history in "Find file" dialog (#2046, #2407) * Find "Whole words" search bug (#2396) - * Directory ignorance doesn't work in file find (#2366, #2434) + * List of ignored directories doesn't work in file find (#2366, #2434) * Incorrect line jump when started as editor (#2344) * User menu in standalone mcedit doesn't show filetype-specific items (#1651) * Configure script doesn't set samba configdir (#2419) diff -Nru mc-4.8.10/aclocal.m4 mc-4.8.11/aclocal.m4 --- mc-4.8.10/aclocal.m4 2013-08-02 18:03:56.000000000 +0000 +++ mc-4.8.11/aclocal.m4 2013-11-29 18:45:43.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.12.2 -*- Autoconf -*- +# generated automatically by aclocal 1.13.4 -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,6 +11,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, @@ -219,24 +220,22 @@ m4_popdef([pkg_description]) ]) dnl PKG_NOARCH_INSTALLDIR -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # 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.12' +[am__api_version='1.13' 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.12.2], [], +m4_if([$1], [1.13.4], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -252,21 +251,19 @@ # 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.12.2])dnl +[AM_AUTOMAKE_VERSION([1.13.4])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to # '$srcdir', '$srcdir/..', or '$srcdir/../..'. @@ -314,14 +311,12 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. @@ -347,13 +342,12 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 17 # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -539,19 +533,18 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # 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 @@ -580,7 +573,7 @@ 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 + 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 @@ -616,14 +609,12 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 19 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -639,7 +630,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -669,8 +660,7 @@ dnl Distinguish between old-style and new-style calls. m4_ifval([$2], [AC_DIAGNOSE([obsolete], -[$0: two- and three-arguments forms are deprecated. For more info, see: -http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) + [$0: two- and three-arguments forms are deprecated.]) m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], @@ -724,18 +714,15 @@ [_AM_DEPENDENCIES([OBJC])], [m4_define([AC_PROG_OBJC], m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl -dnl Support for Objective C++ was only introduced in Autoconf 2.65, -dnl but we still cater to Autoconf 2.62. -m4_ifdef([AC_PROG_OBJCXX], -[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], [_AM_DEPENDENCIES([OBJCXX])], [m4_define([AC_PROG_OBJCXX], - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl @@ -769,14 +756,12 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -792,14 +777,12 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -816,14 +799,12 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 7 - # AM_MAINTAINER_MODE([DEFAULT-MODE]) # ---------------------------------- # Control maintainer-specific portions of Makefiles. @@ -851,18 +832,14 @@ ] ) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -905,14 +882,12 @@ rm -f confinc confmf ]) -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_PROG_CC_C_O # -------------- # Like AC_PROG_CC_C_O, but changed for automake. @@ -941,14 +916,12 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 7 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -956,11 +929,10 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -973,8 +945,8 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= AC_MSG_WARN(['missing' script is too old or missing]) @@ -983,14 +955,12 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -1016,14 +986,12 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], @@ -1099,14 +1067,12 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT @@ -1161,14 +1127,12 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor 'install' (even GNU) is that you can't @@ -1191,14 +1155,12 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2012 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -1212,14 +1174,12 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. @@ -1233,76 +1193,114 @@ # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of '-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff -Nru mc-4.8.10/config/compile mc-4.8.11/config/compile --- mc-4.8.10/config/compile 2012-09-26 14:03:18.000000000 +0000 +++ mc-4.8.11/config/compile 2013-06-17 09:16:35.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-03-05.13; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -112,6 +112,11 @@ lib=$dir/$lib.lib break fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi done IFS=$save_IFS diff -Nru mc-4.8.10/config/config.guess mc-4.8.11/config/config.guess --- mc-4.8.10/config/config.guess 2012-09-26 14:03:18.000000000 +0000 +++ mc-4.8.11/config/config.guess 2013-06-17 09:16:35.000000000 +0000 @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-06-10' +timestamp='2013-06-10' # 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 -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +20,17 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -138,6 +132,27 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +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 + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -200,6 +215,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + 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} @@ -302,7 +321,7 @@ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,6 +820,9 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -852,21 +874,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`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 '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -879,59 +901,54 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) 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-gnu + 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-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -950,54 +967,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + 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-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + 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-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1201,6 +1227,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1227,19 +1256,21 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1330,9 +1361,6 @@ exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c <. @@ -26,11 +20,12 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,7 +116,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +149,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -259,8 +252,10 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -273,7 +268,7 @@ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -291,16 +286,17 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -370,7 +366,7 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ @@ -389,7 +385,8 @@ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -407,12 +404,13 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -788,9 +786,13 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -1004,7 +1006,7 @@ ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown @@ -1019,7 +1021,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1346,21 +1352,21 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1492,9 +1498,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1586,6 +1589,9 @@ mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff -Nru mc-4.8.10/config/depcomp mc-4.8.11/config/depcomp --- mc-4.8.10/config/depcomp 2012-09-26 14:03:18.000000000 +0000 +++ mc-4.8.11/config/depcomp 2013-06-17 09:16:35.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2012-03-27.16; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,9 +27,9 @@ case $1 in '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -56,11 +56,65 @@ ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + # A tabulation character. tab=' ' # A newline character. nl=' ' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 @@ -74,6 +128,9 @@ rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -85,32 +142,32 @@ fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 fi if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. - gccflag=-qmakedep=gcc,-MF - depmode=gcc + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -133,8 +190,7 @@ done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -142,13 +198,17 @@ ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -156,15 +216,14 @@ fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ## This next piece of magic avoids the "deleted header file" problem. @@ -173,15 +232,15 @@ ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' "$nl" < "$tmpdepfile" | ## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -199,8 +258,7 @@ "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -208,7 +266,6 @@ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in @@ -216,19 +273,15 @@ # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr "$nl" ' ' >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; @@ -246,9 +299,8 @@ # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -261,9 +313,7 @@ "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -272,65 +322,113 @@ do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependent.h'. - # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. - # However on - # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\': + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - # tcc 0.9.26 (FIXME still under development at the moment of writing) - # will emit a similar output, but also prepend the continuation lines - # with horizontal tabulation characters. - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" - # Each line is of the form 'foo.o: dependent.h', - # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ - < "$tmpdepfile" > "$depfile" - sed ' - s/[ '"$tab"'][ '"$tab"']*/ /g - s/^ *// - s/ *\\*$// - s/^[^:]*: *// - /^$/d - /:$/d - s/$/ :/ - ' < "$tmpdepfile" >> "$depfile" + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -341,9 +439,8 @@ # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -354,8 +451,7 @@ "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -365,76 +461,61 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -445,8 +526,7 @@ "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -472,6 +552,7 @@ G p }' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; @@ -523,13 +604,14 @@ # in the target name. This is to cope with DOS-style filenames: # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' "$nl" < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -582,10 +664,12 @@ # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -621,10 +705,10 @@ esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -656,15 +740,15 @@ shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | diff -Nru mc-4.8.10/config/missing mc-4.8.11/config/missing --- mc-4.8.10/config/missing 2012-09-26 14:03:18.000000000 +0000 +++ mc-4.8.11/config/missing 2013-06-17 09:16:35.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.18; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,61 +29,33 @@ exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, 'missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file 'aclocal.m4' - autoconf touch file 'configure' - autoheader touch file 'config.h.in' - autom4te touch the output file, or create a stub one - automake touch all 'Makefile.in' files - bison create 'y.tab.[ch]', if possible, from existing .[ch] - flex create 'lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create 'lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create 'y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and 'g' are ignored when checking the name. @@ -98,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "$0: unknown '$1' option" echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running '$TOOL --version' or '$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acinclude.m4' or '${configure_ac}'. You might want - to install the Automake and Perl packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified '${configure_ac}'. You might want to install the - Autoconf and GNU m4 packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acconfig.h' or '${configure_ac}'. You might want - to install the Autoconf and GNU m4 packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. - You might want to install the Automake and Perl packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: '$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get '$1' as part of Autoconf from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: '$1' $msg. You should only need it if - you modified a '.y' file. You may need the Bison package - in order for those modifications to take effect. You can get - Bison from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.l' file. You may need the Flex package - in order for those modifications to take effect. You can get - Flex from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - Help2man package in order for those modifications to take - effect. You can get Help2man from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.texi' or '.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy 'make' (AIX, - DU, IRIX). You might want to install the Texinfo package or - the GNU make package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: '$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the 'README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing '$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -Nru mc-4.8.10/config/test-driver mc-4.8.11/config/test-driver --- mc-4.8.10/config/test-driver 1970-01-01 00:00:00.000000000 +0000 +++ mc-4.8.11/config/test-driver 2013-06-17 09:16:35.000000000 +0000 @@ -0,0 +1,127 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2012-06-27.10; # UTC + +# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <$log_file 2>&1 +estatus=$? +if test $enable_hard_errors = no && test $estatus -eq 99; then + estatus=1 +fi + +case $estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -Nru mc-4.8.10/config.h.in mc-4.8.11/config.h.in --- mc-4.8.10/config.h.in 2013-08-02 18:05:53.000000000 +0000 +++ mc-4.8.11/config.h.in 2013-11-29 18:45:44.000000000 +0000 @@ -439,9 +439,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_IOCTL_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_MKDEV_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_MNTENT_H @@ -466,9 +463,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SYSMACROS_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H @@ -533,6 +527,14 @@ */ #undef LT_OBJDIR +/* Define to 1 if `major', `minor', and `makedev' are declared in . + */ +#undef MAJOR_IN_MKDEV + +/* Define to 1 if `major', `minor', and `makedev' are declared in + . */ +#undef MAJOR_IN_SYSMACROS + /* MC configure arguments */ #undef MC_CONFIGURE_ARGS diff -Nru mc-4.8.10/configure mc-4.8.11/configure --- mc-4.8.10/configure 2013-08-02 18:56:30.000000000 +0000 +++ mc-4.8.11/configure 2013-11-29 18:45:45.000000000 +0000 @@ -2889,7 +2889,7 @@ -am__api_version='1.12' +am__api_version='1.13' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3073,8 +3073,8 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 @@ -3314,6 +3314,45 @@ fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -3377,12 +3416,17 @@ # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -8755,7 +8799,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -8773,7 +8817,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -8792,7 +8839,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -17239,7 +17289,7 @@ for ac_header in string.h memory.h limits.h malloc.h \ utime.h sys/statfs.h sys/vfs.h \ sys/select.h sys/ioctl.h stropts.h arpa/inet.h \ - sys/socket.h sys/sysmacros.h sys/mkdev.h + sys/socket.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -17252,6 +17302,56 @@ done +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5 +$as_echo_n "checking whether sys/types.h defines makedev... " >&6; } +if ${ac_cv_header_sys_types_h_makedev+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +return makedev(0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_header_sys_types_h_makedev=yes +else + ac_cv_header_sys_types_h_makedev=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_types_h_makedev" >&5 +$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; } + +if test $ac_cv_header_sys_types_h_makedev = no; then +ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_mkdev_h" = xyes; then : + +$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h + +fi + + + + if test $ac_cv_header_sys_mkdev_h = no; then + ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then : + +$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h + +fi + + + fi +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable assertions" >&5 $as_echo_n "checking whether to enable assertions... " >&6; } @@ -29136,7 +29236,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # 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 @@ -29187,7 +29287,7 @@ 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 + 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 @@ -30195,3 +30295,11 @@ Support for charset: ${charset_msg} Search type: ${SEARCH_TYPE} " >&6;} + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" "$LINENO" 5 ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} ;; + esac +fi diff -Nru mc-4.8.10/configure.ac mc-4.8.11/configure.ac --- mc-4.8.10/configure.ac 2013-08-02 17:57:00.000000000 +0000 +++ mc-4.8.11/configure.ac 2013-11-29 18:27:07.000000000 +0000 @@ -159,7 +159,8 @@ AC_CHECK_HEADERS([string.h memory.h limits.h malloc.h \ utime.h sys/statfs.h sys/vfs.h \ sys/select.h sys/ioctl.h stropts.h arpa/inet.h \ - sys/socket.h sys/sysmacros.h sys/mkdev.h]) + sys/socket.h]) +AC_HEADER_MAJOR AC_HEADER_ASSERT @@ -655,3 +656,12 @@ Support for charset: ${charset_msg} Search type: ${SEARCH_TYPE} ]) + +dnl option checking is disable by default due to AC_CONFIG_SUBDIRS +dnl we enable it back for top-level ./configure +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + fatal) AC_MSG_ERROR([unrecognized options: $ac_unrecognized_opts]) ;; + *) AC_MSG_WARN( [unrecognized options: $ac_unrecognized_opts]) ;; + esac +fi diff -Nru mc-4.8.10/contrib/Makefile.in mc-4.8.11/contrib/Makefile.in --- mc-4.8.10/contrib/Makefile.in 2013-08-02 18:56:35.000000000 +0000 +++ mc-4.8.11/contrib/Makefile.in 2013-11-29 18:45:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = contrib -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/config/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ @@ -155,13 +183,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -170,9 +199,29 @@ DATA = $(cfg_DATA) $(noinst_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -531,14 +580,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -559,31 +607,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -599,12 +629,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -616,15 +641,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -633,9 +654,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -811,25 +833,22 @@ uninstall-am: uninstall-cfgDATA uninstall-pkglibexecSCRIPTS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-cfgDATA install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-cfgDATA install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ install-pkglibexecSCRIPTS install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-cfgDATA uninstall-pkglibexecSCRIPTS + ps ps-am tags tags-am uninstall uninstall-am uninstall-cfgDATA \ + uninstall-pkglibexecSCRIPTS mc.csh: $(srcdir)/mc.csh.in diff -Nru mc-4.8.10/contrib/dist/Makefile.in mc-4.8.11/contrib/dist/Makefile.in --- mc-4.8.10/contrib/dist/Makefile.in 2013-08-02 18:56:35.000000000 +0000 +++ mc-4.8.11/contrib/dist/Makefile.in 2013-11-29 18:45:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = contrib/dist -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/pkginfo.in $(srcdir)/prototype.in \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs $(srcdir)/pkginfo.in \ + $(srcdir)/prototype.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -127,13 +155,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -142,9 +171,29 @@ DATA = $(noinst_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -439,14 +488,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -467,31 +515,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -507,12 +537,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -524,15 +549,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -541,9 +562,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -715,23 +737,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/contrib/dist/gentoo/Makefile.in mc-4.8.11/contrib/dist/gentoo/Makefile.in --- mc-4.8.10/contrib/dist/gentoo/Makefile.in 2013-08-02 18:56:35.000000000 +0000 +++ mc-4.8.11/contrib/dist/gentoo/Makefile.in 2013-11-29 18:45:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,8 +79,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = contrib/dist/gentoo -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -132,6 +160,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(noinst_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -383,11 +412,9 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -525,15 +552,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/contrib/dist/redhat/Makefile.in mc-4.8.11/contrib/dist/redhat/Makefile.in --- mc-4.8.10/contrib/dist/redhat/Makefile.in 2013-08-02 18:56:36.000000000 +0000 +++ mc-4.8.11/contrib/dist/redhat/Makefile.in 2013-11-29 18:45:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,8 +79,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = contrib/dist/redhat -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/mc.spec.in $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs $(srcdir)/mc.spec.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -132,6 +160,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(noinst_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -386,11 +415,9 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -528,15 +555,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/debian/changelog mc-4.8.11/debian/changelog --- mc-4.8.10/debian/changelog 2013-09-17 07:29:03.000000000 +0000 +++ mc-4.8.11/debian/changelog 2013-12-05 02:07:12.000000000 +0000 @@ -1,3 +1,12 @@ +mc (3:4.8.11-1) unstable; urgency=low + + * New upstream release [November 2013]. + + fixed behaviour with "num_history_items_recorded=0" (Closes: #723868). + + no longer use deprecated "find -perm +xxx" (Closes: #724766). + * Removed all backported and forwarded patches. + + -- Dmitry Smirnov Thu, 05 Dec 2013 05:41:14 +1100 + mc (3:4.8.10-4) unstable; urgency=low * New backported "3059.patch" to fix "Compute totals" progress bar and diff -Nru mc-4.8.10/debian/patches/3047.patch mc-4.8.11/debian/patches/3047.patch --- mc-4.8.10/debian/patches/3047.patch 2013-09-13 19:11:05.000000000 +0000 +++ mc-4.8.11/debian/patches/3047.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,120 +0,0 @@ -Last-Update: 2013-09-14 -Forwarded: not-needed -Author: Dmitry Smirnov -From: Andrew Borodin -Origin: upstream, https://www.midnight-commander.org/changeset/446748619b5cb77ea63360a81bb16cd2dd2caff7 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=714369 -Bug-MC: https://www.midnight-commander.org/ticket/3047 -Description: fix mc arguments handling - Following cases from command line are possible: - * 'mc' (no arguments): - active panel uses current directory - passive panel uses "other_dir" from panels.ini - * 'mc dir1 dir2' (two arguments): - active panel uses dir1 - right panel uses dir2 - * 'mc dir1' (single argument): - active panel uses dir1 - passive panel uses "other_dir" from panels.ini - ---- a/doc/man/mc.1.in -+++ b/doc/man/mc.1.in -@@ -171,13 +171,14 @@ - .I \-X, \-\-no\-x11 - Do not use X11 to get the state of modifiers Alt, Ctrl, Shift - .PP - If both paths are specified, the first path name is the directory to show --in the left panel; the second path name is the directory to be shown in --the right panel. -+in the active panel; the second path name is the directory to be shown in -+the other panel. - .PP - If one path is specified, the path name is the directory to show --in the active panel; current directory is shown in the passive panel. -+in the active panel; value of "other_dir" from panels.ini is the directory -+to be shown in the passive panel. - .PP - If no paths are specified, current directory is shown in the active panel; - value of "other_dir" from panels.ini is the directory to be shown in - the passive panel. ---- a/doc/man/ru/mc.1.in -+++ b/doc/man/ru/mc.1.in -@@ -148,15 +148,16 @@ - .I \-X, \-\-no\-x11 - Не использовать X11 для получения состояния модификаторов Alt, Ctrl, Shift. - .PP - Если в командной строке указаны два каталога, первый будет отображаться --в левой панели, второй \- в правой. -+в активной панели, второй \- в другой панели. - .PP - Если указан только один каталог, он будет отображён в активной панели, --во второй панели будет отображён текущий каталог. -+во второй панели будет отображён каталог, указанный в параметре "other_dir" -+в файле panels.ini. - .PP - Если каталоги не указаны, в активной панели будет отображён текущий каталог, --а во второй панели \- каталог, указанный в параметре "other_dir" в файла panels.ini. -+а во второй панели \- каталог, указанный в параметре "other_dir" в файле panels.ini. - .\"NODE "Overview" - .SH "Главное окно программы" - Главное окно программы Midnight Commander состоит из трех полей. Два - поля, называемые "панелями", идентичны по структуре и обычно отображают ---- a/src/filemanager/midnight.c -+++ b/src/filemanager/midnight.c -@@ -583,17 +583,17 @@ - /* - * Following cases from command line are possible: - * 'mc' (no arguments): mc_run_param0 == NULL, mc_run_param1 == NULL - * active panel uses current directory -- * passive panel uses "other_dir" from ini -+ * passive panel uses "other_dir" from panels.ini - * - * 'mc dir1 dir2' (two arguments): mc_run_param0 != NULL, mc_run_param1 != NULL -- * left panel uses mc_run_param0 -- * right panel uses mc_run_param1 -+ * active panel uses mc_run_param0 -+ * passive panel uses mc_run_param1 - * - * 'mc dir1' (single argument): mc_run_param0 != NULL, mc_run_param1 == NULL -- * active panel uses current directory -- * passive panel uses mc_run_param0 -+ * active panel uses mc_run_param0 -+ * passive panel uses "other_dir" from panels.ini - */ - - /* Set up panel directories */ - if (boot_current_is_left) -@@ -618,10 +618,10 @@ - } - else /* mc_run_param0 != NULL && mc_run_param1 == NULL */ - { - /* one argument */ -- current_dir = NULL; /* assume current dir */ -- other_dir = (char *) mc_run_param0; -+ current_dir = (char *) mc_run_param0; -+ other_dir = saved_other_dir; /* from ini */ - } - } - else - { -@@ -639,16 +639,16 @@ - } - else if (mc_run_param0 != NULL && mc_run_param1 != NULL) - { - /* two arguments */ -- current_dir = mc_run_param1; -- other_dir = (char *) mc_run_param0; -+ current_dir = (char *) mc_run_param0; -+ other_dir = mc_run_param1; - } - else /* mc_run_param0 != NULL && mc_run_param1 == NULL */ - { - /* one argument */ -- current_dir = NULL; /* assume current dir */ ; -- other_dir = (char *) mc_run_param0; -+ current_dir = (char *) mc_run_param0; -+ other_dir = saved_other_dir; /* from ini */ - } - } - - /* 1. Get current dir */ diff -Nru mc-4.8.10/debian/patches/3053.patch mc-4.8.11/debian/patches/3053.patch --- mc-4.8.10/debian/patches/3053.patch 2013-09-13 19:31:21.000000000 +0000 +++ mc-4.8.11/debian/patches/3053.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Last-Update: 2013-09-14 -Forwarded: not-needed -Author: Dmitry Smirnov -Bug-MC: https://www.midnight-commander.org/ticket/3053 -Description: fix FTBFS on GNU Hurd - ---- a/src/filemanager/filegui.c -+++ b/src/filemanager/filegui.c -@@ -283,10 +283,10 @@ - - if (statvfs_works_cache < 0) - statvfs_works_cache = (uname (&name) == 0 && 0 <= str_verscmp (name.release, "2.6.36")); - return statvfs_works_cache; --} - #endif -+} - #endif - - /* --------------------------------------------------------------------------------------------- */ - static gboolean diff -Nru mc-4.8.10/debian/patches/3059.patch mc-4.8.11/debian/patches/3059.patch --- mc-4.8.10/debian/patches/3059.patch 2013-09-17 07:05:38.000000000 +0000 +++ mc-4.8.11/debian/patches/3059.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,97 +0,0 @@ -Last-Update: 2013-09-17 -Forwarded: not-needed -Author: Dmitry Smirnov -Origin: upstream, http://www.midnight-commander.org/changeset/1ae697368c933a5967416acdc7834102d6ac484d -Origin: upstream, http://www.midnight-commander.org/changeset/7871894760903e67af774ba572afeacda38b09f1 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=722891 -Bug-MC: https://www.midnight-commander.org/ticket/3059 -Bug-MC: https://www.midnight-commander.org/ticket/2075 -Description: fix "compute totals" progress bar and segfault on copy/move operations. - ---- a/src/filemanager/file.c -+++ b/src/filemanager/file.c -@@ -1271,19 +1271,19 @@ - /* --------------------------------------------------------------------------------------------- */ - - /** Initialize variables for progress bars */ - static FileProgressStatus --panel_operate_init_totals (FileOperation operation, const WPanel * panel, const char *source, -- FileOpContext * ctx, filegui_dialog_type_t dialog_type) -+panel_operate_init_totals (const WPanel * panel, const char *source, FileOpContext * ctx, -+ filegui_dialog_type_t dialog_type) - { - FileProgressStatus status; - - #ifdef ENABLE_BACKGROUND - if (mc_global.we_are_background) - return FILE_CONT; - #endif - -- if (operation != OP_MOVE && verbose && file_op_compute_totals) -+ if (verbose && file_op_compute_totals) - { - ComputeDirSizeUI *ui; - - ui = compute_dir_size_create_ui (TRUE); -@@ -2377,15 +2377,8 @@ - - mc_refresh (); - if (ctx->erase_at_end) - { -- /* remove files after move */ -- if (erase_list != NULL) -- { -- file_op_context_destroy_ui (ctx); -- file_op_context_create_ui (ctx, FALSE, FILEGUI_DIALOG_DELETE_ITEM); -- } -- - while (erase_list != NULL && return_status != FILE_ABORT) - { - struct link *lp = (struct link *) erase_list->data; - -@@ -2791,16 +2784,14 @@ - #endif /* ENABLE_BACKGROUND */ - { - if (operation == OP_DELETE) - dialog_type = FILEGUI_DIALOG_DELETE_ITEM; -+ else if (single_entry && S_ISDIR (selection (panel)->st.st_mode)) -+ dialog_type = FILEGUI_DIALOG_MULTI_ITEM; -+ else if (single_entry || force_single) -+ dialog_type = FILEGUI_DIALOG_ONE_ITEM; - else -- { -- dialog_type = ((operation != OP_COPY) || single_entry || force_single) -- ? FILEGUI_DIALOG_ONE_ITEM : FILEGUI_DIALOG_MULTI_ITEM; -- -- if (single_entry && (operation == OP_COPY) && S_ISDIR (selection (panel)->st.st_mode)) -- dialog_type = FILEGUI_DIALOG_MULTI_ITEM; -- } -+ dialog_type = FILEGUI_DIALOG_MULTI_ITEM; - } - - /* Initialize things */ - /* We do not want to trash cache every time file is -@@ -2843,10 +2834,10 @@ - source_with_vpath = vfs_path_from_str (source); - else - source_with_vpath = vfs_path_append_new (panel->cwd_vpath, source, (char *) NULL); - #endif /* WITH_FULL_PATHS */ -- if (panel_operate_init_totals -- (operation, panel, vfs_path_as_str (source_with_vpath), ctx, dialog_type) == FILE_CONT) -+ if (panel_operate_init_totals (panel, vfs_path_as_str (source_with_vpath), ctx, dialog_type) -+ == FILE_CONT) - { - if (operation == OP_DELETE) - { - if (S_ISDIR (src_stat.st_mode)) -@@ -2935,9 +2926,9 @@ - || file_error (_("Destination \"%s\" must be a directory\n%s"), dest) != FILE_RETRY) - goto clean_up; - } - -- if (panel_operate_init_totals (operation, panel, NULL, ctx, dialog_type) == FILE_CONT) -+ if (panel_operate_init_totals (panel, NULL, ctx, dialog_type) == FILE_CONT) - { - /* Loop for every file, perform the actual copy operation */ - for (i = 0; i < panel->count; i++) - { diff -Nru mc-4.8.10/debian/patches/3070.patch mc-4.8.11/debian/patches/3070.patch --- mc-4.8.10/debian/patches/3070.patch 2013-09-08 03:14:12.000000000 +0000 +++ mc-4.8.11/debian/patches/3070.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Last-Update: 2013-09-08 -Forwarded: not-needed -Author: Dmitry Smirnov -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=721961 -Bug-MC: https://www.midnight-commander.org/ticket/3070 -Description: fix saving changes to nested archives - ---- a/src/vfs/extfs/extfs.c -+++ b/src/vfs/extfs/extfs.c -@@ -376,9 +376,9 @@ - struct stat my; - vfs_path_t *local_name_vpath, *name_vpath; - - local_name_vpath = vfs_path_from_str (archive->local_name); -- name_vpath = vfs_path_from_str (archive->local_name); -+ name_vpath = vfs_path_from_str (archive->name); - mc_stat (local_name_vpath, &my); - mc_ungetlocalcopy (name_vpath, local_name_vpath, - archive->local_stat.st_mtime != my.st_mtime); - vfs_path_free (local_name_vpath); diff -Nru mc-4.8.10/debian/patches/man.patch mc-4.8.11/debian/patches/man.patch --- mc-4.8.10/debian/patches/man.patch 2013-09-13 19:10:38.000000000 +0000 +++ mc-4.8.11/debian/patches/man.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -Last-Update: 2013-08-03 -Forwarded: yes -Bug-MC: https://www.midnight-commander.org/ticket/3052 -Author: Dmitry Smirnov -Description: fix man page "macro `\' not defined" warnings - ---- a/doc/man/mc.1.in -+++ b/doc/man/mc.1.in -@@ -3110,10 +3110,9 @@ - for the second time, for the first time MC just beeps. - .PP - Apply escaping of - .BR ? ", " * " and " & --symbols (as --.BR \\? ", " \\* ", " \\& ) -+symbols (as \fB\\?\fR, \fB\\*\fR, \fB\\&\fR ) - in filenames to disallow use them as metasymbols in regular expressions - when substitution is performed in the input line. - - .\"NODE "Virtual File System" ---- a/doc/man/es/mc.1.in -+++ b/doc/man/es/mc.1.in -@@ -2948,10 +2948,9 @@ - por segunda vez; con la primera Midnight Commander solo emite un pitido. - .PP - Aplica escapes a los símbolos - .BR ? ", " * " y " & --(como --.BR \\? ", " \\* ", " \\& ) -+(como \fB\\?\fR, \fB\\*\fR, \fB\\&\fR ) - en los nombres de archivo para evitar su interpretación en expresiones - regulares al realizar sustituciones en la línea de entrada. - .\"NODE "Virtual File System" - .SH "Sistemas de Archivos Virtuales (VFS)" ---- a/doc/man/ru/mc.1.in -+++ b/doc/man/ru/mc.1.in -@@ -3403,10 +3403,9 @@ - второй раз, при первом нажатии MC только издает звуковой сигнал. - .PP - Используйте экранирование символов - .BR ? ", " * " и " & --(как --.BR \\? ", " \\* ", " \\& ) -+(как \fB\\?\fR, \fB\\*\fR, \fB\\&\fR ) - в именах файлов, чтобы они не рассматривались как метасимволы в регулярных - выражениях при подстановках в полях ввода. - - .\"NODE "Virtual File System" diff -Nru mc-4.8.10/debian/patches/series mc-4.8.11/debian/patches/series --- mc-4.8.10/debian/patches/series 2013-09-17 01:41:47.000000000 +0000 +++ mc-4.8.11/debian/patches/series 2013-12-04 18:44:25.000000000 +0000 @@ -1,8 +1,4 @@ ## BACKPORTED: -3047.patch -3053.patch -3059.patch -3070.patch ## DEBIAN FIXES AND ENHANCEMENTS: uzip_528239.patch @@ -17,4 +13,3 @@ ext_use_default_editor.patch ## FORWARDED: -man.patch diff -Nru mc-4.8.10/doc/Makefile.in mc-4.8.11/doc/Makefile.in --- mc-4.8.10/doc/Makefile.in 2013-08-02 18:56:36.000000000 +0000 +++ mc-4.8.11/doc/Makefile.in 2013-11-29 18:45:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -61,23 +61,51 @@ # # This is usually added to MOSTLYCLEANFILES. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -96,9 +124,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/doxygen-include.am \ - $(top_srcdir)/config/mkinstalldirs COPYING INSTALL NEWS TODO +DIST_COMMON = $(srcdir)/doxygen-include.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/config/mkinstalldirs \ + COPYING INSTALL NEWS README TODO subdir = doc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ @@ -173,13 +201,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -187,9 +216,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -503,14 +552,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -531,31 +579,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -571,12 +601,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -588,15 +613,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -605,9 +626,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -779,23 +801,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps diff -Nru mc-4.8.10/doc/NEWS mc-4.8.11/doc/NEWS --- mc-4.8.10/doc/NEWS 2013-08-02 18:51:44.000000000 +0000 +++ mc-4.8.11/doc/NEWS 2013-11-29 18:42:44.000000000 +0000 @@ -1,3 +1,49 @@ +Version 4.8.11 + +- Core + * Live update of panels size when editing layout (#3060) + * Support "Compute totals" option in move file operation (#2075) + +- VFS + * rpm extfs + - show dependency version (#2812) + - support tar payload (#3064) + - improve support for EPOCH tag (#1588) + - add support for PREINPROG/POSTINPROG/PREUNPROG/POSTUNPROG, VERIFYSCRIPTPROG and TRIGGERSCRIPTS/TRIGGERSCRIPTPROG tags (#1588) + +- Editor + * Support "bracketed paste mode" of xterm (#2661) + * Clarify Java syntax highlighting (#3057) + +- Misc + * Print warnings about unknown '--with-' / '--enable-' configure options (#3029) + * Code cleanup and refactoring (#3051, #3066) + +- Fixes + * FTBFS on GNU Hurd (#3053, #3071) + * Segfault while moving files (#3059, #3105) + * Broken handling of mc command line arguments (#3047) + * Copy/move doesn't work if num_history_items_recorded=0 (#3076) + * No subdir path completion in current dir, if stub is not starting with './' (#3018) + * Deprecated "find -perm +xxx" syntax is used (#3089) + * Home, End, Shift-Fn keys don't work in tmux (#2978) + * Improper [en|dis]abling of layout dialog split adjustment buttons (#3061) + * Bogus strings in 'Confirmation' config dialog (#2271) + * "Configure options" first entry not highlighted (#3084) + * "Setup saved to ~/.config/mc/ini" message is misleading (#3096) + * F3 doesn't work on .so files in FreeBSD 9.x (#3101) + * Typo in mc.lib: "less=%filename +%linenog" instead of "+%lineno" (part of #3044) + * Wrong order of filename and line number for external editor (part of #3044) + * mcedit: tabs are lost when text is pasted (#1797 as part of #2661) + * mcedit: question on large file treats Escape as Yes (#3107) + * Broken case-sensitive search in editor/viewer/diffviewer (#3069) + * Changes to files in nested .zip archives are lost (#3070) + * Incorrect handling of filenames with spaces with unrar v5 (#3073) + * iso9660 VFS: filenames truncating in ISO file listing (#3091) + * vfs_path_from_str_flags() doesn't support VPF_STRIP_HOME (#3098) + * Bright colors are used as background colors in 16-color skins (#3050) + * Various defects in documentation (#3052, #3092) + Version 4.8.10 - Core @@ -699,7 +745,7 @@ * Incorrect key event handling in "Listing mode" dialog (#2045) * Usability of field history in "Find file" dialog (#2046, #2407) * Find "Whole words" search bug (#2396) - * Directory ignorance doesn't work in file find (#2366, #2434) + * List of ignored directories doesn't work in file find (#2366, #2434) * Incorrect line jump when started as editor (#2344) * User menu in standalone mcedit doesn't show filetype-specific items (#1651) * Configure script doesn't set samba configdir (#2419) diff -Nru mc-4.8.10/doc/hints/Makefile.in mc-4.8.11/doc/hints/Makefile.in --- mc-4.8.10/doc/hints/Makefile.in 2013-08-02 18:56:36.000000000 +0000 +++ mc-4.8.11/doc/hints/Makefile.in 2013-11-29 18:45:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = doc/hints -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/config/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ @@ -126,13 +154,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -169,9 +198,29 @@ DATA = $(hint_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -485,14 +534,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -513,31 +561,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -553,12 +583,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -570,15 +595,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -587,9 +608,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -764,24 +786,21 @@ uninstall-am: uninstall-hintDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-hintDATA \ install-html install-html-am install-info install-info-am \ install-man install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-hintDATA + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-hintDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/doc/hints/l10n/Makefile.in mc-4.8.11/doc/hints/l10n/Makefile.in --- mc-4.8.10/doc/hints/l10n/Makefile.in 2013-08-02 18:56:36.000000000 +0000 +++ mc-4.8.11/doc/hints/l10n/Makefile.in 2013-11-29 18:45:47.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = doc/hints/l10n -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/config/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ @@ -160,6 +188,7 @@ } am__installdirs = "$(DESTDIR)$(hintdir)" DATA = $(hint_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -437,11 +466,9 @@ @list='$(hint_DATA)'; test -n "$(hintdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(hintdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -582,16 +609,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-hintDATA install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-hintDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-hintDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-hintDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/doc/hints/l10n/mc.hint.et mc-4.8.11/doc/hints/l10n/mc.hint.et --- mc-4.8.10/doc/hints/l10n/mc.hint.et 2013-08-02 18:42:51.000000000 +0000 +++ mc-4.8.11/doc/hints/l10n/mc.hint.et 2013-11-29 18:27:07.000000000 +0000 @@ -1,93 +1,100 @@ -Hint: Use C-x t to copy tagged file names to the command line. +Vihje: Kasuta C-x, et kopeerida märgitud failide nimed käsureale. -Hint: Use C-x p to copy the current pathname to the command line. +Vihje: Kasuta C-x p, et kopeerida aktiivne otsingurada käsureale. -Hint: Completion: use M-Tab (or Esc+Tab). Type it twice to get a list. +Vihje: Lõpetamiseks kasuta M-Tab (või Esc-Tab). Topeltsisestus kuvab listi. -Hint: Use M-p and M-n to access the command history. +Vihje: Käskude ajaloo kasutamiseks kasuta M-p ja M-n. -Hint: Need to quote a character? Use Control-q and the character. +Vihje: Täht vajab tsiteeringut? Sisesta C-q ja täht. -Hint: Tired of these messages? Turn them off from the Options/Layout menu. +Vihje: Oled tüdinud neist teadetest? Lülita need välja menüüst +Seaded/Paigutus. -Hint: Selecting directories: add a slash to the end of the matching pattern. +Vihje: Kataloogide valimine: lisa sobiva mustri lõppu kaldkriips. -Hint: If your terminal lacks functions keys, use the ESC+number sequence. +Vihje: Kui terminalil puuduvad funktsiooniklahvid, siis kasuta ESC+number +jadasid. -Hint: The homepage of GNU Midnight Commander: -http://www.midnight-commander.org/ +Vihje: GNU Midnight Commanderi koduleht: http://www.midnight-commander.org/ -Hint: Please send any bug reports to mc-devel@gnome.org +Vihje: Palun saada vearaportid aadressile mc-devel@gnome.org -Hint: Tab changes your current panel. +Vihje: TAB vahetab aktiivset paneeli. -Hint: VFS coolness: tap enter on a tar file to examine its contents. +Vihje: VFS võimalused: tar-faili sisuga tutvumiseks vajuta ta peal ENTER. -Hint: We also have a nice manual page. +Vihje: Olemas on ka meeldiv manuaal. -Hint: Do you want lynx-style navigation? Set it in the Configuration dialog. +Vihje: Soovid lynxi stiilis navigeerimist? Luba see konfiguratsiooni +dialoogist. -Hint: % macros work even on the command line. +Vihje: %-makrod töötavad ka käsureal. -Hint: M-! will allow you to execute programs and see the output in the -viewer. +Vihje: M-! lubab käivitada programme ja vaadata väljundit vaatajas. -Hint: The file listing format can be customized; do "man mc" for details. +Vihje: Faililistingu formaati saab muuta; lähemalt vaata manuaalist. -Hint: %D/%T expands to the tagged files in the opposite directory. +Vihje: %D/%T laiendab märgitud failid vastaskataloogis. -Hint: Want your plain shell? Press C-o, and get back to MC with C-o again. +Vihje: Soovid harilikku kesta? Vajuta C-o; tagasipöördumiseks vajuta uuesti +C-o. -Hint: Setting the CDPATH variable can save you keystrokes in cd commands. +Vihje: Muutujale CDPATH väärtuse omistamine võib vähendada klahvivajutusi cd +käskudes. -Hint: If you want to see your .* files, say so in the Configuration dialog. +Vihje: Kui soovid näha peidetud faile, siis luba see konfiguratsiooni +dialoogis. -Hint: Want to see your *~ backup files? Set it in the Configuration dialog. +Vihje: Kui soovid näha varukoopia faile, siis luba see konfiguratsiooni +dialoogis. -Hint: Completion works on all input lines in all dialogs. Just press M-Tab. +Vihje: Lõpetamine töötab iga dialoogi sisestusväljadel; lihtsalt vajuta +M-Tab. -Hint: On slow terminals the -s flag may help. +Vihje: Parameeter -s võib aidata aeglase terminali kasutamisel. -Hint: Find File: you can work on the files found using the Panelize button. +Vihje: Failiotsing: sa saad töötada leitud failidega kasutades nuppu +Paneelile. -Hint: Want to do complex searches? Use the External Panelize command. +Vihje: Soovid teha keerulisi otsinguid? Kasuta käsku Väline paneelile. -Hint: To change directory halfway through typing a command, use M-c (quick -cd). +Vihje: Kataloogi kiirvahetuseks käsu sisestamise ajal kasuta M-c (quick cd). -Note: Shell commands will not work when you are on a non-local file system. +NB! Kesta käsud töötavad ainult kohalikus failisüsteemis. -Hint: Bring text back from the dead with C-y. +Vihje: C-y taastab kustutatud teksti. -Hint: Are some of your keys not working? Look at Options/Learn keys. +Vihje: Kas mõned klahvid ei tööta? Vaata Seaded/Õpi klahve. -Hint: To look at the output of a command in the viewer, use M-! +Vihje: Käsu väljundi vaatamiseks vaatajas kasuta M-! -Hint: F13 (or Shift-F3) invokes the viewer in raw mode. +Vihje: F13 (või Shift-F3) käivitab kuvaja toorrežiimis. -Hint: You may specify the editor for F4 with the shell variable EDITOR. +Vihje: Klahvile F4 saad redaktori määrata keskkonna muutujaga EDITOR. -Hint: You may specify the external viewer with the shell vars VIEWER or -PAGER. +Vihje: Välise vaataja saad määrata keskkonna muutujaga VIEWER või PAGER. -Hint: You can disable all requests for confirmation in Options/Confirmation. +Vihje: Kinnituse küsimise kõigile päringutele saad keelata +Seaded/Kinnitused. Hint: Leap to frequently used directories in a single bound with C-. -Hint: You can do anonymous FTP with mc by typing 'cd ftp://machine.edu' +Vihje: Anonüümse FTP kasutamiseks mc-ga sisesta 'cd ftp://masin.ee' -Hint: FTP is built in the Midnight Commander, check the File/FTP link menu. +Vihje: FTP on Midnight Commanderisse sisse ehitatud; vaata menüüst Fail/FTP +link. -Hint: M-t changes quickly the listing mode. +Vihje: M-t võimaldab listingu režiimi kiiret muutmist. -Hint: You can specify the username when doing ftps: 'cd -ftp://user@machine.edu' +Vihje: Kasutaja määramine FTP ühenduses: 'cd ftp://kasutaja@masin.ee' -Hint: You can browse RPM files by tapping enter on top of an rpm file. +Vihje: RPM faili sisuga tutvumiseks vajuta sellel Enter. -Hint: To mark directories on the select dialog box, append a slash. +Vihje: Kataloogide märkimiseks valiku dialoogis lisa kaldkriips. -Hint: To use the mouse cut and paste may require holding the shift key +Vihje: Hiirega lõikamiseks ja asetamiseks võib olla vajalik vajutada klahvi +Shift. Hint: Key frequently visited ftp sites in the hotlist: type C-. diff -Nru mc-4.8.10/doc/hints/l10n/mc.hint.ro mc-4.8.11/doc/hints/l10n/mc.hint.ro --- mc-4.8.10/doc/hints/l10n/mc.hint.ro 2013-08-02 18:42:51.000000000 +0000 +++ mc-4.8.11/doc/hints/l10n/mc.hint.ro 2013-11-29 18:27:07.000000000 +0000 @@ -3,17 +3,17 @@ Sfat: Utilizați C-x p pentru a copia în linia de comandă calea curentă. -Sfat: Completare: Utilizați M-Tab (sau Esc+Tab). Tastați de doua ori pentru +Sfat: Completare: Utilizați M-Tab (sau Esc+Tab). Tastați de două ori pentru a obține lista. Sfat: Utilizați M-p și M-n pentru a accesa istoricul comenzilor. Sfat: Trebuie sa citați un caracter? Folosiți Control-q și caracterul. -Sfat: Aceste mesaje sunt sâcâitoare? Puteți sa le opriți din meniul +Sfat: Aceste mesaje sunt sâcâitoare? Puteți să le opriți din meniul Opțiuni/Aspect. -Sfat: Selectarea directoarelor: adaugați slash la sfârșitul criteriului de +Sfat: Selectarea dosarelor: adăugați slash la sfârșitul criteriului de selectare Sfat: Dacă terminalul nu dispune de taste funcționale, folosiți ESC+ numărul @@ -29,10 +29,9 @@ Sfat: facilități VFS: Apăsați ENTER pe un fișier tar pentru a examina conținutul său. -Sfat: Avem de asemenea și o pagină în manual. +Sfat: Avem de asemenea și o pagină de manual. -Sfat: Doriți navigare în stilul lynx? Puteți să-l setați în dialogul -Configurație. +Sfat: Dorești navigare în stilul lynx? Poți seta în dialogul Configurare. Sfat: macro-urile funcționează și în linia de comandă. @@ -42,7 +41,7 @@ Sfat: Formatul listării de fișiere poate fi modificat; rulați "man mc" pentru detalii. -Sfat: %D/%T se extinde pe fișierele marcate din directorul opus. +Sfat: %D/%T se extinde pe fișierele marcate din dosarul opus. Sfat: Doriți un shell simplu? Apăsați C-o, iar pentru a revenit în MC apăsați din nou C-o. @@ -51,25 +50,26 @@ pentru comenzi CD. Sfat: Dacă doriți să vedeți fișierele .*, specificați acest lucru în -dialogul Configurație. +dialogul Configurare. Sfat: Doriți să vedeți fișierele de backup *~ ? Specificați acest lucru în -dialogul Configurație. +dialogul Configurare. Sfat: Funcția de completare funcționează în toate liniile de intrare din toate dialogurile. Trebuie doar să apăsați M-Tab. -Sfat: Pentru terminalele încete, indicatorul -s ar putea ajuta. +Sfat: Pentru terminalele încete, opțiunea -s ar putea ajuta. Sfat: Căutare fișier: puteți lucra cu fișierele găsite folosind butonul de panelizare. Sfat: Doriți căutări complexe? Folosiți comanda de panelizare externă. -Sfat: Pentru a schimba directorul curent în timpul tastării unei comenzi, +Sfat: Pentru a schimba dosarul curent în timpul tastării unei comenzi, folosiți M-c (cd rapid). -Nota: Comenzile shell nu funcționează în sisteme de fișiere non-local. +Nota: Comenzile shell nu funcționează în sisteme de fișiere care nu sunt +locale. Sfat: Puteți recupera textul șters cu C-y. @@ -85,16 +85,16 @@ Sfat: Puteți specifica vizualizatorul extern cu ajutorul variabilelor de shell VIEWER sau PAGER. -Sfat: Puteti dezactiva toate cererile de confirmare in meniul -Optiuni/Confirmare. +Sfat: Puteți dezactiva toate cererile de confirmare în meniul +Opțiuni/Confirmări. Hint: Leap to frequently used directories in a single bound with C-. Sfat: Puteți să vă conectați la FTP în mod anonim din MC tastând 'cd ftp://machine.edu' -Sfat: Serviciul FTP este incorporat în Midnight Commander, verificați meniul -Fisier/FTP. +Sfat: Serviciul FTP este încorporat în Midnight Commander, verificați meniul +Fișier/Legătură FTP. Sfat: M-t schimbă rapid modul de listare. @@ -103,7 +103,7 @@ Sfat: Puteți parcurge fișierele RPM apăsând ENTER pe fișier. -Sfat: Pentru a marca directoarele in dialogul de selectie, adaugati slash. +Sfat: Pentru a marca dosarele în dialogul de selecție, adăugați slash. Sfat: Pentru a folosi mouse-ul pentru a decupa și insera, trebuie să țineți tasta Shift apăsată. diff -Nru mc-4.8.10/doc/hlp/Makefile.in mc-4.8.11/doc/hlp/Makefile.in --- mc-4.8.10/doc/hlp/Makefile.in 2013-08-02 18:56:36.000000000 +0000 +++ mc-4.8.11/doc/hlp/Makefile.in 2013-11-29 18:45:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = doc/hlp -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/config/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ @@ -126,13 +154,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -169,9 +198,29 @@ DATA = $(hlp_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -483,14 +532,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -511,31 +559,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -551,12 +581,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -568,15 +593,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -585,9 +606,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -763,24 +785,21 @@ uninstall-am: uninstall-hlpDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-hlpDATA \ install-html install-html-am install-info install-info-am \ install-man install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-hlpDATA + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-hlpDATA mc.hlp: $(top_builddir)/doc/man/mc.1 $(srcdir)/xnc.hlp $(top_builddir)/src/man2hlp/man2hlp diff -Nru mc-4.8.10/doc/hlp/es/Makefile.in mc-4.8.11/doc/hlp/es/Makefile.in --- mc-4.8.10/doc/hlp/es/Makefile.in 2013-08-02 18:56:37.000000000 +0000 +++ mc-4.8.11/doc/hlp/es/Makefile.in 2013-11-29 18:45:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,8 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/../hlp-lang-include.am $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/../hlp-lang-include.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/config/mkinstalldirs subdir = doc/hlp/es ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ @@ -160,6 +188,7 @@ } am__installdirs = "$(DESTDIR)$(hlpdir)" DATA = $(hlp_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -438,11 +467,9 @@ @list='$(hlp_DATA)'; test -n "$(hlpdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(hlpdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -584,16 +611,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-hlpDATA install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-hlpDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-hlpDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-hlpDATA mc.hlp.$(HLP_LANG): $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp $(MAN2HLP) diff -Nru mc-4.8.10/doc/hlp/hu/Makefile.in mc-4.8.11/doc/hlp/hu/Makefile.in --- mc-4.8.10/doc/hlp/hu/Makefile.in 2013-08-02 18:56:37.000000000 +0000 +++ mc-4.8.11/doc/hlp/hu/Makefile.in 2013-11-29 18:45:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,8 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/../hlp-lang-include.am $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/../hlp-lang-include.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/config/mkinstalldirs subdir = doc/hlp/hu ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ @@ -160,6 +188,7 @@ } am__installdirs = "$(DESTDIR)$(hlpdir)" DATA = $(hlp_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -438,11 +467,9 @@ @list='$(hlp_DATA)'; test -n "$(hlpdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(hlpdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -584,16 +611,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-hlpDATA install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-hlpDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-hlpDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-hlpDATA mc.hlp.$(HLP_LANG): $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp $(MAN2HLP) diff -Nru mc-4.8.10/doc/hlp/it/Makefile.in mc-4.8.11/doc/hlp/it/Makefile.in --- mc-4.8.10/doc/hlp/it/Makefile.in 2013-08-02 18:56:37.000000000 +0000 +++ mc-4.8.11/doc/hlp/it/Makefile.in 2013-11-29 18:45:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,8 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/../hlp-lang-include.am $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/../hlp-lang-include.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/config/mkinstalldirs subdir = doc/hlp/it ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ @@ -160,6 +188,7 @@ } am__installdirs = "$(DESTDIR)$(hlpdir)" DATA = $(hlp_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -438,11 +467,9 @@ @list='$(hlp_DATA)'; test -n "$(hlpdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(hlpdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -584,16 +611,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-hlpDATA install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-hlpDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-hlpDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-hlpDATA mc.hlp.$(HLP_LANG): $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp $(MAN2HLP) diff -Nru mc-4.8.10/doc/hlp/pl/Makefile.in mc-4.8.11/doc/hlp/pl/Makefile.in --- mc-4.8.10/doc/hlp/pl/Makefile.in 2013-08-02 18:56:37.000000000 +0000 +++ mc-4.8.11/doc/hlp/pl/Makefile.in 2013-11-29 18:45:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,8 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/../hlp-lang-include.am $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/../hlp-lang-include.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/config/mkinstalldirs subdir = doc/hlp/pl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ @@ -160,6 +188,7 @@ } am__installdirs = "$(DESTDIR)$(hlpdir)" DATA = $(hlp_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -438,11 +467,9 @@ @list='$(hlp_DATA)'; test -n "$(hlpdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(hlpdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -584,16 +611,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-hlpDATA install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-hlpDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-hlpDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-hlpDATA mc.hlp.$(HLP_LANG): $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp $(MAN2HLP) diff -Nru mc-4.8.10/doc/hlp/ru/Makefile.in mc-4.8.11/doc/hlp/ru/Makefile.in --- mc-4.8.10/doc/hlp/ru/Makefile.in 2013-08-02 18:56:37.000000000 +0000 +++ mc-4.8.11/doc/hlp/ru/Makefile.in 2013-11-29 18:45:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,8 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/../hlp-lang-include.am $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/../hlp-lang-include.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/config/mkinstalldirs subdir = doc/hlp/ru ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ @@ -160,6 +188,7 @@ } am__installdirs = "$(DESTDIR)$(hlpdir)" DATA = $(hlp_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -438,11 +467,9 @@ @list='$(hlp_DATA)'; test -n "$(hlpdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(hlpdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -584,16 +611,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-hlpDATA install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-hlpDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-hlpDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-hlpDATA mc.hlp.$(HLP_LANG): $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp $(MAN2HLP) diff -Nru mc-4.8.10/doc/hlp/sr/Makefile.in mc-4.8.11/doc/hlp/sr/Makefile.in --- mc-4.8.10/doc/hlp/sr/Makefile.in 2013-08-02 18:56:38.000000000 +0000 +++ mc-4.8.11/doc/hlp/sr/Makefile.in 2013-11-29 18:45:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,8 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/../hlp-lang-include.am $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/../hlp-lang-include.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/config/mkinstalldirs subdir = doc/hlp/sr ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ @@ -160,6 +188,7 @@ } am__installdirs = "$(DESTDIR)$(hlpdir)" DATA = $(hlp_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -438,11 +467,9 @@ @list='$(hlp_DATA)'; test -n "$(hlpdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(hlpdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -584,16 +611,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-hlpDATA install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-hlpDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-hlpDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-hlpDATA mc.hlp.$(HLP_LANG): $(top_builddir)/doc/man/$(HLP_LANG)/mc.1 $(srcdir)/xnc.hlp $(MAN2HLP) diff -Nru mc-4.8.10/doc/man/Makefile.in mc-4.8.11/doc/man/Makefile.in --- mc-4.8.10/doc/man/Makefile.in 2013-08-02 18:56:38.000000000 +0000 +++ mc-4.8.11/doc/man/Makefile.in 2013-11-29 18:45:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -49,9 +77,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/date-of-man-include.am \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/date-of-man-include.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/config/mkinstalldirs subdir = doc/man ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ @@ -126,13 +153,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -171,9 +199,29 @@ MANS = $(man_MANS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -526,14 +574,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -554,31 +601,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -594,12 +623,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -611,15 +635,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -628,9 +648,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -647,19 +668,6 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically 'make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -821,24 +829,21 @@ uninstall-man: uninstall-man1 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-man1 install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-man uninstall-man1 + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-man uninstall-man1 mc.1: $(srcdir)/mc.1.in diff -Nru mc-4.8.10/doc/man/es/Makefile.in mc-4.8.11/doc/man/es/Makefile.in --- mc-4.8.10/doc/man/es/Makefile.in 2013-08-02 18:56:38.000000000 +0000 +++ mc-4.8.11/doc/man/es/Makefile.in 2013-11-29 18:45:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/../date-of-man-include.am \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/config/mkinstalldirs subdir = doc/man/es ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -162,6 +190,7 @@ am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -474,29 +503,14 @@ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically 'make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -635,16 +649,17 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-man1 \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-man uninstall-man1 + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-man \ + uninstall-man1 mc.1: $(srcdir)/mc.1.in diff -Nru mc-4.8.10/doc/man/es/mc.1.in mc-4.8.11/doc/man/es/mc.1.in --- mc-4.8.10/doc/man/es/mc.1.in 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/doc/man/es/mc.1.in 2013-10-15 09:52:40.000000000 +0000 @@ -2949,8 +2949,7 @@ .PP Aplica escapes a los símbolos .BR ? ", " * " y " & -(como -.BR \\? ", " \\* ", " \\& ) +(como \fB\\?\fR, \fB\\*\fR, \fB\\&\fR ) en los nombres de archivo para evitar su interpretación en expresiones regulares al realizar sustituciones en la línea de entrada. .\"NODE "Virtual File System" @@ -3937,7 +3936,7 @@ Por ejemplo: .PP .nf -clipboard_pastee=xclip \-o +clipboard_paste=xclip \-o .fi .TP .I autodetect_codeset @@ -4125,7 +4124,7 @@ .\"NODE "AVAILABILITY" .SH "DISPONIBILIDAD" La última versión de este programa se puede encontrar en -http://www.midnight-commander.org/downloads. +http://ftp.midnight\-commander.org/. .\"NODE "SEE ALSO" .SH "VÉASE TAMBIÉN" mcedit(1), sh(1), bash(1), tcsh(1), zsh(1), ed(1), view(1), diff -Nru mc-4.8.10/doc/man/hu/Makefile.in mc-4.8.11/doc/man/hu/Makefile.in --- mc-4.8.10/doc/man/hu/Makefile.in 2013-08-02 18:56:39.000000000 +0000 +++ mc-4.8.11/doc/man/hu/Makefile.in 2013-11-29 18:45:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/../date-of-man-include.am \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/config/mkinstalldirs subdir = doc/man/hu ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -162,6 +190,7 @@ am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -474,29 +503,14 @@ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically 'make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -635,16 +649,17 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-man1 \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-man uninstall-man1 + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-man \ + uninstall-man1 mc.1: $(srcdir)/mc.1.in diff -Nru mc-4.8.10/doc/man/it/Makefile.in mc-4.8.11/doc/man/it/Makefile.in --- mc-4.8.10/doc/man/it/Makefile.in 2013-08-02 18:56:39.000000000 +0000 +++ mc-4.8.11/doc/man/it/Makefile.in 2013-11-29 18:45:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/../date-of-man-include.am \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/config/mkinstalldirs subdir = doc/man/it ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -162,6 +190,7 @@ am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -474,29 +503,14 @@ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically 'make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -635,16 +649,17 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-man1 \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-man uninstall-man1 + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-man \ + uninstall-man1 mc.1: $(srcdir)/mc.1.in diff -Nru mc-4.8.10/doc/man/it/mc.1.in mc-4.8.11/doc/man/it/mc.1.in --- mc-4.8.10/doc/man/it/mc.1.in 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/doc/man/it/mc.1.in 2013-10-15 09:52:40.000000000 +0000 @@ -3242,7 +3242,7 @@ .\"NODE "AVAILABILITY" .SH "REPERIBILITA'" L'ultima versione di questo programma si trova su -ftp://ftp.gnu.org/gnu/mc/. +http://ftp.midnight\-commander.org/. .\"NODE "SEE ALSO" .SH "VEDERE ANCHE" ed(1), gpm(1), terminfo(1), view(1), sh(1), bash(1), diff -Nru mc-4.8.10/doc/man/mc.1.in mc-4.8.11/doc/man/mc.1.in --- mc-4.8.10/doc/man/mc.1.in 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/doc/man/mc.1.in 2013-10-15 09:52:40.000000000 +0000 @@ -172,11 +172,12 @@ Do not use X11 to get the state of modifiers Alt, Ctrl, Shift .PP If both paths are specified, the first path name is the directory to show -in the left panel; the second path name is the directory to be shown in -the right panel. +in the active panel; the second path name is the directory to be shown in +the other panel. .PP If one path is specified, the path name is the directory to show -in the active panel; current directory is shown in the passive panel. +in the active panel; value of "other_dir" from panels.ini is the directory +to be shown in the passive panel. .PP If no paths are specified, current directory is shown in the active panel; value of "other_dir" from panels.ini is the directory to be shown in @@ -1822,12 +1823,12 @@ of progressbar follows to direction of Copy/Move/Delete operation: from left panel to right one and vice versa. Enabled by default. .PP -.I Mkdir autoname +.I Mkdir autoname. When you press F7 to create a new directory, the input line in popup dialog will be filled by name of current file or directory in active panel. Disabled by default. .PP -.I Preallocate space +.I Preallocate space. Preallocate space for whole target file, if possible, before copy operation. Disabled by default. .PP @@ -1857,17 +1858,17 @@ that you can examine the output of the command. There are three possible settings for this variable: .PP -.IR Never . +.I Never. Means that you do not want to see the output of your command. If you are using the Linux or FreeBSD console or an xterm, you will be able to see the output of the command by typing C\-o. .PP -.IR On dumb terminals . +.I On dumb terminals. You will get the pause message on terminals that are not capable of showing the output of the last command executed (any terminal that is not an xterm or the Linux console). .PP -.IR Always . +.I Always. The program will pause after executing all of your commands. .PP .B Other options @@ -1896,7 +1897,7 @@ internal file viewer\&. .\"Internal File Viewer" .PP -.I Ask new file name +.I Ask new file name. If this option is enabled, file name is asked before open new file in editor. .PP .I Auto menus. @@ -1965,7 +1966,7 @@ The rest of the screen area is used for the two directory panels. You can specify whether the area is split to the panels in .I Vertical - or +or .I Horizontal direction. Panel layout can be changed using Alt\-, (Alt\-comma) shortcut. .PP @@ -3110,8 +3111,7 @@ .PP Apply escaping of .BR ? ", " * " and " & -symbols (as -.BR \\? ", " \\* ", " \\& ) +symbols (as \fB\\?\fR, \fB\\*\fR, \fB\\&\fR ) in filenames to disallow use them as metasymbols in regular expressions when substitution is performed in the input line. @@ -4102,7 +4102,7 @@ For example: .PP .nf -clipboard_pastee=xclip \-o +clipboard_paste=xclip \-o .fi .TP .I autodetect_codeset @@ -4277,7 +4277,7 @@ .\"NODE "AVAILABILITY" .SH "AVAILABILITY" The latest version of this program can be found at -ftp://ftp.gnu.org/gnu/mc/. +http://ftp.midnight\-commander.org/. .\"NODE "SEE ALSO" .SH "SEE ALSO" ed(1), gpm(1), terminfo(1), view(1), sh(1), bash(1), @@ -4296,8 +4296,8 @@ See the file TODO in the distribution for information on what remains to be done. .PP -If you want to report a problem with the program, please send mail to -this address: mc\-devel@gnome.org. +If you want to report a problem with the program, please create bugreport +at http://www.midnight\-commander.org/. .PP Provide a detailed description of the bug, the version of the program you are running diff -Nru mc-4.8.10/doc/man/mcedit.1.in mc-4.8.11/doc/man/mcedit.1.in --- mc-4.8.10/doc/man/mcedit.1.in 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/doc/man/mcedit.1.in 2013-10-15 09:52:40.000000000 +0000 @@ -670,11 +670,11 @@ of warranty. .SH AVAILABILITY The latest version of this program can be found at -http://midnight\-commander.org/. +http://ftp.midnight\-commander.org/. .SH SEE ALSO cooledit(1), mc(1), gpm(1), terminfo(1), scanf(3). .SH AUTHORS Paul Sheer (psheer@obsidian.co.za) is the original author of the Midnight Commander's internal editor. .SH BUGS -Bugs should be reported to mc\-devel@gnome.org +Bugs should be reported to http://www.midnight\-commander.org/. diff -Nru mc-4.8.10/doc/man/mcview.1.in mc-4.8.11/doc/man/mcview.1.in --- mc-4.8.10/doc/man/mcview.1.in 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/doc/man/mcview.1.in 2013-10-15 09:52:40.000000000 +0000 @@ -87,9 +87,9 @@ of warranty. .SH AVAILABILITY The latest version of this program can be found at -ftp://ftp.gnu.org/gnu/mc/. +http://ftp.midnight\-commander.org/. .SH SEE ALSO mc(1), mcedit(1) .PP .SH BUGS -Bugs should be reported to mc\-devel@gnome.org +Bugs should be reported to http://www.midnight\-commander.org/. diff -Nru mc-4.8.10/doc/man/pl/Makefile.in mc-4.8.11/doc/man/pl/Makefile.in --- mc-4.8.10/doc/man/pl/Makefile.in 2013-08-02 18:56:39.000000000 +0000 +++ mc-4.8.11/doc/man/pl/Makefile.in 2013-11-29 18:45:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/../date-of-man-include.am \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/config/mkinstalldirs subdir = doc/man/pl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -162,6 +190,7 @@ am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -474,29 +503,14 @@ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically 'make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -635,16 +649,17 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-man1 \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-man uninstall-man1 + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-man \ + uninstall-man1 mc.1: $(srcdir)/mc.1.in diff -Nru mc-4.8.10/doc/man/ru/Makefile.in mc-4.8.11/doc/man/ru/Makefile.in --- mc-4.8.10/doc/man/ru/Makefile.in 2013-08-02 18:56:39.000000000 +0000 +++ mc-4.8.11/doc/man/ru/Makefile.in 2013-11-29 18:45:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/../date-of-man-include.am \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/config/mkinstalldirs subdir = doc/man/ru ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -162,6 +190,7 @@ am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -474,29 +503,14 @@ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically 'make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -635,16 +649,17 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-man1 \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-man uninstall-man1 + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-man \ + uninstall-man1 mc.1: $(srcdir)/mc.1.in diff -Nru mc-4.8.10/doc/man/ru/mc.1.in mc-4.8.11/doc/man/ru/mc.1.in --- mc-4.8.10/doc/man/ru/mc.1.in 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/doc/man/ru/mc.1.in 2013-10-15 09:52:40.000000000 +0000 @@ -149,13 +149,14 @@ Не использовать X11 для получения состояния модификаторов Alt, Ctrl, Shift. .PP Если в командной строке указаны два каталога, первый будет отображаться -в левой панели, второй \- в правой. +в активной панели, второй \- в другой панели. .PP Если указан только один каталог, он будет отображён в активной панели, -во второй панели будет отображён текущий каталог. +во второй панели будет отображён каталог, указанный в параметре "other_dir" +в файле panels.ini. .PP Если каталоги не указаны, в активной панели будет отображён текущий каталог, -а во второй панели \- каталог, указанный в параметре "other_dir" в файла panels.ini. +а во второй панели \- каталог, указанный в параметре "other_dir" в файле panels.ini. .\"NODE "Overview" .SH "Главное окно программы" Главное окно программы Midnight Commander состоит из трех полей. Два @@ -1976,17 +1977,17 @@ паузу, чтобы вы могли просмотреть и изучить вывод команды. Есть три варианта установки этой опции: .PP -.IR Никогда. +.I Никогда. Это значит, что вы не хотите видеть вывод команды. На консоли Linux или FreeBSD или при использовании xterm вы можете просмотреть этот вывод, нажав C\-o. .PP -.IR "На "тупых" терминалах" . +.I "На "тупых" терминалах" . Пауза будет создаваться на терминалах, которые не способны обеспечить показ вывода последней из выполнявшихся команд (это любые терминалы, отличные от xterm или Linux\-консоли). .PP -.IR Всегда . +.I Всегда. Программа обеспечит паузу после выполнения любой команды. .PP .B Прочие настройки @@ -3403,8 +3404,7 @@ .PP Используйте экранирование символов .BR ? ", " * " и " & -(как -.BR \\? ", " \\* ", " \\& ) +(как \fB\\?\fR, \fB\\*\fR, \fB\\&\fR ) в именах файлов, чтобы они не рассматривались как метасимволы в регулярных выражениях при подстановках в полях ввода. @@ -4682,7 +4682,7 @@ .\"NODE "AVAILABILITY" .SH "Обновление версий" Последние версии программы Midnight Commander можно найти на сайте -ftp://ftp.gnu.org/gnu/mc/. +http://ftp.midnight\-commander.org/. .\"NODE "SEE ALSO" .SH "Другие источники" ed(1), gpm(1), terminfo(1), view(1), sh(1), bash(1), tcsh(1), @@ -4742,12 +4742,12 @@ который можно найти в составе поставляемого пакета. .PP Если вы обнаружили в программе какие\-то недостатки или недоработки, -пришлите, пожалуйста, ваши замечания по e\-mail на адрес: -.IR mc\-devel@gnome.org . +оформите, пожалуйста, ваши замечания по адресу +.IR http://www.midnight\-commander.org/ . .PP -Дайте в письме подробное описание обнаруженных недостатков (и/или ваших +Дайте подробное описание обнаруженных недостатков (и/или ваших предложений по усовершенствованию программы), сообщите версию программы с которой вы работаете (для получения номера версии используйте команду mc \-V), в какой операционной системе вы запускали программу. В случае -фатальной ошибки программы, мы будем очень благодарны, если вы пришлете +фатальной ошибки программы мы будем очень благодарны, если вы пришлете след вызовов. diff -Nru mc-4.8.10/doc/man/sr/Makefile.in mc-4.8.11/doc/man/sr/Makefile.in --- mc-4.8.10/doc/man/sr/Makefile.in 2013-08-02 18:56:40.000000000 +0000 +++ mc-4.8.11/doc/man/sr/Makefile.in 2013-11-29 18:45:48.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/../date-of-man-include.am \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/config/mkinstalldirs subdir = doc/man/sr ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -162,6 +190,7 @@ am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -474,29 +503,14 @@ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically 'make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -635,16 +649,17 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-man1 \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-man uninstall-man1 + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-man \ + uninstall-man1 mc.1: $(srcdir)/mc.1.in diff -Nru mc-4.8.10/doc/man/sr/mc.1.in mc-4.8.11/doc/man/sr/mc.1.in --- mc-4.8.10/doc/man/sr/mc.1.in 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/doc/man/sr/mc.1.in 2013-10-15 09:52:41.000000000 +0000 @@ -3248,7 +3248,7 @@ .\"NODE "AVAILABILITY" .SH "ДОСТУПНОСТ" Најновија верзија овог програма се може наћи на адреси -ftp://ftp.gnu.org/gnu/mc/. +http://ftp.midnight\-commander.org/. .\"NODE "SEE ALSO" .SH "ВИДИТЕ И" ed(1), gpm(1), terminfo(1), view(1), sh(1), bash(1), diff -Nru mc-4.8.10/intl/plural.c mc-4.8.11/intl/plural.c --- mc-4.8.10/intl/plural.c 2013-08-02 18:56:05.000000000 +0000 +++ mc-4.8.11/intl/plural.c 2013-11-29 18:46:36.000000000 +0000 @@ -1,22 +1,76 @@ -/* A Bison parser, made from plural.y - by GNU bison 1.35. */ +/* A Bison parser, made by GNU Bison 2.6.4. */ -#define YYBISON 1 /* Identify Bison output. */ +/* Bison implementation for Yacc-like parsers in C + + Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. */ + +/* C LALR(1) parser skeleton written by Richard Stallman, by + simplifying the original so-called "semantic" parser. */ -#define yyparse __gettextparse -#define yylex __gettextlex -#define yyerror __gettexterror -#define yylval __gettextlval -#define yychar __gettextchar -#define yydebug __gettextdebug -#define yynerrs __gettextnerrs -# define EQUOP2 257 -# define CMPOP2 258 -# define ADDOP2 259 -# define MULOP2 260 -# define NUMBER 261 +/* All symbols defined below should begin with yy or YY, to avoid + infringing on user name space. This should be done even for local + variables, as they might otherwise be expanded by user macros. + There are some unavoidable exceptions within include files to + define necessary library symbols; they are noted "INFRINGES ON + USER NAME SPACE" below. */ + +/* Identify Bison output. */ +#define YYBISON 1 + +/* Bison version. */ +#define YYBISON_VERSION "2.6.4" + +/* Skeleton name. */ +#define YYSKELETON_NAME "yacc.c" + +/* Pure parsers. */ +#define YYPURE 1 -#line 1 "plural.y" +/* Push parsers. */ +#define YYPUSH 0 + +/* Pull parsers. */ +#define YYPULL 1 + + +/* Substitute the variable and function names. */ +#define yyparse __gettextparse +#define yylex __gettextlex +#define yyerror __gettexterror +#define yylval __gettextlval +#define yychar __gettextchar +#define yydebug __gettextdebug +#define yynerrs __gettextnerrs + +/* Copy the first part of user declarations. */ +/* Line 358 of yacc.c */ +#line 1 "../../intl/plural.y" /* Expression parsing for plural form selection. Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc. @@ -62,17 +116,98 @@ #define YYLEX_PARAM &((struct parse_args *) arg)->cp #define YYPARSE_PARAM arg -#line 49 "plural.y" -#ifndef YYSTYPE -typedef union { +/* Line 358 of yacc.c */ +#line 121 "../../intl/plural.c" + +# ifndef YY_NULL +# if defined __cplusplus && 201103L <= __cplusplus +# define YY_NULL nullptr +# else +# define YY_NULL 0 +# endif +# endif + +/* Enabling verbose error messages. */ +#ifdef YYERROR_VERBOSE +# undef YYERROR_VERBOSE +# define YYERROR_VERBOSE 1 +#else +# define YYERROR_VERBOSE 0 +#endif + +/* In a future release of Bison, this section will be replaced + by #include "plural.h". */ +#ifndef YY__GETTEXT_INTL_PLURAL_H_INCLUDED +# define YY__GETTEXT_INTL_PLURAL_H_INCLUDED +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif +#if YYDEBUG +extern int __gettextdebug; +#endif + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + EQUOP2 = 258, + CMPOP2 = 259, + ADDOP2 = 260, + MULOP2 = 261, + NUMBER = 262 + }; +#endif +/* Tokens. */ +#define EQUOP2 258 +#define CMPOP2 259 +#define ADDOP2 260 +#define MULOP2 261 +#define NUMBER 262 + + + +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE +{ +/* Line 374 of yacc.c */ +#line 49 "../../intl/plural.y" + unsigned long int num; enum operator op; struct expression *exp; -} yystype; -# define YYSTYPE yystype + + +/* Line 374 of yacc.c */ +#line 185 "../../intl/plural.c" +} YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 +#endif + + +#ifdef YYPARSE_PARAM +#if defined __STDC__ || defined __cplusplus +int __gettextparse (void *YYPARSE_PARAM); +#else +int __gettextparse (); +#endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int __gettextparse (void); +#else +int __gettextparse (); #endif -#line 55 "plural.y" +#endif /* ! YYPARSE_PARAM */ + +#endif /* !YY__GETTEXT_INTL_PLURAL_H_INCLUDED */ + +/* Copy the second part of user declarations. */ +/* Line 377 of yacc.c */ +#line 55 "../../intl/plural.y" /* Prototypes for local functions. */ static int yylex (YYSTYPE *lval, const char **pexp); @@ -146,21 +281,248 @@ return new_exp (3, op, args); } -#ifndef YYDEBUG -# define YYDEBUG 0 + +/* Line 377 of yacc.c */ +#line 287 "../../intl/plural.c" + +#ifdef short +# undef short +#endif + +#ifdef YYTYPE_UINT8 +typedef YYTYPE_UINT8 yytype_uint8; +#else +typedef unsigned char yytype_uint8; +#endif + +#ifdef YYTYPE_INT8 +typedef YYTYPE_INT8 yytype_int8; +#elif (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +typedef signed char yytype_int8; +#else +typedef short int yytype_int8; +#endif + +#ifdef YYTYPE_UINT16 +typedef YYTYPE_UINT16 yytype_uint16; +#else +typedef unsigned short int yytype_uint16; +#endif + +#ifdef YYTYPE_INT16 +typedef YYTYPE_INT16 yytype_int16; +#else +typedef short int yytype_int16; +#endif + +#ifndef YYSIZE_T +# ifdef __SIZE_TYPE__ +# define YYSIZE_T __SIZE_TYPE__ +# elif defined size_t +# define YYSIZE_T size_t +# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# else +# define YYSIZE_T unsigned int +# endif #endif +#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) + +#ifndef YY_ +# if defined YYENABLE_NLS && YYENABLE_NLS +# if ENABLE_NLS +# include /* INFRINGES ON USER NAME SPACE */ +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) +# endif +# endif +# ifndef YY_ +# define YY_(Msgid) Msgid +# endif +#endif +/* Suppress unused-variable warnings by "using" E. */ +#if ! defined lint || defined __GNUC__ +# define YYUSE(E) ((void) (E)) +#else +# define YYUSE(E) /* empty */ +#endif + +/* Identity function, used to suppress warnings about constant conditions. */ +#ifndef lint +# define YYID(N) (N) +#else +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static int +YYID (int yyi) +#else +static int +YYID (yyi) + int yyi; +#endif +{ + return yyi; +} +#endif + +#if ! defined yyoverflow || YYERROR_VERBOSE + +/* The parser invokes alloca or malloc; define the necessary symbols. */ + +# ifdef YYSTACK_USE_ALLOCA +# if YYSTACK_USE_ALLOCA +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca +# elif defined __BUILTIN_VA_ARG_INCR +# include /* INFRINGES ON USER NAME SPACE */ +# elif defined _AIX +# define YYSTACK_ALLOC __alloca +# elif defined _MSC_VER +# include /* INFRINGES ON USER NAME SPACE */ +# define alloca _alloca +# else +# define YYSTACK_ALLOC alloca +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include /* INFRINGES ON USER NAME SPACE */ + /* Use EXIT_SUCCESS as a witness for stdlib.h. */ +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 +# endif +# endif +# endif +# endif +# endif + +# ifdef YYSTACK_ALLOC + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) +# ifndef YYSTACK_ALLOC_MAXIMUM + /* The OS might guarantee only one guard page at the bottom of the stack, + and a page size can be as small as 4096 bytes. So we cannot safely + invoke alloca (N) if N exceeds 4096. Use a slightly smaller number + to allow for a few compiler-allocated temporary stack slots. */ +# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ +# endif +# else +# define YYSTACK_ALLOC YYMALLOC +# define YYSTACK_FREE YYFREE +# ifndef YYSTACK_ALLOC_MAXIMUM +# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM +# endif +# if (defined __cplusplus && ! defined EXIT_SUCCESS \ + && ! ((defined YYMALLOC || defined malloc) \ + && (defined YYFREE || defined free))) +# include /* INFRINGES ON USER NAME SPACE */ +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 +# endif +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifndef YYFREE +# define YYFREE free +# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void free (void *); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# endif +#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ + + +#if (! defined yyoverflow \ + && (! defined __cplusplus \ + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + +/* A type that is properly aligned for any stack member. */ +union yyalloc +{ + yytype_int16 yyss_alloc; + YYSTYPE yyvs_alloc; +}; + +/* The size of the maximum gap between one aligned stack and the next. */ +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) + +/* The size of an array large to enough to hold all stacks, each with + N elements. */ +# define YYSTACK_BYTES(N) \ + ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + + YYSTACK_GAP_MAXIMUM) + +# define YYCOPY_NEEDED 1 + +/* Relocate STACK from its old location to the new one. The + local variables YYSIZE and YYSTACKSIZE give the old and new number of + elements in the stack, and YYPTR gives the new location of the + stack. Advance YYPTR to a properly aligned location for the next + stack. */ +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (YYID (0)) + +#endif + +#if defined YYCOPY_NEEDED && YYCOPY_NEEDED +/* Copy COUNT objects from SRC to DST. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(Dst, Src, Count) \ + __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) +# else +# define YYCOPY(Dst, Src, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (Dst)[yyi] = (Src)[yyi]; \ + } \ + while (YYID (0)) +# endif +# endif +#endif /* !YYCOPY_NEEDED */ -#define YYFINAL 27 -#define YYFLAG -32768 -#define YYNTBASE 16 +/* YYFINAL -- State number of the termination state. */ +#define YYFINAL 9 +/* YYLAST -- Last index in YYTABLE. */ +#define YYLAST 54 + +/* YYNTOKENS -- Number of terminals. */ +#define YYNTOKENS 16 +/* YYNNTS -- Number of nonterminals. */ +#define YYNNTS 3 +/* YYNRULES -- Number of rules. */ +#define YYNRULES 13 +/* YYNRULES -- Number of states. */ +#define YYNSTATES 27 + +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +#define YYUNDEFTOK 2 +#define YYMAXUTOK 262 -/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */ -#define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18) +#define YYTRANSLATE(YYX) \ + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) -/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */ -static const char yytranslate[] = +/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -187,356 +549,400 @@ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 1, 6, 7, 8, - 9, 11 + 2, 2, 2, 2, 2, 2, 1, 2, 6, 7, + 8, 9, 11 }; #if YYDEBUG -static const short yyprhs[] = +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in + YYRHS. */ +static const yytype_uint8 yyprhs[] = { - 0, 0, 2, 8, 12, 16, 20, 24, 28, 32, - 35, 37, 39 + 0, 0, 3, 5, 11, 15, 19, 23, 27, 31, + 35, 38, 40, 42 }; -static const short yyrhs[] = + +/* YYRHS -- A `-1'-separated list of the rules' RHS. */ +static const yytype_int8 yyrhs[] = { - 17, 0, 17, 3, 17, 12, 17, 0, 17, 4, - 17, 0, 17, 5, 17, 0, 17, 6, 17, 0, - 17, 7, 17, 0, 17, 8, 17, 0, 17, 9, - 17, 0, 10, 17, 0, 13, 0, 11, 0, 14, - 17, 15, 0 + 17, 0, -1, 18, -1, 18, 3, 18, 12, 18, + -1, 18, 4, 18, -1, 18, 5, 18, -1, 18, + 6, 18, -1, 18, 7, 18, -1, 18, 8, 18, + -1, 18, 9, 18, -1, 10, 18, -1, 13, -1, + 11, -1, 14, 18, 15, -1 }; -#endif - -#if YYDEBUG -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const short yyrline[] = +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ +static const yytype_uint8 yyrline[] = { - 0, 150, 158, 162, 166, 170, 174, 178, 182, 186, - 190, 194, 199 + 0, 150, 150, 158, 162, 166, 170, 174, 178, 182, + 186, 190, 194, 199 }; #endif - -#if (YYDEBUG) || defined YYERROR_VERBOSE - -/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */ +#if YYDEBUG || YYERROR_VERBOSE || 0 +/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. + First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "$", "error", "$undefined.", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2", - "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'", - "start", "exp", 0 + "$end", "error", "$undefined", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2", + "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'", + "$accept", "start", "exp", YY_NULL }; #endif -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const short yyr1[] = +# ifdef YYPRINT +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to + token YYLEX-NUM. */ +static const yytype_uint16 yytoknum[] = { - 0, 16, 17, 17, 17, 17, 17, 17, 17, 17, - 17, 17, 17 + 0, 256, 257, 63, 124, 38, 258, 259, 260, 261, + 33, 262, 58, 110, 40, 41 }; +# endif -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const short yyr2[] = +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint8 yyr1[] = { - 0, 1, 5, 3, 3, 3, 3, 3, 3, 2, - 1, 1, 3 + 0, 16, 17, 18, 18, 18, 18, 18, 18, 18, + 18, 18, 18, 18 }; -/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE - doesn't specify something else to do. Zero means the default is an - error. */ -static const short yydefact[] = -{ - 0, 0, 11, 10, 0, 1, 9, 0, 0, 0, - 0, 0, 0, 0, 0, 12, 0, 3, 4, 5, - 6, 7, 8, 0, 2, 0, 0, 0 +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ +static const yytype_uint8 yyr2[] = +{ + 0, 2, 1, 5, 3, 3, 3, 3, 3, 3, + 2, 1, 1, 3 }; -static const short yydefgoto[] = -{ - 25, 5 +/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE doesn't specify something else to do. Zero + means the default is an error. */ +static const yytype_uint8 yydefact[] = +{ + 0, 0, 12, 11, 0, 0, 2, 10, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, + 5, 6, 7, 8, 9, 0, 3 }; -static const short yypact[] = +/* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int8 yydefgoto[] = { - -9, -9,-32768,-32768, -9, 34,-32768, 11, -9, -9, - -9, -9, -9, -9, -9,-32768, 24, 39, 43, 16, - 26, -3,-32768, -9, 34, 21, 53,-32768 + -1, 5, 6 +}; + +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ +#define YYPACT_NINF -10 +static const yytype_int8 yypact[] = +{ + -9, -9, -10, -10, -9, 8, 36, -10, 13, -10, + -9, -9, -9, -9, -9, -9, -9, -10, 26, 41, + 45, 18, -2, 14, -10, -9, 36 }; -static const short yypgoto[] = +/* YYPGOTO[NTERM-NUM]. */ +static const yytype_int8 yypgoto[] = { - -32768, -1 + -10, -10, -1 }; +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule which + number is the opposite. If YYTABLE_NINF, syntax error. */ +#define YYTABLE_NINF -1 +static const yytype_uint8 yytable[] = +{ + 7, 1, 2, 8, 3, 4, 15, 16, 9, 18, + 19, 20, 21, 22, 23, 24, 10, 11, 12, 13, + 14, 15, 16, 16, 26, 14, 15, 16, 17, 10, + 11, 12, 13, 14, 15, 16, 0, 0, 25, 10, + 11, 12, 13, 14, 15, 16, 12, 13, 14, 15, + 16, 13, 14, 15, 16 +}; -#define YYLAST 53 +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-10))) +#define yytable_value_is_error(Yytable_value) \ + YYID (0) -static const short yytable[] = +static const yytype_int8 yycheck[] = { - 6, 1, 2, 7, 3, 4, 14, 16, 17, 18, - 19, 20, 21, 22, 8, 9, 10, 11, 12, 13, - 14, 26, 24, 12, 13, 14, 15, 8, 9, 10, - 11, 12, 13, 14, 13, 14, 23, 8, 9, 10, - 11, 12, 13, 14, 10, 11, 12, 13, 14, 11, - 12, 13, 14, 27 + 1, 10, 11, 4, 13, 14, 8, 9, 0, 10, + 11, 12, 13, 14, 15, 16, 3, 4, 5, 6, + 7, 8, 9, 9, 25, 7, 8, 9, 15, 3, + 4, 5, 6, 7, 8, 9, -1, -1, 12, 3, + 4, 5, 6, 7, 8, 9, 5, 6, 7, 8, + 9, 6, 7, 8, 9 }; -static const short yycheck[] = -{ - 1, 10, 11, 4, 13, 14, 9, 8, 9, 10, - 11, 12, 13, 14, 3, 4, 5, 6, 7, 8, - 9, 0, 23, 7, 8, 9, 15, 3, 4, 5, - 6, 7, 8, 9, 8, 9, 12, 3, 4, 5, - 6, 7, 8, 9, 5, 6, 7, 8, 9, 6, - 7, 8, 9, 0 +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ +static const yytype_uint8 yystos[] = +{ + 0, 10, 11, 13, 14, 17, 18, 18, 18, 0, + 3, 4, 5, 6, 7, 8, 9, 15, 18, 18, + 18, 18, 18, 18, 18, 12, 18 }; -#define YYPURE 1 -/* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/usr/local/share/bison/bison.simple" +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 -/* Skeleton output parser for bison, +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software - Foundation, Inc. - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. +/* Like YYERROR except do call yyerror. This remains here temporarily + to ease the transition to the new meaning of YYERROR, for GCC. + Once GCC version 2 has supplanted version 1, this can go. However, + YYFAIL appears to be in use. Nevertheless, it is formally deprecated + in Bison 2.4.2's NEWS entry, where a plan to phase it out is + discussed. */ - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +#define YYFAIL goto yyerrlab +#if defined YYFAIL + /* This is here to suppress warnings from the GCC cpp's + -Wunused-macros. Normally we don't worry about that warning, but + some users do, and we want to make it easy for users to remove + YYFAIL uses, which will produce warnings from Bison 2.5. */ +#endif - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -/* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. - This special exception was added by the Free Software Foundation - in version 1.24 of Bison. */ - -/* This is the parser code that is written into each bison parser when - the %semantic_parser declaration is not specified in the grammar. - It was written by Richard Stallman by simplifying the hairy parser - used when %semantic_parser is specified. */ +#define YYRECOVERING() (!!yyerrstatus) -/* All symbols defined below should begin with yy or YY, to avoid - infringing on user name space. This should be done even for local - variables, as they might otherwise be expanded by user macros. - There are some unavoidable exceptions within include files to - define necessary library symbols; they are noted "INFRINGES ON - USER NAME SPACE" below. */ +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ +while (YYID (0)) -#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE) -/* The parser invokes alloca or malloc; define the necessary symbols. */ +#define YYTERROR 1 +#define YYERRCODE 256 -# if YYSTACK_USE_ALLOCA -# define YYSTACK_ALLOC alloca -# else -# ifndef YYSTACK_USE_ALLOCA -# if defined (alloca) || defined (_ALLOCA_H) -# define YYSTACK_ALLOC alloca -# else -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# endif -# endif -# endif -# endif +/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. + If N is 0, then set CURRENT to the empty location which ends + the previous symbol: RHS[0] (always defined). */ -# ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) -# else -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# endif -# define YYSTACK_ALLOC malloc -# define YYSTACK_FREE free -# endif -#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */ +#ifndef YYLLOC_DEFAULT +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (YYID (N)) \ + { \ + (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (Rhs, 0).last_column; \ + } \ + while (YYID (0)) +#endif +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) -#if (! defined (yyoverflow) \ - && (! defined (__cplusplus) \ - || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) -/* A type that is properly aligned for any stack member. */ -union yyalloc -{ - short yyss; - YYSTYPE yyvs; -# if YYLSP_NEEDED - YYLTYPE yyls; -# endif -}; -/* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1) +/* This macro is provided for backward compatibility. */ -/* The size of an array large to enough to hold all stacks, each with - N elements. */ -# if YYLSP_NEEDED -# define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ - + 2 * YYSTACK_GAP_MAX) -# else -# define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ - + YYSTACK_GAP_MAX) -# endif +#ifndef YY_LOCATION_PRINT +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +#endif -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - register YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (0) -# endif -# endif -/* Relocate STACK from its old location to the new one. The - local variables YYSIZE and YYSTACKSIZE give the old and new number of - elements in the stack, and YYPTR gives the new location of the - stack. Advance YYPTR to a properly aligned location for the next - stack. */ -# define YYSTACK_RELOCATE(Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (0) +/* YYLEX -- calling `yylex' with the right arguments. */ +#ifdef YYLEX_PARAM +# define YYLEX yylex (&yylval, YYLEX_PARAM) +#else +# define YYLEX yylex (&yylval) #endif +/* Enable debugging if requested. */ +#if YYDEBUG -#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) -# define YYSIZE_T __SIZE_TYPE__ -#endif -#if ! defined (YYSIZE_T) && defined (size_t) -# define YYSIZE_T size_t -#endif -#if ! defined (YYSIZE_T) -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t +# ifndef YYFPRINTF +# include /* INFRINGES ON USER NAME SPACE */ +# define YYFPRINTF fprintf # endif -#endif -#if ! defined (YYSIZE_T) -# define YYSIZE_T unsigned int -#endif - -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY -2 -#define YYEOF 0 -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrlab1 -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ -#define YYFAIL goto yyerrlab -#define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - yychar1 = YYTRANSLATE (yychar); \ - YYPOPSTACK; \ - goto yybackup; \ - } \ - else \ - { \ - yyerror ("syntax error: cannot back up"); \ - YYERROR; \ - } \ -while (0) -#define YYTERROR 1 -#define YYERRCODE 256 +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (YYID (0)) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (YYID (0)) + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_value_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; +#endif +{ + FILE *yyo = yyoutput; + YYUSE (yyo); + if (!yyvaluep) + return; +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# else + YYUSE (yyoutput); +# endif + switch (yytype) + { + default: + break; + } +} -/* YYLLOC_DEFAULT -- Compute the default location (before the actions - are run). - When YYLLOC_DEFAULT is run, CURRENT is set the location of the - first token. By default, to implement support for ranges, extend - its range to the last symbol. */ +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - Current.last_line = Rhs[N].last_line; \ - Current.last_column = Rhs[N].last_column; +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; #endif +{ + if (yytype < YYNTOKENS) + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); + else + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + yy_symbol_value_print (yyoutput, yytype, yyvaluep); + YYFPRINTF (yyoutput, ")"); +} -/* YYLEX -- calling `yylex' with the right arguments. */ +/*------------------------------------------------------------------. +| yy_stack_print -- Print the state stack from its BOTTOM up to its | +| TOP (included). | +`------------------------------------------------------------------*/ -#if YYPURE -# if YYLSP_NEEDED -# ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) -# else -# define YYLEX yylex (&yylval, &yylloc) -# endif -# else /* !YYLSP_NEEDED */ -# ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, YYLEX_PARAM) -# else -# define YYLEX yylex (&yylval) -# endif -# endif /* !YYLSP_NEEDED */ -#else /* !YYPURE */ -# define YYLEX yylex () -#endif /* !YYPURE */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) +#else +static void +yy_stack_print (yybottom, yytop) + yytype_int16 *yybottom; + yytype_int16 *yytop; +#endif +{ + YYFPRINTF (stderr, "Stack now"); + for (; yybottom <= yytop; yybottom++) + { + int yybot = *yybottom; + YYFPRINTF (stderr, " %d", yybot); + } + YYFPRINTF (stderr, "\n"); +} +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (YYID (0)) -/* Enable debugging if requested. */ -#if YYDEBUG -# ifndef YYFPRINTF -# include /* INFRINGES ON USER NAME SPACE */ -# define YYFPRINTF fprintf -# endif +/*------------------------------------------------. +| Report that the YYRULE is going to be reduced. | +`------------------------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_reduce_print (YYSTYPE *yyvsp, int yyrule) +#else +static void +yy_reduce_print (yyvsp, yyrule) + YYSTYPE *yyvsp; + int yyrule; +#endif +{ + int yynrhs = yyr2[yyrule]; + int yyi; + unsigned long int yylno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", + yyrule - 1, yylno); + /* The symbols being reduced. */ + for (yyi = 0; yyi < yynrhs; yyi++) + { + YYFPRINTF (stderr, " $%d = ", yyi + 1); + yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], + &(yyvsp[(yyi + 1) - (yynrhs)]) + ); + YYFPRINTF (stderr, "\n"); + } +} + +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyvsp, Rule); \ +} while (YYID (0)) -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; #else /* !YYDEBUG */ # define YYDPRINTF(Args) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YY_STACK_PRINT(Bottom, Top) +# define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ + /* YYINITDEPTH -- initial size of the parser's stacks. */ #ifndef YYINITDEPTH # define YYINITDEPTH 200 @@ -546,59 +952,58 @@ if the built-in stack extension method is used). Do not make this value too large; the results are undefined if - SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) + YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ -#if YYMAXDEPTH == 0 -# undef YYMAXDEPTH -#endif - #ifndef YYMAXDEPTH # define YYMAXDEPTH 10000 #endif - -#ifdef YYERROR_VERBOSE + + +#if YYERROR_VERBOSE # ifndef yystrlen -# if defined (__GLIBC__) && defined (_STRING_H) +# if defined __GLIBC__ && defined _STRING_H # define yystrlen strlen # else /* Return the length of YYSTR. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static YYSIZE_T -# if defined (__STDC__) || defined (__cplusplus) yystrlen (const char *yystr) -# else +#else +static YYSIZE_T yystrlen (yystr) - const char *yystr; -# endif + const char *yystr; +#endif { - register const char *yys = yystr; - - while (*yys++ != '\0') + YYSIZE_T yylen; + for (yylen = 0; yystr[yylen]; yylen++) continue; - - return yys - yystr - 1; + return yylen; } # endif # endif # ifndef yystpcpy -# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE) +# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE # define yystpcpy stpcpy # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static char * -# if defined (__STDC__) || defined (__cplusplus) yystpcpy (char *yydest, const char *yysrc) -# else +#else +static char * yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -# endif + char *yydest; + const char *yysrc; +#endif { - register char *yyd = yydest; - register const char *yys = yysrc; + char *yyd = yydest; + const char *yys = yysrc; while ((*yyd++ = *yys++) != '\0') continue; @@ -607,149 +1012,346 @@ } # endif # endif -#endif - -#line 315 "/usr/local/share/bison/bison.simple" +# ifndef yytnamerr +/* Copy to YYRES the contents of YYSTR after stripping away unnecessary + quotes and backslashes, so that it's suitable for yyerror. The + heuristic is that double-quoting is unnecessary unless the string + contains an apostrophe, a comma, or backslash (other than + backslash-backslash). YYSTR is taken from yytname. If YYRES is + null, do not copy; instead, return the length of what the result + would have been. */ +static YYSIZE_T +yytnamerr (char *yyres, const char *yystr) +{ + if (*yystr == '"') + { + YYSIZE_T yyn = 0; + char const *yyp = yystr; -/* The user can define YYPARSE_PARAM as the name of an argument to be passed - into yyparse. The argument should have type void *. - It should actually point to an object. - Grammar actions can access the variable by casting it - to the proper pointer type. */ + for (;;) + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } + do_not_strip_quotes: ; + } -#ifdef YYPARSE_PARAM -# if defined (__STDC__) || defined (__cplusplus) -# define YYPARSE_PARAM_ARG void *YYPARSE_PARAM -# define YYPARSE_PARAM_DECL -# else -# define YYPARSE_PARAM_ARG YYPARSE_PARAM -# define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; -# endif -#else /* !YYPARSE_PARAM */ -# define YYPARSE_PARAM_ARG -# define YYPARSE_PARAM_DECL -#endif /* !YYPARSE_PARAM */ - -/* Prevent warning if -Wstrict-prototypes. */ -#ifdef __GNUC__ -# ifdef YYPARSE_PARAM -int yyparse (void *); -# else -int yyparse (void); + if (! yyres) + return yystrlen (yystr); + + return yystpcpy (yyres, yystr) - yyres; +} # endif -#endif -/* YY_DECL_VARIABLES -- depending whether we use a pure parser, - variables are global, or local to YYPARSE. */ +/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message + about the unexpected token YYTOKEN for the state stack whose top is + YYSSP. + + Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is + not large enough to hold the message. In that case, also set + *YYMSG_ALLOC to the required number of bytes. Return 2 if the + required number of bytes is too large to store. */ +static int +yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, + yytype_int16 *yyssp, int yytoken) +{ + YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + /* Internationalized format string. */ + const char *yyformat = YY_NULL; + /* Arguments of yyformat. */ + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + /* Number of reported tokens (one for the "unexpected", one per + "expected"). */ + int yycount = 0; + + /* There are many possibilities here to consider: + - Assume YYFAIL is not used. It's too flawed to consider. See + + for details. YYERROR is fine as it does not invoke this + function. + - If this state is a consistent state with a default action, then + the only way this function was invoked is if the default action + is an error action. In that case, don't check for expected + tokens because there are none. + - The only way there can be no lookahead present (in yychar) is if + this state is a consistent state with a default action. Thus, + detecting the absence of a lookahead is sufficient to determine + that there is no unexpected or expected token to report. In that + case, just report a simple "syntax error". + - Don't assume there isn't a lookahead just because this state is a + consistent state with a default action. There might have been a + previous inconsistent state, consistent state with a non-default + action, or user semantic action that manipulated yychar. + - Of course, the expected token list depends on states to have + correct lookahead information, and it depends on the parser not + to perform extra reductions after fetching a lookahead from the + scanner and before detecting a syntax error. Thus, state merging + (from LALR or IELR) and default reductions corrupt the expected + token list. However, the list is correct for canonical LR with + one exception: it will still contain any token that will not be + accepted due to an error action in a later state. + */ + if (yytoken != YYEMPTY) + { + int yyn = yypact[*yyssp]; + yyarg[yycount++] = yytname[yytoken]; + if (!yypact_value_is_default (yyn)) + { + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. In other words, skip the first -YYN actions for + this state because they are default actions. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yyx; + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR + && !yytable_value_is_error (yytable[yyx + yyn])) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + break; + } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } + } + } -#define YY_DECL_NON_LSP_VARIABLES \ -/* The lookahead symbol. */ \ -int yychar; \ - \ -/* The semantic value of the lookahead symbol. */ \ -YYSTYPE yylval; \ - \ -/* Number of parse errors so far. */ \ -int yynerrs; - -#if YYLSP_NEEDED -# define YY_DECL_VARIABLES \ -YY_DECL_NON_LSP_VARIABLES \ - \ -/* Location data for the lookahead symbol. */ \ -YYLTYPE yylloc; -#else -# define YY_DECL_VARIABLES \ -YY_DECL_NON_LSP_VARIABLES -#endif + switch (yycount) + { +# define YYCASE_(N, S) \ + case N: \ + yyformat = S; \ + break + YYCASE_(0, YY_("syntax error")); + YYCASE_(1, YY_("syntax error, unexpected %s")); + YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); + YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); + YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); + YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); +# undef YYCASE_ + } + yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; -/* If nonreentrant, generate the variables here. */ - -#if !YYPURE -YY_DECL_VARIABLES -#endif /* !YYPURE */ + if (*yymsg_alloc < yysize) + { + *yymsg_alloc = 2 * yysize; + if (! (yysize <= *yymsg_alloc + && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) + *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; + return 1; + } -int -yyparse (YYPARSE_PARAM_ARG) - YYPARSE_PARAM_DECL + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + { + char *yyp = *yymsg; + int yyi = 0; + while ((*yyp = *yyformat) != '\0') + if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyformat += 2; + } + else + { + yyp++; + yyformat++; + } + } + return 0; +} +#endif /* YYERROR_VERBOSE */ + +/*-----------------------------------------------. +| Release the memory associated to this symbol. | +`-----------------------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) +#else +static void +yydestruct (yymsg, yytype, yyvaluep) + const char *yymsg; + int yytype; + YYSTYPE *yyvaluep; +#endif { - /* If reentrant, generate the variables here. */ -#if YYPURE - YY_DECL_VARIABLES -#endif /* !YYPURE */ + YYUSE (yyvaluep); + + if (!yymsg) + yymsg = "Deleting"; + YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + + switch (yytype) + { + + default: + break; + } +} - register int yystate; - register int yyn; - int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Lookahead token as an internal (translated) token number. */ - int yychar1 = 0; - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ - /* The state stack. */ - short yyssa[YYINITDEPTH]; - short *yyss = yyssa; - register short *yyssp; +/*----------. +| yyparse. | +`----------*/ - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - register YYSTYPE *yyvsp; +#ifdef YYPARSE_PARAM +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +int +yyparse (void *YYPARSE_PARAM) +#else +int +yyparse (YYPARSE_PARAM) + void *YYPARSE_PARAM; +#endif +#else /* ! YYPARSE_PARAM */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +int +yyparse (void) +#else +int +yyparse () -#if YYLSP_NEEDED - /* The location stack. */ - YYLTYPE yylsa[YYINITDEPTH]; - YYLTYPE *yyls = yylsa; - YYLTYPE *yylsp; #endif +#endif +{ +/* The lookahead symbol. */ +int yychar; -#if YYLSP_NEEDED -# define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) + +#if defined __GNUC__ && (4 < __GNUC__ + (6 <= __GNUC_MINOR__)) +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ + _Pragma ("GCC diagnostic pop") #else -# define YYPOPSTACK (yyvsp--, yyssp--) +/* Default value used for initialization, for pacifying older GCCs + or non-GCC compilers. */ +static YYSTYPE yyval_default; +# define YYLVAL_INITIALIZE() (yylval = yyval_default) +#endif +#ifndef YYLVAL_INITIALIZE +# define YYLVAL_INITIALIZE() #endif +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif + +/* The semantic value of the lookahead symbol. */ +YYSTYPE yylval; + + /* Number of syntax errors so far. */ + int yynerrs; + + int yystate; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; - YYSIZE_T yystacksize = YYINITDEPTH; + /* The stacks and their tools: + `yyss': related to states. + `yyvs': related to semantic values. + Refer to the stacks through separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss; + yytype_int16 *yyssp; + + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs; + YYSTYPE *yyvsp; + + YYSIZE_T yystacksize; + + int yyn; + int yyresult; + /* Lookahead token as an internal (translated) token number. */ + int yytoken = 0; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; -#if YYLSP_NEEDED - YYLTYPE yyloc; -#endif - /* When reducing, the number of symbols on the RHS of the reduced - rule. */ - int yylen; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) + + /* The number of symbols on the RHS of the reduced rule. + Keep to zero when no symbol should be popped. */ + int yylen = 0; + + yyss = yyssa; + yyvs = yyvsa; + yystacksize = YYINITDEPTH; YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; yyerrstatus = 0; yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ + yychar = YYEMPTY; /* Cause a token to be read. */ /* Initialize stack pointers. Waste one element of value and location stack so that they stay on the same level as the state stack. The wasted elements are never initialized. */ - yyssp = yyss; yyvsp = yyvs; -#if YYLSP_NEEDED - yylsp = yyls; -#endif + + YYLVAL_INITIALIZE (); goto yysetstate; /*------------------------------------------------------------. @@ -757,70 +1359,57 @@ `------------------------------------------------------------*/ yynewstate: /* In all cases, when you get here, the value and location stacks - have just been pushed. so pushing a state here evens the stacks. - */ + have just been pushed. So pushing a state here evens the stacks. */ yyssp++; yysetstate: *yyssp = yystate; - if (yyssp >= yyss + yystacksize - 1) + if (yyss + yystacksize - 1 <= yyssp) { /* Get the current used size of the three stacks, in elements. */ YYSIZE_T yysize = yyssp - yyss + 1; #ifdef yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of + /* Give user a chance to reallocate the stack. Use copies of these so that the &'s don't force the real ones into memory. */ YYSTYPE *yyvs1 = yyvs; - short *yyss1 = yyss; + yytype_int16 *yyss1 = yyss; /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. */ -# if YYLSP_NEEDED - YYLTYPE *yyls1 = yyls; - /* This used to be a conditional around just the two extra args, - but that might be undefined if yyoverflow is a macro. */ - yyoverflow ("parser stack overflow", - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yyls1, yysize * sizeof (*yylsp), - &yystacksize); - yyls = yyls1; -# else - yyoverflow ("parser stack overflow", + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), &yystacksize); -# endif + yyss = yyss1; yyvs = yyvs1; } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE - goto yyoverflowlab; + goto yyexhaustedlab; # else /* Extend the stack our own way. */ - if (yystacksize >= YYMAXDEPTH) - goto yyoverflowlab; + if (YYMAXDEPTH <= yystacksize) + goto yyexhaustedlab; yystacksize *= 2; - if (yystacksize > YYMAXDEPTH) + if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; { - short *yyss1 = yyss; + yytype_int16 *yyss1 = yyss; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) - goto yyoverflowlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); -# if YYLSP_NEEDED - YYSTACK_RELOCATE (yyls); -# endif -# undef YYSTACK_RELOCATE + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); +# undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); } @@ -829,123 +1418,84 @@ yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; -#if YYLSP_NEEDED - yylsp = yyls + yysize - 1; -#endif YYDPRINTF ((stderr, "Stack size increased to %lu\n", (unsigned long int) yystacksize)); - if (yyssp >= yyss + yystacksize - 1) + if (yyss + yystacksize - 1 <= yyssp) YYABORT; } YYDPRINTF ((stderr, "Entering state %d\n", yystate)); - goto yybackup; + if (yystate == YYFINAL) + YYACCEPT; + goto yybackup; /*-----------. | yybackup. | `-----------*/ yybackup: -/* Do appropriate processing given the current state. */ -/* Read a lookahead token if we need one and don't already have one. */ -/* yyresume: */ + /* Do appropriate processing given the current state. Read a + lookahead token if we need one and don't already have one. */ /* First try to decide what to do without reference to lookahead token. */ - yyn = yypact[yystate]; - if (yyn == YYFLAG) + if (yypact_value_is_default (yyn)) goto yydefault; /* Not known => get a lookahead token if don't already have one. */ - /* yychar is either YYEMPTY or YYEOF - or a valid token in external form. */ - + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); yychar = YYLEX; } - /* Convert token to internal form (in yychar1) for indexing tables with */ - - if (yychar <= 0) /* This means end of input. */ + if (yychar <= YYEOF) { - yychar1 = 0; - yychar = YYEOF; /* Don't call YYLEX any more */ - + yychar = yytoken = YYEOF; YYDPRINTF ((stderr, "Now at end of input.\n")); } else { - yychar1 = YYTRANSLATE (yychar); - -#if YYDEBUG - /* We have to keep this `#if YYDEBUG', since we use variables - which are defined only if `YYDEBUG' is set. */ - if (yydebug) - { - YYFPRINTF (stderr, "Next token is %d (%s", - yychar, yytname[yychar1]); - /* Give the individual parser a way to print the precise - meaning of a token, for further debugging info. */ -# ifdef YYPRINT - YYPRINT (stderr, yychar, yylval); -# endif - YYFPRINTF (stderr, ")\n"); - } -#endif + yytoken = YYTRANSLATE (yychar); + YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); } - yyn += yychar1; - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1) + /* If the proper action on seeing token YYTOKEN is to reduce or to + detect an error, take that action. */ + yyn += yytoken; + if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) goto yydefault; - yyn = yytable[yyn]; - - /* yyn is what to do for this token type in this state. - Negative => reduce, -yyn is rule number. - Positive => shift, yyn is new state. - New state is final state => don't bother to shift, - just return success. - 0, or most negative number => error. */ - - if (yyn < 0) + if (yyn <= 0) { - if (yyn == YYFLAG) - goto yyerrlab; + if (yytable_value_is_error (yyn)) + goto yyerrlab; yyn = -yyn; goto yyreduce; } - else if (yyn == 0) - goto yyerrlab; - - if (yyn == YYFINAL) - YYACCEPT; - - /* Shift the lookahead token. */ - YYDPRINTF ((stderr, "Shifting token %d (%s), ", - yychar, yytname[yychar1])); - - /* Discard the token being shifted unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; - - *++yyvsp = yylval; -#if YYLSP_NEEDED - *++yylsp = yylloc; -#endif /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; + /* Shift the lookahead token. */ + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); + + /* Discard the shifted token. */ + yychar = YYEMPTY; + yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END + goto yynewstate; @@ -969,140 +1519,139 @@ /* If YYLEN is nonzero, implement the default value of the action: `$$ = $1'. - Otherwise, the following line sets YYVAL to the semantic value of - the lookahead token. This behavior is undocumented and Bison + Otherwise, the following line sets YYVAL to garbage. + This behavior is undocumented and Bison users should not rely upon it. Assigning to YYVAL unconditionally makes the parser a bit smaller, and it avoids a GCC warning that YYVAL may be used uninitialized. */ yyval = yyvsp[1-yylen]; -#if YYLSP_NEEDED - /* Similarly for the default location. Let the user run additional - commands if for instance locations are ranges. */ - yyloc = yylsp[1-yylen]; - YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); -#endif -#if YYDEBUG - /* We have to keep this `#if YYDEBUG', since we use variables which - are defined only if `YYDEBUG' is set. */ - if (yydebug) + YY_REDUCE_PRINT (yyn); + switch (yyn) { - int yyi; - - YYFPRINTF (stderr, "Reducing via rule %d (line %d), ", - yyn, yyrline[yyn]); - - /* Print the symbols being reduced, and their result. */ - for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++) - YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]); - YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]); - } -#endif - - switch (yyn) { - -case 1: -#line 151 "plural.y" -{ - if (yyvsp[0].exp == NULL) + case 2: +/* Line 1813 of yacc.c */ +#line 151 "../../intl/plural.y" + { + if ((yyvsp[(1) - (1)].exp) == NULL) YYABORT; - ((struct parse_args *) arg)->res = yyvsp[0].exp; + ((struct parse_args *) arg)->res = (yyvsp[(1) - (1)].exp); } break; -case 2: -#line 159 "plural.y" -{ - yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp); + + case 3: +/* Line 1813 of yacc.c */ +#line 159 "../../intl/plural.y" + { + (yyval.exp) = new_exp_3 (qmop, (yyvsp[(1) - (5)].exp), (yyvsp[(3) - (5)].exp), (yyvsp[(5) - (5)].exp)); } break; -case 3: -#line 163 "plural.y" -{ - yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp); + + case 4: +/* Line 1813 of yacc.c */ +#line 163 "../../intl/plural.y" + { + (yyval.exp) = new_exp_2 (lor, (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp)); } break; -case 4: -#line 167 "plural.y" -{ - yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp); + + case 5: +/* Line 1813 of yacc.c */ +#line 167 "../../intl/plural.y" + { + (yyval.exp) = new_exp_2 (land, (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp)); } break; -case 5: -#line 171 "plural.y" -{ - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); + + case 6: +/* Line 1813 of yacc.c */ +#line 171 "../../intl/plural.y" + { + (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp)); } break; -case 6: -#line 175 "plural.y" -{ - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); + + case 7: +/* Line 1813 of yacc.c */ +#line 175 "../../intl/plural.y" + { + (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp)); } break; -case 7: -#line 179 "plural.y" -{ - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); + + case 8: +/* Line 1813 of yacc.c */ +#line 179 "../../intl/plural.y" + { + (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp)); } break; -case 8: -#line 183 "plural.y" -{ - yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); + + case 9: +/* Line 1813 of yacc.c */ +#line 183 "../../intl/plural.y" + { + (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp)); } break; -case 9: -#line 187 "plural.y" -{ - yyval.exp = new_exp_1 (lnot, yyvsp[0].exp); + + case 10: +/* Line 1813 of yacc.c */ +#line 187 "../../intl/plural.y" + { + (yyval.exp) = new_exp_1 (lnot, (yyvsp[(2) - (2)].exp)); } break; -case 10: -#line 191 "plural.y" -{ - yyval.exp = new_exp_0 (var); + + case 11: +/* Line 1813 of yacc.c */ +#line 191 "../../intl/plural.y" + { + (yyval.exp) = new_exp_0 (var); } break; -case 11: -#line 195 "plural.y" -{ - if ((yyval.exp = new_exp_0 (num)) != NULL) - yyval.exp->val.num = yyvsp[0].num; + + case 12: +/* Line 1813 of yacc.c */ +#line 195 "../../intl/plural.y" + { + if (((yyval.exp) = new_exp_0 (num)) != NULL) + (yyval.exp)->val.num = (yyvsp[(1) - (1)].num); } break; -case 12: -#line 200 "plural.y" -{ - yyval.exp = yyvsp[-1].exp; + + case 13: +/* Line 1813 of yacc.c */ +#line 200 "../../intl/plural.y" + { + (yyval.exp) = (yyvsp[(2) - (3)].exp); } break; -} -#line 705 "/usr/local/share/bison/bison.simple" - - yyvsp -= yylen; - yyssp -= yylen; -#if YYLSP_NEEDED - yylsp -= yylen; -#endif - -#if YYDEBUG - if (yydebug) - { - short *yyssp1 = yyss - 1; - YYFPRINTF (stderr, "state stack now"); - while (yyssp1 != yyssp) - YYFPRINTF (stderr, " %d", *++yyssp1); - YYFPRINTF (stderr, "\n"); +/* Line 1813 of yacc.c */ +#line 1635 "../../intl/plural.c" + default: break; } -#endif + /* User semantic actions sometimes alter yychar, and that requires + that yytoken be updated with the new translation. We take the + approach of translating immediately before every use of yytoken. + One alternative is translating here after every semantic action, + but that translation would be missed if the semantic action invokes + YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or + if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an + incorrect destructor might then be invoked immediately. In the + case of YYERROR or YYBACKUP, subsequent parser actions might lead + to an incorrect destructor call or verbose syntax error message + before the lookahead is translated. */ + YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); + + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; -#if YYLSP_NEEDED - *++yylsp = yyloc; -#endif /* Now `shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule @@ -1110,11 +1659,11 @@ yyn = yyr1[yyn]; - yystate = yypgoto[yyn - YYNTBASE] + *yyssp; - if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp) + yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; + if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) yystate = yytable[yystate]; else - yystate = yydefgoto[yyn - YYNTBASE]; + yystate = yydefgoto[yyn - YYNTOKENS]; goto yynewstate; @@ -1123,159 +1672,135 @@ | yyerrlab -- here on detecting error | `------------------------------------*/ yyerrlab: + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); + /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { ++yynerrs; - -#ifdef YYERROR_VERBOSE - yyn = yypact[yystate]; - - if (yyn > YYFLAG && yyn < YYLAST) - { - YYSIZE_T yysize = 0; - char *yymsg; - int yyx, yycount; - - yycount = 0; - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - for (yyx = yyn < 0 ? -yyn : 0; - yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++) - if (yycheck[yyx + yyn] == yyx) - yysize += yystrlen (yytname[yyx]) + 15, yycount++; - yysize += yystrlen ("parse error, unexpected ") + 1; - yysize += yystrlen (yytname[YYTRANSLATE (yychar)]); - yymsg = (char *) YYSTACK_ALLOC (yysize); - if (yymsg != 0) - { - char *yyp = yystpcpy (yymsg, "parse error, unexpected "); - yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]); - - if (yycount < 5) - { - yycount = 0; - for (yyx = yyn < 0 ? -yyn : 0; - yyx < (int) (sizeof (yytname) / sizeof (char *)); - yyx++) - if (yycheck[yyx + yyn] == yyx) - { - const char *yyq = ! yycount ? ", expecting " : " or "; - yyp = yystpcpy (yyp, yyq); - yyp = yystpcpy (yyp, yytname[yyx]); - yycount++; - } - } - yyerror (yymsg); - YYSTACK_FREE (yymsg); - } - else - yyerror ("parse error; also virtual memory exhausted"); - } - else -#endif /* defined (YYERROR_VERBOSE) */ - yyerror ("parse error"); +#if ! YYERROR_VERBOSE + yyerror (YY_("syntax error")); +#else +# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ + yyssp, yytoken) + { + char const *yymsgp = YY_("syntax error"); + int yysyntax_error_status; + yysyntax_error_status = YYSYNTAX_ERROR; + if (yysyntax_error_status == 0) + yymsgp = yymsg; + else if (yysyntax_error_status == 1) + { + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); + if (!yymsg) + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + yysyntax_error_status = 2; + } + else + { + yysyntax_error_status = YYSYNTAX_ERROR; + yymsgp = yymsg; + } + } + yyerror (yymsgp); + if (yysyntax_error_status == 2) + goto yyexhaustedlab; + } +# undef YYSYNTAX_ERROR +#endif } - goto yyerrlab1; -/*--------------------------------------------------. -| yyerrlab1 -- error raised explicitly by an action | -`--------------------------------------------------*/ -yyerrlab1: + if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an error, discard it. */ - /* return failure if at end of input */ - if (yychar == YYEOF) - YYABORT; - YYDPRINTF ((stderr, "Discarding token %d (%s).\n", - yychar, yytname[yychar1])); - yychar = YYEMPTY; + if (yychar <= YYEOF) + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } + else + { + yydestruct ("Error: discarding", + yytoken, &yylval); + yychar = YYEMPTY; + } } /* Else will try to reuse lookahead token after shifting the error token. */ + goto yyerrlab1; - yyerrstatus = 3; /* Each real token shifted decrements this */ - - goto yyerrhandle; - - -/*-------------------------------------------------------------------. -| yyerrdefault -- current state does not do anything special for the | -| error token. | -`-------------------------------------------------------------------*/ -yyerrdefault: -#if 0 - /* This is wrong; only states that explicitly want error tokens - should shift them. */ - /* If its default is to accept any token, ok. Otherwise pop it. */ - yyn = yydefact[yystate]; - if (yyn) - goto yydefault; -#endif +/*---------------------------------------------------. +| yyerrorlab -- error raised explicitly by YYERROR. | +`---------------------------------------------------*/ +yyerrorlab: + + /* Pacify compilers like GCC when the user code never invokes + YYERROR and the label yyerrorlab therefore never appears in user + code. */ + if (/*CONSTCOND*/ 0) + goto yyerrorlab; + + /* Do not reclaim the symbols of the rule which action triggered + this YYERROR. */ + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); + yystate = *yyssp; + goto yyerrlab1; -/*---------------------------------------------------------------. -| yyerrpop -- pop the current state because it cannot handle the | -| error token | -`---------------------------------------------------------------*/ -yyerrpop: - if (yyssp == yyss) - YYABORT; - yyvsp--; - yystate = *--yyssp; -#if YYLSP_NEEDED - yylsp--; -#endif +/*-------------------------------------------------------------. +| yyerrlab1 -- common code for both syntax error and YYERROR. | +`-------------------------------------------------------------*/ +yyerrlab1: + yyerrstatus = 3; /* Each real token shifted decrements this. */ -#if YYDEBUG - if (yydebug) + for (;;) { - short *yyssp1 = yyss - 1; - YYFPRINTF (stderr, "Error: state stack now"); - while (yyssp1 != yyssp) - YYFPRINTF (stderr, " %d", *++yyssp1); - YYFPRINTF (stderr, "\n"); - } -#endif + yyn = yypact[yystate]; + if (!yypact_value_is_default (yyn)) + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } -/*--------------. -| yyerrhandle. | -`--------------*/ -yyerrhandle: - yyn = yypact[yystate]; - if (yyn == YYFLAG) - goto yyerrdefault; + /* Pop the current state because it cannot handle the error token. */ + if (yyssp == yyss) + YYABORT; - yyn += YYTERROR; - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR) - goto yyerrdefault; - yyn = yytable[yyn]; - if (yyn < 0) - { - if (yyn == YYFLAG) - goto yyerrpop; - yyn = -yyn; - goto yyreduce; + yydestruct ("Error: popping", + yystos[yystate], yyvsp); + YYPOPSTACK (1); + yystate = *yyssp; + YY_STACK_PRINT (yyss, yyssp); } - else if (yyn == 0) - goto yyerrpop; - if (yyn == YYFINAL) - YYACCEPT; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END - YYDPRINTF ((stderr, "Shifting error token, ")); - *++yyvsp = yylval; -#if YYLSP_NEEDED - *++yylsp = yylloc; -#endif + /* Shift the error token. */ + YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); yystate = yyn; goto yynewstate; @@ -1295,22 +1820,50 @@ yyresult = 1; goto yyreturn; -/*---------------------------------------------. -| yyoverflowab -- parser overflow comes here. | -`---------------------------------------------*/ -yyoverflowlab: - yyerror ("parser stack overflow"); +#if !defined yyoverflow || YYERROR_VERBOSE +/*-------------------------------------------------. +| yyexhaustedlab -- memory exhaustion comes here. | +`-------------------------------------------------*/ +yyexhaustedlab: + yyerror (YY_("memory exhausted")); yyresult = 2; /* Fall through. */ +#endif yyreturn: + if (yychar != YYEMPTY) + { + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = YYTRANSLATE (yychar); + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval); + } + /* Do not reclaim the symbols of the rule which action triggered + this YYABORT or YYACCEPT. */ + YYPOPSTACK (yylen); + YY_STACK_PRINT (yyss, yyssp); + while (yyssp != yyss) + { + yydestruct ("Cleanup: popping", + yystos[*yyssp], yyvsp); + YYPOPSTACK (1); + } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif - return yyresult; +#if YYERROR_VERBOSE + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); +#endif + /* Make sure YYID is used. */ + return YYID (yyresult); } -#line 205 "plural.y" + + +/* Line 2076 of yacc.c */ +#line 205 "../../intl/plural.y" void diff -Nru mc-4.8.10/lib/Makefile.in mc-4.8.11/lib/Makefile.in --- mc-4.8.10/lib/Makefile.in 2013-08-02 18:56:40.000000000 +0000 +++ mc-4.8.11/lib/Makefile.in 2013-11-29 18:45:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,9 +83,9 @@ @HAVE_GMODULE_TRUE@am__append_3 = $(GMODULE_LIBS) @HAVE_GMODULE_FALSE@am__append_4 = $(GLIB_LIBS) subdir = lib -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -212,13 +240,14 @@ am__v_CCLD_1 = SOURCES = $(libmc_la_SOURCES) DIST_SOURCES = $(am__libmc_la_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -226,9 +255,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -536,6 +585,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -581,6 +631,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libmc.la: $(libmc_la_OBJECTS) $(libmc_la_DEPENDENCIES) $(EXTRA_libmc_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_libmc_la_rpath) $(libmc_la_OBJECTS) $(libmc_la_LIBADD) $(LIBS) @@ -635,14 +686,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -663,31 +713,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -703,12 +735,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -720,15 +747,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -737,9 +760,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -919,15 +943,12 @@ uninstall-am: uninstall-libLTLIBRARIES -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libLTLIBRARIES \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -937,7 +958,7 @@ installcheck installcheck-am installdirs installdirs-am \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ uninstall-libLTLIBRARIES diff -Nru mc-4.8.10/lib/charsets.c mc-4.8.11/lib/charsets.c --- mc-4.8.10/lib/charsets.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/charsets.c 2013-11-29 18:27:07.000000000 +0000 @@ -220,7 +220,7 @@ fprintf (stderr, "%s\n", _("Warning: cannot load codepages list")); codepages = g_ptr_array_new (); - g_ptr_array_add (codepages, new_codepage_desc ("ASCII", _("7-bit ASCII"))); + g_ptr_array_add (codepages, new_codepage_desc (DEFAULT_CHARSET, _("7-bit ASCII"))); } } @@ -432,7 +432,7 @@ unsigned char convert_from_utf_to_current (const char *str) { - unsigned char buf_ch[6 + 1]; + unsigned char buf_ch[UTF8_CHAR_LEN + 1]; unsigned char ch = '.'; GIConv conv; const char *cp_to; @@ -467,8 +467,8 @@ unsigned char convert_from_utf_to_current_c (const int input_char, GIConv conv) { - unsigned char str[6 + 1]; - unsigned char buf_ch[6 + 1]; + unsigned char str[UTF8_CHAR_LEN + 1]; + unsigned char buf_ch[UTF8_CHAR_LEN + 1]; unsigned char ch = '.'; int res = 0; @@ -499,7 +499,7 @@ convert_from_8bit_to_utf_c (const char input_char, GIConv conv) { unsigned char str[2]; - unsigned char buf_ch[6 + 1]; + unsigned char buf_ch[UTF8_CHAR_LEN + 1]; int ch = '.'; int res = 0; @@ -533,9 +533,8 @@ convert_from_8bit_to_utf_c2 (const char input_char) { unsigned char str[2]; - unsigned char buf_ch[6 + 1]; + unsigned char buf_ch[UTF8_CHAR_LEN + 1]; int ch = '.'; - int res = 0; GIConv conv; const char *cp_from; @@ -547,6 +546,8 @@ if (conv != INVALID_CONV) { + int res = 0; + switch (str_translate_char (conv, (char *) str, -1, (char *) buf_ch, sizeof (buf_ch))) { case ESTR_SUCCESS: diff -Nru mc-4.8.10/lib/event/Makefile.in mc-4.8.11/lib/event/Makefile.in --- mc-4.8.10/lib/event/Makefile.in 2013-08-02 18:56:41.000000000 +0000 +++ mc-4.8.11/lib/event/Makefile.in 2013-11-29 18:45:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = lib/event -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -162,6 +190,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -428,6 +473,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libmcevent.la: $(libmcevent_la_OBJECTS) $(libmcevent_la_DEPENDENCIES) $(EXTRA_libmcevent_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libmcevent_la_OBJECTS) $(libmcevent_la_LIBADD) $(LIBS) @@ -468,26 +514,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -499,15 +534,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -516,9 +547,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -671,9 +703,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -683,7 +715,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/lib/filehighlight/Makefile.in mc-4.8.11/lib/filehighlight/Makefile.in --- mc-4.8.10/lib/filehighlight/Makefile.in 2013-08-02 18:56:41.000000000 +0000 +++ mc-4.8.11/lib/filehighlight/Makefile.in 2013-11-29 18:45:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = lib/filehighlight -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -163,6 +191,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -429,6 +474,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libmcfilehighlight.la: $(libmcfilehighlight_la_OBJECTS) $(libmcfilehighlight_la_DEPENDENCIES) $(EXTRA_libmcfilehighlight_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libmcfilehighlight_la_OBJECTS) $(libmcfilehighlight_la_LIBADD) $(LIBS) @@ -469,26 +515,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -500,15 +535,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -517,9 +548,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -672,9 +704,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -684,7 +716,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/lib/filehighlight/get-color.c mc-4.8.11/lib/filehighlight/get-color.c --- mc-4.8.10/lib/filehighlight/get-color.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/filehighlight/get-color.c 2013-11-29 18:27:07.000000000 +0000 @@ -47,7 +47,7 @@ /*inline functions */ inline static gboolean -mc_fhl_is_file (file_entry * fe) +mc_fhl_is_file (file_entry_t * fe) { #if S_ISREG == 0 (void) fe; @@ -56,13 +56,13 @@ } inline static gboolean -mc_fhl_is_file_exec (file_entry * fe) +mc_fhl_is_file_exec (file_entry_t * fe) { return is_exe (fe->st.st_mode); } inline static gboolean -mc_fhl_is_dir (file_entry * fe) +mc_fhl_is_dir (file_entry_t * fe) { #if S_ISDIR == 0 (void) fe; @@ -71,7 +71,7 @@ } inline static gboolean -mc_fhl_is_link (file_entry * fe) +mc_fhl_is_link (file_entry_t * fe) { #if S_ISLNK == 0 (void) fe; @@ -80,25 +80,25 @@ } inline static gboolean -mc_fhl_is_hlink (file_entry * fe) +mc_fhl_is_hlink (file_entry_t * fe) { return (fe->st.st_nlink > 1); } inline static gboolean -mc_fhl_is_link_to_dir (file_entry * fe) +mc_fhl_is_link_to_dir (file_entry_t * fe) { return mc_fhl_is_link (fe) && (fe->f.link_to_dir); } inline static gboolean -mc_fhl_is_stale_link (file_entry * fe) +mc_fhl_is_stale_link (file_entry_t * fe) { return mc_fhl_is_link (fe) ? fe->f.stale_link : !mc_fhl_is_file (fe); } inline static gboolean -mc_fhl_is_device_char (file_entry * fe) +mc_fhl_is_device_char (file_entry_t * fe) { #if S_ISCHR == 0 (void) fe; @@ -107,7 +107,7 @@ } inline static gboolean -mc_fhl_is_device_block (file_entry * fe) +mc_fhl_is_device_block (file_entry_t * fe) { #if S_ISBLK == 0 (void) fe; @@ -116,7 +116,7 @@ } inline static gboolean -mc_fhl_is_special_socket (file_entry * fe) +mc_fhl_is_special_socket (file_entry_t * fe) { #if S_ISSOCK == 0 (void) fe; @@ -125,7 +125,7 @@ } inline static gboolean -mc_fhl_is_special_fifo (file_entry * fe) +mc_fhl_is_special_fifo (file_entry_t * fe) { #if S_ISFIFO == 0 (void) fe; @@ -134,7 +134,7 @@ } inline static gboolean -mc_fhl_is_special_door (file_entry * fe) +mc_fhl_is_special_door (file_entry_t * fe) { #if S_ISDOOR == 0 (void) fe; @@ -145,7 +145,7 @@ inline static gboolean -mc_fhl_is_special (file_entry * fe) +mc_fhl_is_special (file_entry_t * fe) { return (mc_fhl_is_special_socket (fe) || mc_fhl_is_special_fifo (fe) @@ -156,7 +156,7 @@ /* --------------------------------------------------------------------------------------------- */ static int -mc_fhl_get_color_filetype (mc_fhl_filter_t * mc_filter, mc_fhl_t * fhl, file_entry * fe) +mc_fhl_get_color_filetype (mc_fhl_filter_t * mc_filter, mc_fhl_t * fhl, file_entry_t * fe) { gboolean my_color = FALSE; (void) fhl; @@ -231,7 +231,7 @@ /* --------------------------------------------------------------------------------------------- */ static int -mc_fhl_get_color_regexp (mc_fhl_filter_t * mc_filter, mc_fhl_t * fhl, file_entry * fe) +mc_fhl_get_color_regexp (mc_fhl_filter_t * mc_filter, mc_fhl_t * fhl, file_entry_t * fe) { (void) fhl; if (mc_filter->search_condition == NULL) @@ -250,10 +250,9 @@ /* --------------------------------------------------------------------------------------------- */ int -mc_fhl_get_color (mc_fhl_t * fhl, file_entry * fe) +mc_fhl_get_color (mc_fhl_t * fhl, file_entry_t * fe) { guint i; - mc_fhl_filter_t *mc_filter; int ret; if (fhl == NULL) @@ -261,6 +260,8 @@ for (i = 0; i < fhl->filters->len; i++) { + mc_fhl_filter_t *mc_filter; + mc_filter = (mc_fhl_filter_t *) g_ptr_array_index (fhl->filters, i); switch (mc_filter->type) { diff -Nru mc-4.8.10/lib/filehighlight/ini-file-read.c mc-4.8.11/lib/filehighlight/ini-file-read.c --- mc-4.8.10/lib/filehighlight/ini-file-read.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/filehighlight/ini-file-read.c 2013-10-15 09:52:41.000000000 +0000 @@ -115,7 +115,7 @@ mc_filter = g_new0 (mc_fhl_filter_t, 1); mc_filter->type = MC_FLHGH_T_FREGEXP; - mc_filter->search_condition = mc_search_new (regexp, -1); + mc_filter->search_condition = mc_search_new (regexp, -1, DEFAULT_CHARSET); mc_filter->search_condition->is_case_sensitive = TRUE; mc_filter->search_condition->search_type = MC_SEARCH_T_REGEX; @@ -162,7 +162,7 @@ mc_filter = g_new0 (mc_fhl_filter_t, 1); mc_filter->type = MC_FLHGH_T_FREGEXP; - mc_filter->search_condition = mc_search_new (buf->str, buf->len); + mc_filter->search_condition = mc_search_new (buf->str, buf->len, DEFAULT_CHARSET); mc_filter->search_condition->is_case_sensitive = mc_config_get_bool (fhl->config, group_name, "extensions_case", TRUE); mc_filter->search_condition->search_type = MC_SEARCH_T_REGEX; diff -Nru mc-4.8.10/lib/filehighlight.h mc-4.8.11/lib/filehighlight.h --- mc-4.8.10/lib/filehighlight.h 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/filehighlight.h 2013-10-15 09:52:41.000000000 +0000 @@ -25,7 +25,7 @@ mc_fhl_t *mc_fhl_new (gboolean); void mc_fhl_free (mc_fhl_t **); -int mc_fhl_get_color (mc_fhl_t *, file_entry *); +int mc_fhl_get_color (mc_fhl_t *, file_entry_t *); gboolean mc_fhl_read_ini_file (mc_fhl_t *, const gchar *); gboolean mc_fhl_parse_ini_file (mc_fhl_t *); diff -Nru mc-4.8.10/lib/glibcompat.c mc-4.8.11/lib/glibcompat.c --- mc-4.8.10/lib/glibcompat.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/glibcompat.c 2013-11-29 18:27:07.000000000 +0000 @@ -96,3 +96,44 @@ #endif /* ! GLIB_CHECK_VERSION (2, 16, 0) */ /* --------------------------------------------------------------------------------------------- */ + +#if ! GLIB_CHECK_VERSION (2, 28, 0) +/** + * g_slist_free_full: + * @list: a pointer to a #GSList + * @free_func: the function to be called to free each element's data + * + * Convenience method, which frees all the memory used by a #GSList, and + * calls the specified destroy function on every element's data. + * + * Since: 2.28 + **/ +void +g_slist_free_full (GSList * list, GDestroyNotify free_func) +{ + g_slist_foreach (list, (GFunc) free_func, NULL); + g_slist_free (list); +} + +/* --------------------------------------------------------------------------------------------- */ + +/** + * g_list_free_full: + * @list: a pointer to a #GList + * @free_func: the function to be called to free each element's data + * + * Convenience method, which frees all the memory used by a #GList, and + * calls the specified destroy function on every element's data. + * + * Since: 2.28 + */ +void +g_list_free_full (GList * list, GDestroyNotify free_func) +{ + g_list_foreach (list, (GFunc) free_func, NULL); + g_list_free (list); +} + +#endif /* ! GLIB_CHECK_VERSION (2, 28, 0) */ + +/* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.10/lib/glibcompat.h mc-4.8.11/lib/glibcompat.h --- mc-4.8.10/lib/glibcompat.h 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/glibcompat.h 2013-11-29 18:27:07.000000000 +0000 @@ -19,6 +19,11 @@ int g_strcmp0 (const char *str1, const char *str2); #endif /* ! GLIB_CHECK_VERSION (2, 16, 0) */ +#if ! GLIB_CHECK_VERSION (2, 28, 0) +void g_slist_free_full (GSList * list, GDestroyNotify free_func); +void g_list_free_full (GList * list, GDestroyNotify free_func); +#endif /* ! GLIB_CHECK_VERSION (2, 28, 0) */ + /*** inline functions ****************************************************************************/ #endif /* MC_GLIBCOMPAT_H */ diff -Nru mc-4.8.10/lib/global.h mc-4.8.11/lib/global.h --- mc-4.8.10/lib/global.h 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/global.h 2013-10-15 09:52:41.000000000 +0000 @@ -155,6 +155,8 @@ #define MC_ERROR g_quark_from_static_string (PACKAGE) +#define DEFAULT_CHARSET "ASCII" + /*** enums ***************************************************************************************/ /* run mode and params */ diff -Nru mc-4.8.10/lib/keybind.c mc-4.8.11/lib/keybind.c --- mc-4.8.10/lib/keybind.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/keybind.c 2013-11-29 18:27:07.000000000 +0000 @@ -456,13 +456,14 @@ const char * keybind_lookup_keymap_shortcut (const global_keymap_t * keymap, unsigned long action) { - size_t i; - if (keymap != NULL) + { + size_t i; + for (i = 0; keymap[i].key != 0; i++) if (keymap[i].command == action) return (keymap[i].caption[0] != '\0') ? keymap[i].caption : NULL; - + } return NULL; } @@ -471,12 +472,14 @@ unsigned long keybind_lookup_keymap_command (const global_keymap_t * keymap, long key) { - size_t i; - if (keymap != NULL) + { + size_t i; + for (i = 0; keymap[i].key != 0; i++) if (keymap[i].key == key) return keymap[i].command; + } return CK_IgnoreKey; } diff -Nru mc-4.8.10/lib/logging.c mc-4.8.11/lib/logging.c --- mc-4.8.10/lib/logging.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/logging.c 2013-11-29 18:27:07.000000000 +0000 @@ -112,13 +112,14 @@ static void mc_va_log (const char *fmt, va_list args) { - FILE *f; char *logfilename; logfilename = get_log_filename (); if (logfilename != NULL) { + FILE *f; + f = fopen (logfilename, "a"); if (f != NULL) { diff -Nru mc-4.8.10/lib/mcconfig/Makefile.in mc-4.8.11/lib/mcconfig/Makefile.in --- mc-4.8.10/lib/mcconfig/Makefile.in 2013-08-02 18:56:41.000000000 +0000 +++ mc-4.8.11/lib/mcconfig/Makefile.in 2013-11-29 18:45:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = lib/mcconfig -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -162,6 +190,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -428,6 +473,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libmcconfig.la: $(libmcconfig_la_OBJECTS) $(libmcconfig_la_DEPENDENCIES) $(EXTRA_libmcconfig_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libmcconfig_la_OBJECTS) $(libmcconfig_la_LIBADD) $(LIBS) @@ -469,26 +515,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -500,15 +535,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -517,9 +548,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -672,9 +704,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -684,7 +716,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/lib/search/Makefile.in mc-4.8.11/lib/search/Makefile.in --- mc-4.8.10/lib/search/Makefile.in 2013-08-02 18:56:41.000000000 +0000 +++ mc-4.8.11/lib/search/Makefile.in 2013-11-29 18:45:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = lib/search -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -163,6 +191,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -432,6 +477,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libsearch.la: $(libsearch_la_OBJECTS) $(libsearch_la_DEPENDENCIES) $(EXTRA_libsearch_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libsearch_la_OBJECTS) $(libsearch_la_LIBADD) $(LIBS) @@ -475,26 +521,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -506,15 +541,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -523,9 +554,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -678,9 +710,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -690,7 +722,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/lib/search/hex.c mc-4.8.11/lib/search/hex.c --- mc-4.8.10/lib/search/hex.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/search/hex.c 2013-11-29 18:27:07.000000000 +0000 @@ -75,6 +75,7 @@ { int val, ptr; + /* cppcheck-suppress invalidscanf */ if (sscanf (tmp_str + loop, "%x%n", &val, &ptr)) { if (val < -128 || val > 255) diff -Nru mc-4.8.10/lib/search/internal.h mc-4.8.11/lib/search/internal.h --- mc-4.8.10/lib/search/internal.h 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/search/internal.h 2013-10-15 09:45:12.000000000 +0000 @@ -47,8 +47,6 @@ gchar *mc_search__get_one_symbol (const char *, const char *, gsize, gboolean *); -mc_search_cbret_t mc_search__get_char (mc_search_t *, const void *, gsize, int *); - GString *mc_search__tolower_case_str (const char *, const char *, gsize); GString *mc_search__toupper_case_str (const char *, const char *, gsize); diff -Nru mc-4.8.10/lib/search/lib.c mc-4.8.11/lib/search/lib.c --- mc-4.8.10/lib/search/lib.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/search/lib.c 2013-10-15 09:52:41.000000000 +0000 @@ -2,11 +2,12 @@ Search text engine. Common share code for module. - Copyright (C) 2009, 2011 + Copyright (C) 2009, 2011, 2013 The Free Software Foundation, Inc. Written by: - Slava Zanko , 2009. + Slava Zanko , 2009, 2011 + Andrew Borodin , 2013 This file is part of the Midnight Commander. @@ -64,7 +65,8 @@ gsize bytes_read; GIConv conv; - if (charset_from == NULL || charset_to == NULL || !strcmp (charset_to, charset_from)) + if (charset_from == NULL || charset_to == NULL + || g_ascii_strcasecmp (charset_to, charset_from) == 0) { *bytes_written = str_len; return g_strndup (str, str_len); @@ -139,22 +141,6 @@ /* --------------------------------------------------------------------------------------------- */ -mc_search_cbret_t -mc_search__get_char (mc_search_t * lc_mc_search, const void *user_data, gsize current_pos, - int *current_char) -{ - unsigned char *data; - - if (lc_mc_search->search_fn != NULL) - return lc_mc_search->search_fn (user_data, current_pos, current_char); - - data = (unsigned char *) user_data; - *current_char = (int) data[current_pos]; - return (*current_char == 0) ? MC_SEARCH_CB_ABORT : MC_SEARCH_CB_OK; -} - -/* --------------------------------------------------------------------------------------------- */ - GString * mc_search__tolower_case_str (const char *charset, const char *str, gsize str_len) { diff -Nru mc-4.8.10/lib/search/regex.c mc-4.8.11/lib/search/regex.c --- mc-4.8.10/lib/search/regex.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/search/regex.c 2013-11-29 18:27:07.000000000 +0000 @@ -2,12 +2,13 @@ Search text engine. Regex search - Copyright (C) 2009, 2011 + Copyright (C) 2009, 2011, 2013 The Free Software Foundation, Inc. Written by: - Slava Zanko , 2009,2010,2011 + Slava Zanko , 2009, 2010, 2011, 2013 Vitaliy Filippov , 2011 + Andrew Borodin , 2013 This file is part of the Midnight Commander. @@ -118,12 +119,12 @@ } /* --------------------------------------------------------------------------------------------- */ + static void mc_search__cond_struct_new_regex_hex_add (const char *charset, GString * str_to, const char *one_char, gsize str_len) { GString *upp, *low; - gchar *tmp_str; gsize loop; upp = mc_search__toupper_case_str (charset, one_char, str_len); @@ -131,23 +132,20 @@ for (loop = 0; loop < upp->len; loop++) { + gchar tmp_str[10 + 1]; /* longest content is "[\\x%02X\\x%02X]" */ + gint tmp_len; - if (loop < low->len) - { - if (upp->str[loop] == low->str[loop]) - tmp_str = g_strdup_printf ("\\x%02X", (unsigned char) upp->str[loop]); - else - tmp_str = - g_strdup_printf ("[\\x%02X\\x%02X]", (unsigned char) upp->str[loop], - (unsigned char) low->str[loop]); - } + if (loop >= low->len || upp->str[loop] == low->str[loop]) + tmp_len = + g_snprintf (tmp_str, sizeof (tmp_str), "\\x%02X", (unsigned char) upp->str[loop]); else - { - tmp_str = g_strdup_printf ("\\x%02X", (unsigned char) upp->str[loop]); - } - g_string_append (str_to, tmp_str); - g_free (tmp_str); + tmp_len = + g_snprintf (tmp_str, sizeof (tmp_str), "[\\x%02X\\x%02X]", + (unsigned char) upp->str[loop], (unsigned char) low->str[loop]); + + g_string_append_len (str_to, tmp_str, tmp_len); } + g_string_free (upp, TRUE); g_string_free (low, TRUE); } @@ -190,7 +188,7 @@ g_free (one_char); } - g_string_append (str_to, recoded_part->str); + g_string_append_len (str_to, recoded_part->str, recoded_part->len); g_string_free (recoded_part, TRUE); g_string_set_size (str_from, 0); } @@ -292,11 +290,12 @@ mc_search__regex_found_cond (mc_search_t * lc_mc_search, GString * search_str) { gsize loop1; - mc_search_cond_t *mc_search_cond; - mc_search__found_cond_t ret; for (loop1 = 0; loop1 < lc_mc_search->conditions->len; loop1++) { + mc_search_cond_t *mc_search_cond; + mc_search__found_cond_t ret; + mc_search_cond = (mc_search_cond_t *) g_ptr_array_index (lc_mc_search->conditions, loop1); if (!mc_search_cond->regex_handle) @@ -305,7 +304,6 @@ ret = mc_search__regex_found_cond_one (lc_mc_search, mc_search_cond->regex_handle, search_str); - if (ret != COND__NOT_FOUND) return ret; } @@ -332,16 +330,19 @@ if (str[loop] == '$' && str[loop + 1] == '{') { gsize tmp_len; - char *tmp_str; - int tmp_token; + if (strutils_is_char_escaped (str, &str[loop])) continue; for (tmp_len = 0; loop + tmp_len + 2 < len && (str[loop + 2 + tmp_len] & (char) 0xf0) == 0x30; tmp_len++); + if (str[loop + 2 + tmp_len] == '}') { + int tmp_token; + char *tmp_str; + tmp_str = g_strndup (&str[loop + 2], tmp_len); tmp_token = atoi (tmp_str); if (max_token < tmp_token) @@ -460,7 +461,6 @@ gsize * skip_len, replace_transform_type_t * replace_flags) { int ret = -1; - char *tmp_str; const char *curr_str = &(replace_str->str[current_pos]); if (current_pos > replace_str->len) @@ -471,6 +471,8 @@ if ((*curr_str == '$') && (*(curr_str + 1) == '{') && ((*(curr_str + 2) & (char) 0xf0) == 0x30) && (replace_str->len > current_pos + 2)) { + char *tmp_str; + if (strutils_is_char_escaped (replace_str->str, curr_str)) { *skip_len = 1; @@ -548,61 +550,59 @@ mc_search_regex__process_append_str (GString * dest_str, const char *from, gsize len, replace_transform_type_t * replace_flags) { - gsize loop = 0; + gsize loop; gsize char_len; - char *tmp_str; - GString *tmp_string; if (len == (gsize) (-1)) len = strlen (from); - if (*replace_flags == REPLACE_T_NO_TRANSFORM) + if ((*replace_flags == REPLACE_T_NO_TRANSFORM) != 0) { g_string_append_len (dest_str, from, len); return; } - while (loop < len) + + for (loop = 0; loop < len; loop += char_len) { + GString *tmp_string = NULL; + char *tmp_str; + tmp_str = mc_search__get_one_symbol (NULL, from + loop, len - loop, NULL); char_len = strlen (tmp_str); - if (*replace_flags & REPLACE_T_UPP_TRANSFORM_CHAR) + + if ((*replace_flags & REPLACE_T_UPP_TRANSFORM_CHAR) != 0) { *replace_flags &= ~REPLACE_T_UPP_TRANSFORM_CHAR; tmp_string = mc_search__toupper_case_str (NULL, tmp_str, char_len); - g_string_append (dest_str, tmp_string->str); + g_string_append_len (dest_str, tmp_string->str, tmp_string->len); g_string_free (tmp_string, TRUE); - } - else if (*replace_flags & REPLACE_T_LOW_TRANSFORM_CHAR) + else if ((*replace_flags & REPLACE_T_LOW_TRANSFORM_CHAR) != 0) { *replace_flags &= ~REPLACE_T_LOW_TRANSFORM_CHAR; - tmp_string = mc_search__toupper_case_str (NULL, tmp_str, char_len); - g_string_append (dest_str, tmp_string->str); + tmp_string = mc_search__tolower_case_str (NULL, tmp_str, char_len); + g_string_append_len (dest_str, tmp_string->str, tmp_string->len); g_string_free (tmp_string, TRUE); - } - else if (*replace_flags & REPLACE_T_UPP_TRANSFORM) + else if ((*replace_flags & REPLACE_T_UPP_TRANSFORM) != 0) { tmp_string = mc_search__toupper_case_str (NULL, tmp_str, char_len); - g_string_append (dest_str, tmp_string->str); + g_string_append_len (dest_str, tmp_string->str, tmp_string->len); g_string_free (tmp_string, TRUE); - } - else if (*replace_flags & REPLACE_T_LOW_TRANSFORM) + else if ((*replace_flags & REPLACE_T_LOW_TRANSFORM) != 0) { tmp_string = mc_search__tolower_case_str (NULL, tmp_str, char_len); - g_string_append (dest_str, tmp_string->str); + g_string_append_len (dest_str, tmp_string->str, tmp_string->len); g_string_free (tmp_string, TRUE); - } else { - g_string_append (dest_str, tmp_str); + g_string_append_len (dest_str, tmp_str, tmp_string->len); } + g_free (tmp_str); - loop += char_len; } - } /* --------------------------------------------------------------------------------------------- */ @@ -806,28 +806,57 @@ g_string_set_size (lc_mc_search->regex_buffer, 0); lc_mc_search->start_buffer = current_pos; - while (TRUE) + if (lc_mc_search->search_fn != NULL) { - int current_chr = '\n'; /* stop search symbol */ + while (TRUE) + { + int current_chr = '\n'; /* stop search symbol */ - ret = mc_search__get_char (lc_mc_search, user_data, current_pos, ¤t_chr); - if (ret == MC_SEARCH_CB_ABORT) - break; + ret = lc_mc_search->search_fn (user_data, current_pos, ¤t_chr); - if (ret == MC_SEARCH_CB_INVALID) - continue; + if (ret == MC_SEARCH_CB_ABORT) + break; - current_pos++; + if (ret == MC_SEARCH_CB_INVALID) + continue; - if (ret == MC_SEARCH_CB_SKIP) - continue; + current_pos++; - virtual_pos++; + if (ret == MC_SEARCH_CB_SKIP) + continue; - g_string_append_c (lc_mc_search->regex_buffer, (char) current_chr); + virtual_pos++; - if ((char) current_chr == '\n' || virtual_pos > end_search) - break; + g_string_append_c (lc_mc_search->regex_buffer, (char) current_chr); + + if ((char) current_chr == '\n' || virtual_pos > end_search) + break; + } + } + else + { + /* optimization for standard case (for search from file manager) + * where there is no MC_SEARCH_CB_INVALID or MC_SEARCH_CB_SKIP + * return codes, so we can copy line at regex buffer all at once + */ + while (TRUE) + { + char current_chr; + + current_chr = ((char *) user_data)[current_pos]; + if (current_chr == '\0') + break; + + current_pos++; + + if (current_chr == '\n' || current_pos > end_search) + break; + } + + /* use virtual_pos as index of start of current chunk */ + g_string_append_len (lc_mc_search->regex_buffer, (char *) user_data + virtual_pos, + current_pos - virtual_pos); + virtual_pos = current_pos; } switch (mc_search__regex_found_cond (lc_mc_search, lc_mc_search->regex_buffer)) @@ -890,7 +919,7 @@ GString *ret; gchar *tmp_str; - int num_replace_tokens, lc_index; + int num_replace_tokens; gsize loop; gsize len = 0; gchar *prev_str; @@ -915,6 +944,8 @@ for (loop = 0; loop < replace_str->len - 1; loop++) { + int lc_index; + lc_index = mc_search_regex__process_replace_str (replace_str, loop, &len, &replace_flags); if (lc_index == REPLACE_PREPARE_T_NOTHING_SPECIAL) diff -Nru mc-4.8.10/lib/search/search.c mc-4.8.11/lib/search/search.c --- mc-4.8.10/lib/search/search.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/search/search.c 2013-10-15 09:52:41.000000000 +0000 @@ -116,40 +116,48 @@ static void mc_search__conditions_free (GPtrArray * array) { - gsize loop1; - - for (loop1 = 0; loop1 < array->len; loop1++) - { - mc_search_cond_t *lc_mc_search; - - lc_mc_search = (mc_search_cond_t *) g_ptr_array_index (array, loop1); - mc_search__cond_struct_free (lc_mc_search); - } + g_ptr_array_foreach (array, (GFunc) mc_search__cond_struct_free, NULL); g_ptr_array_free (array, TRUE); } /* --------------------------------------------------------------------------------------------- */ - /*** public functions ****************************************************************************/ +/* --------------------------------------------------------------------------------------------- */ +/* Init search descriptor. + * + * @param original pattern to search + * @param original_len length of #original or -1 if #original is NULL-terminated + * @param original_charset charset of #original. If NULL then cp_display will be used + * + * @return new mc_search_t object. Use #mc_search_free() to free it. + */ mc_search_t * -mc_search_new (const gchar * original, gsize str_len) +mc_search_new (const gchar * original, gsize original_len, const gchar * original_charset) { mc_search_t *lc_mc_search; if (original == NULL) return NULL; - if ((gssize) str_len == -1) + if ((gssize) original_len == -1) { - str_len = strlen (original); - if (str_len == 0) + original_len = strlen (original); + if (original_len == 0) return NULL; } - lc_mc_search = g_malloc0 (sizeof (mc_search_t)); - lc_mc_search->original = g_strndup (original, str_len); - lc_mc_search->original_len = str_len; + lc_mc_search = g_new0 (mc_search_t, 1); + lc_mc_search->original = g_strndup (original, original_len); + lc_mc_search->original_len = original_len; +#ifdef HAVE_CHARSET + lc_mc_search->original_charset = + g_strdup (original_charset != NULL + && *original_charset != '\0' ? original_charset : cp_display); +#else + (void) original_charset; +#endif + return lc_mc_search; } @@ -162,6 +170,9 @@ return; g_free (lc_mc_search->original); +#ifdef HAVE_CHARSET + g_free (lc_mc_search->original_charset); +#endif g_free (lc_mc_search->error_str); if (lc_mc_search->conditions != NULL) @@ -191,25 +202,27 @@ #ifdef HAVE_CHARSET if (lc_mc_search->is_all_charsets) { - gsize loop1, recoded_str_len; - gchar *buffer; + gsize loop1; for (loop1 = 0; loop1 < codepages->len; loop1++) { - const char *id = ((codepage_desc *) g_ptr_array_index (codepages, loop1))->id; + const char *id; + gsize recoded_str_len; + gchar *buffer; - if (!g_ascii_strcasecmp (id, cp_display)) + id = ((codepage_desc *) g_ptr_array_index (codepages, loop1))->id; + if (g_ascii_strcasecmp (id, lc_mc_search->original_charset) == 0) { g_ptr_array_add (ret, mc_search__cond_struct_new (lc_mc_search, lc_mc_search->original, lc_mc_search->original_len, - cp_display)); + lc_mc_search->original_charset)); continue; } buffer = mc_search__recode_str (lc_mc_search->original, lc_mc_search->original_len, - cp_display, id, &recoded_str_len); + lc_mc_search->original_charset, id, &recoded_str_len); g_ptr_array_add (ret, mc_search__cond_struct_new (lc_mc_search, buffer, @@ -220,9 +233,9 @@ else { g_ptr_array_add (ret, - mc_search__cond_struct_new (lc_mc_search, - lc_mc_search->original, - lc_mc_search->original_len, cp_display)); + mc_search__cond_struct_new (lc_mc_search, lc_mc_search->original, + lc_mc_search->original_len, + lc_mc_search->original_charset)); } #else g_ptr_array_add (ret, @@ -382,9 +395,19 @@ } /* --------------------------------------------------------------------------------------------- */ +/* Search specified pattern in specified string. + * + * @param pattern string to search + * @param pattern_charset charset of #pattern. If NULL then cp_display will be used + * @param str string where search #pattern + * @param search type (normal, regex, hex or glob) + * + * @return TRUE if found is successful, FALSE otherwise. + */ gboolean -mc_search (const gchar * pattern, const gchar * str, mc_search_type_t type) +mc_search (const gchar * pattern, const gchar * pattern_charset, const gchar * str, + mc_search_type_t type) { gboolean ret; mc_search_t *search; @@ -392,7 +415,7 @@ if (str == NULL) return FALSE; - search = mc_search_new (pattern, -1); + search = mc_search_new (pattern, -1, pattern_charset); if (search == NULL) return FALSE; diff -Nru mc-4.8.10/lib/search.h mc-4.8.11/lib/search.h --- mc-4.8.10/lib/search.h 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/search.h 2013-10-15 09:52:41.000000000 +0000 @@ -61,8 +61,10 @@ { /* public input data */ +#ifdef HAVE_CHARSET /* search in all charsets */ gboolean is_all_charsets; +#endif /* case sensitive search */ gboolean is_case_sensitive; @@ -108,6 +110,9 @@ /* original search string */ gchar *original; gsize original_len; +#ifdef HAVE_CHARSET + gchar *original_charset; +#endif /* error code after search */ mc_search_error_t error; @@ -124,7 +129,8 @@ /*** declarations of public functions ************************************************************/ -mc_search_t *mc_search_new (const gchar * original, gsize original_len); +mc_search_t *mc_search_new (const gchar * original, gsize original_len, + const gchar * original_charset); void mc_search_free (mc_search_t * lc_mc_search); @@ -144,7 +150,8 @@ gchar **mc_search_get_types_strings_array (size_t * num); -gboolean mc_search (const gchar *, const gchar *, mc_search_type_t); +gboolean mc_search (const gchar * pattern, const gchar * pattern_charset, const gchar * str, + mc_search_type_t type); int mc_search_getstart_result_by_num (mc_search_t *, int); int mc_search_getend_result_by_num (mc_search_t *, int); diff -Nru mc-4.8.10/lib/skin/Makefile.in mc-4.8.11/lib/skin/Makefile.in --- mc-4.8.10/lib/skin/Makefile.in 2013-08-02 18:56:42.000000000 +0000 +++ mc-4.8.11/lib/skin/Makefile.in 2013-11-29 18:45:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = lib/skin -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -163,6 +191,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -432,6 +477,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libmcskin.la: $(libmcskin_la_OBJECTS) $(libmcskin_la_DEPENDENCIES) $(EXTRA_libmcskin_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libmcskin_la_OBJECTS) $(libmcskin_la_LIBADD) $(LIBS) @@ -475,26 +521,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -506,15 +541,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -523,9 +554,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -678,9 +710,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -690,7 +722,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/lib/skin/colors-old.c mc-4.8.11/lib/skin/colors-old.c --- mc-4.8.10/lib/skin/colors-old.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/skin/colors-old.c 2013-10-15 09:45:12.000000000 +0000 @@ -148,11 +148,11 @@ if (the_color_string == NULL) return; - orig_colors = colors = g_strsplit (the_color_string, ":", -1); - if (colors == NULL) + orig_colors = g_strsplit (the_color_string, ":", -1); + if (orig_colors == NULL) return; - for (; *colors != NULL; colors++) + for (colors = orig_colors; *colors != NULL; colors++) { gchar **key_val; const gchar *skin_group, *skin_key; diff -Nru mc-4.8.10/lib/strutil/Makefile.in mc-4.8.11/lib/strutil/Makefile.in --- mc-4.8.10/lib/strutil/Makefile.in 2013-08-02 18:56:42.000000000 +0000 +++ mc-4.8.11/lib/strutil/Makefile.in 2013-11-29 18:45:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = lib/strutil -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -164,6 +192,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -434,6 +479,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libmcstrutil.la: $(libmcstrutil_la_OBJECTS) $(libmcstrutil_la_DEPENDENCIES) $(EXTRA_libmcstrutil_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libmcstrutil_la_OBJECTS) $(libmcstrutil_la_LIBADD) $(LIBS) @@ -479,26 +525,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -510,15 +545,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -527,9 +558,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -682,9 +714,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -694,7 +726,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/lib/strutil/strutil.c mc-4.8.11/lib/strutil/strutil.c --- mc-4.8.10/lib/strutil/strutil.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/strutil/strutil.c 2013-11-29 18:27:07.000000000 +0000 @@ -370,7 +370,7 @@ if (str_cnv_not_convert == INVALID_CONV) { g_free (codeset); - codeset = g_strdup ("ASCII"); + codeset = g_strdup (DEFAULT_CHARSET); str_cnv_not_convert = g_iconv_open (codeset, codeset); } } @@ -760,7 +760,6 @@ char *p, *tmp; char *q; char c = '\0'; - int width; *lines = 1; *columns = 0; @@ -770,6 +769,8 @@ while (TRUE) { + int width; + q = strchr (p, '\n'); if (q != NULL) { diff -Nru mc-4.8.10/lib/strutil/strutil8bit.c mc-4.8.11/lib/strutil/strutil8bit.c --- mc-4.8.10/lib/strutil/strutil8bit.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/strutil/strutil8bit.c 2013-11-29 18:27:07.000000000 +0000 @@ -348,7 +348,6 @@ static char result[BUF_MEDIUM]; size_t remain; char *actual; - size_t pos = 0; size_t length; length = strlen (text); @@ -357,9 +356,12 @@ if (width > 0) { + size_t pos; + if (width >= (int) length) { - for (; pos < length && remain > 1; pos++, actual++, remain--) + + for (pos = 0; pos < length && remain > 1; pos++, actual++, remain--) actual[0] = char_isprint (text[pos]) ? text[pos] : '.'; } else if (width <= 3) @@ -373,8 +375,7 @@ actual += 3; remain -= 3; - pos += length - width + 3; - for (; pos < length && remain > 1; pos++, actual++, remain--) + for (pos = length - width + 3; pos < length && remain > 1; pos++, actual++, remain--) actual[0] = char_isprint (text[pos]) ? text[pos] : '.'; } } @@ -408,7 +409,6 @@ static char result[BUF_MEDIUM]; size_t remain; char *actual; - size_t pos = 0; size_t length; actual = result; @@ -417,8 +417,10 @@ if (start < (int) length) { - pos += start; - for (; pos < length && width > 0 && remain > 1; pos++, width--, actual++, remain--) + size_t pos; + + for (pos = start; pos < length && width > 0 && remain > 1; + pos++, width--, actual++, remain--) actual[0] = char_isprint (text[pos]) ? text[pos] : '.'; } @@ -518,7 +520,6 @@ char *fold_text; char *fold_search; const char *match; - size_t offset; fold_text = (case_sen) ? (char *) text : str_8bit_strdown (text); fold_search = (case_sen) ? (char *) search : str_8bit_strdown (search); @@ -526,6 +527,8 @@ match = g_strstr_len (fold_text, -1, fold_search); if (match != NULL) { + size_t offset; + offset = match - fold_text; match = text + offset; } @@ -545,7 +548,6 @@ char *fold_text; char *fold_search; const char *match; - size_t offset; fold_text = (case_sen) ? (char *) text : str_8bit_strdown (text); fold_search = (case_sen) ? (char *) search : str_8bit_strdown (search); @@ -553,6 +555,8 @@ match = g_strrstr_len (fold_text, -1, fold_search); if (match != NULL) { + size_t offset; + offset = match - fold_text; match = text + offset; } diff -Nru mc-4.8.10/lib/strutil/strutilascii.c mc-4.8.11/lib/strutil/strutilascii.c --- mc-4.8.10/lib/strutil/strutilascii.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/strutil/strutilascii.c 2013-11-29 18:27:07.000000000 +0000 @@ -313,20 +313,20 @@ static char result[BUF_MEDIUM]; size_t remain; char *actual; - size_t pos = 0; size_t length; length = strlen (text); actual = result; remain = sizeof (result); - if (width > 0) { + size_t pos; + if (width >= (int) length) { /* copy all characters */ - for (; pos < length && remain > 1; pos++, actual++, remain--) + for (pos = 0; pos < length && remain > 1; pos++, actual++, remain--) { actual[0] = isascii ((unsigned char) text[pos]) ? text[pos] : '?'; actual[0] = g_ascii_isprint ((gchar) actual[0]) ? actual[0] : '.'; @@ -343,10 +343,8 @@ actual += 3; remain -= 3; - pos += length - width + 3; - /* copy suffix of text */ - for (; pos < length && remain > 1; pos++, actual++, remain--) + for (pos = length - width + 3; pos < length && remain > 1; pos++, actual++, remain--) { actual[0] = isascii ((unsigned char) text[pos]) ? text[pos] : '?'; actual[0] = g_ascii_isprint ((gchar) actual[0]) ? actual[0] : '.'; @@ -383,7 +381,6 @@ static char result[BUF_MEDIUM]; size_t remain; char *actual; - size_t pos = 0; size_t length; actual = result; @@ -392,11 +389,12 @@ if (start < (int) length) { - pos += start; + size_t pos; + /* copy at most width characters from text from start */ - for (; pos < length && width > 0 && remain > 1; pos++, width--, actual++, remain--) + for (pos = start; pos < length && width > 0 && remain > 1; + pos++, width--, actual++, remain--) { - actual[0] = isascii ((unsigned char) text[pos]) ? text[pos] : '?'; actual[0] = g_ascii_isprint ((gchar) actual[0]) ? actual[0] : '.'; } @@ -497,7 +495,6 @@ char *fold_text; char *fold_search; const char *match; - size_t offset; fold_text = (case_sen) ? (char *) text : g_ascii_strdown (text, -1); fold_search = (case_sen) ? (char *) search : g_ascii_strdown (search, -1); @@ -505,6 +502,8 @@ match = g_strstr_len (fold_text, -1, fold_search); if (match != NULL) { + size_t offset; + offset = match - fold_text; match = text + offset; } @@ -524,7 +523,6 @@ char *fold_text; char *fold_search; const char *match; - size_t offset; fold_text = (case_sen) ? (char *) text : g_ascii_strdown (text, -1); fold_search = (case_sen) ? (char *) search : g_ascii_strdown (search, -1); @@ -532,6 +530,8 @@ match = g_strrstr_len (fold_text, -1, fold_search); if (match != NULL) { + size_t offset; + offset = match - fold_text; match = text + offset; } diff -Nru mc-4.8.10/lib/strutil/strutilutf8.c mc-4.8.11/lib/strutil/strutilutf8.c --- mc-4.8.10/lib/strutil/strutilutf8.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/strutil/strutilutf8.c 2013-11-29 18:27:07.000000000 +0000 @@ -439,11 +439,12 @@ { static char result[BUF_MEDIUM * 6]; const struct term_form *pre_form; - char *composed; pre_form = str_utf8_make_make_term_form (text, (size_t) (-1)); if (pre_form->compose) { + char *composed; + composed = g_utf8_normalize (pre_form->text, -1, G_NORMALIZE_DEFAULT_COMPOSE); g_strlcpy (result, composed, sizeof (result)); g_free (composed); diff -Nru mc-4.8.10/lib/tty/Makefile.in mc-4.8.11/lib/tty/Makefile.in --- mc-4.8.10/lib/tty/Makefile.in 2013-08-02 18:56:42.000000000 +0000 +++ mc-4.8.11/lib/tty/Makefile.in 2013-11-29 18:45:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,9 +82,9 @@ @HAVE_GMODULE_TRUE@am__append_2 = $(GMODULE_CFLAGS) @HAVE_GMODULE_FALSE@am__append_3 = $(GLIB_CFLAGS) subdir = lib/tty -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -176,6 +204,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -448,6 +493,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libmctty.la: $(libmctty_la_OBJECTS) $(libmctty_la_DEPENDENCIES) $(EXTRA_libmctty_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libmctty_la_OBJECTS) $(libmctty_la_LIBADD) $(LIBS) @@ -497,26 +543,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -528,15 +563,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -545,9 +576,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -700,9 +732,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -712,7 +744,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/lib/tty/color-internal.c mc-4.8.11/lib/tty/color-internal.c --- mc-4.8.10/lib/tty/color-internal.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/tty/color-internal.c 2013-11-29 18:27:07.000000000 +0000 @@ -2,12 +2,12 @@ Internal stuff of color setup Copyright (C) 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2007, 2008, 2009, 2010, 2011 + 2007, 2008, 2009, 2010, 2011, 2013 The Free Software Foundation, Inc. Written by: Andrew Borodin , 2009 - Slava Zanko , 2009 + Slava Zanko , 2009, 2013 Egmont Koblinger , 2010 This file is part of the Midnight Commander. @@ -99,10 +99,13 @@ { int i; char dummy; + + /* cppcheck-suppress invalidscanf */ if (sscanf (color_name, "color%d%c", &i, &dummy) == 1 && i >= 0 && i < 256) { return i; } + /* cppcheck-suppress invalidscanf */ if (sscanf (color_name, "gray%d%c", &i, &dummy) == 1 && i >= 0 && i < 24) { return 232 + i; @@ -124,7 +127,6 @@ const char * tty_color_get_name_by_index (int idx) { - static char **color_N_names = NULL; int i; /* Find the real English name of the first 16 colors, */ @@ -135,6 +137,8 @@ /* Create and return the strings "color16" to "color255". */ if (idx >= 16 && idx < 256) { + static char **color_N_names = NULL; + if (color_N_names == NULL) { color_N_names = g_try_malloc0 (240 * sizeof (char *)); @@ -154,10 +158,10 @@ int tty_color_get_index_by_name (const char *color_name) { - if (color_name != NULL) { size_t i; + for (i = 0; color_table[i].name != NULL; i++) if (strcmp (color_name, color_table[i].name) == 0) return color_table[i].value; @@ -172,14 +176,18 @@ tty_attr_get_bits (const char *attrs) { int attr_bits = 0; - gchar **attr_list; - int i, j; if (attrs != NULL) { + gchar **attr_list; + int i; + attr_list = g_strsplit (attrs, "+", -1); + for (i = 0; attr_list[i] != NULL; i++) { + int j; + for (j = 0; attributes_table[j].name != NULL; j++) { if (strcmp (attr_list[i], attributes_table[j].name) == 0) diff -Nru mc-4.8.10/lib/tty/color-slang.c mc-4.8.11/lib/tty/color-slang.c --- mc-4.8.10/lib/tty/color-slang.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/tty/color-slang.c 2013-11-29 18:27:07.000000000 +0000 @@ -65,18 +65,17 @@ { const char *terminal = getenv ("TERM"); const size_t len = strlen (terminal); - char *cts = mc_global.tty.color_terminal_string; - char *s; - size_t i; /* check mc_global.tty.color_terminal_string */ while (*cts != '\0') { + char *s; + size_t i = 0; + while (*cts == ' ' || *cts == '\t') cts++; s = cts; - i = 0; while (*cts != '\0' && *cts != ',') { @@ -145,7 +144,6 @@ void tty_color_try_alloc_pair_lib (tty_color_pair_t * mc_color_pair) { - const char *fg, *bg; if (mc_color_pair->ifg <= (int) SPEC_A_REVERSE) { switch (mc_color_pair->ifg) @@ -172,6 +170,8 @@ } else { + const char *fg, *bg; + fg = tty_color_get_name_by_index (mc_color_pair->ifg); bg = tty_color_get_name_by_index (mc_color_pair->ibg); SLtt_set_color (mc_color_pair->pair_index, (char *) "", (char *) fg, (char *) bg); diff -Nru mc-4.8.10/lib/tty/color.c mc-4.8.11/lib/tty/color.c --- mc-4.8.10/lib/tty/color.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/tty/color.c 2013-10-15 09:52:41.000000000 +0000 @@ -236,9 +236,9 @@ g_free (tty_color_defaults__bg); g_free (tty_color_defaults__attrs); - tty_color_defaults__fg = (fgcolor != NULL) ? g_strdup (fgcolor) : NULL; - tty_color_defaults__bg = (bgcolor != NULL) ? g_strdup (bgcolor) : NULL; - tty_color_defaults__attrs = (attrs != NULL) ? g_strdup (attrs) : NULL; + tty_color_defaults__fg = g_strdup (fgcolor); + tty_color_defaults__bg = g_strdup (bgcolor); + tty_color_defaults__attrs = g_strdup (attrs); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.10/lib/tty/key.c mc-4.8.11/lib/tty/key.c --- mc-4.8.10/lib/tty/key.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/tty/key.c 2013-11-29 18:27:07.000000000 +0000 @@ -12,6 +12,7 @@ Norbert Warmuth, 1997 Denys Vlasenko , 2013 Slava Zanko , 2013 + Egmont Koblinger , 2013 This file is part of the Midnight Commander. @@ -92,6 +93,8 @@ int old_esc_mode_timeout = 1000000; /* settable via env */ int use_8th_bit_as_meta = 0; +gboolean bracketed_pasting_in_progress = FALSE; + /* This table is a mapping between names and the constants we use * We use this to allow users to define alternate definitions for * certain keys that may be missing from the terminal database @@ -275,6 +278,8 @@ static key_define_t mc_default_keys[] = { {ESC_CHAR, ESC_STR, MCKEY_ESCAPE}, {ESC_CHAR, ESC_STR ESC_STR, MCKEY_NOACTION}, + {MCKEY_BRACKETED_PASTING_START, ESC_STR "[200~", MCKEY_NOACTION}, + {MCKEY_BRACKETED_PASTING_END, ESC_STR "[201~", MCKEY_NOACTION}, {0, NULL, MCKEY_NOACTION}, }; @@ -326,6 +331,7 @@ {KEY_M_SHIFT | KEY_M_CTRL | KEY_DOWN, ESC_STR "[1;6B", MCKEY_NOACTION}, {KEY_M_SHIFT | KEY_M_CTRL | KEY_RIGHT, ESC_STR "[1;6C", MCKEY_NOACTION}, {KEY_M_SHIFT | KEY_M_CTRL | KEY_LEFT, ESC_STR "[1;6D", MCKEY_NOACTION}, + {KEY_M_SHIFT | '\t', ESC_STR "[Z", MCKEY_NOACTION}, /* putty */ {KEY_M_SHIFT | KEY_M_CTRL | KEY_UP, ESC_STR "[[1;6A", MCKEY_NOACTION}, @@ -600,17 +606,16 @@ { struct timeval time_out; static fd_set select_set; - struct timeval *timeptr; - int v; - int maxfdp; while (1) { + struct timeval *timeptr = NULL; + int maxfdp, v; + FD_ZERO (&select_set); FD_SET (input_fd, &select_set); /* Add stdin */ maxfdp = max (add_selects (&select_set), input_fd); - timeptr = NULL; if (set_timeout) { time_out.tv_sec = 0; @@ -861,7 +866,7 @@ { int result = 0; #ifdef __QNXNTO__ - int mod_status, shift_ext_status; + int mod_status; static int in_photon = 0; static int ph_ig = 0; PhCursorInfo_t cursor_info; @@ -916,6 +921,8 @@ console or xterm */ if (in_photon == -1) { + int shift_ext_status; + if (devctl (fileno (stdin), DCMD_CHR_LINESTATUS, &mod_status, sizeof (int), NULL) == -1) return 0; shift_ext_status = mod_status & 0xffffff00UL; @@ -1008,18 +1015,11 @@ if (c == KEY_SCANCEL) c = '\t'; - /* Convert Shift+Tab and Ctrl+Tab to Back Tab - * only if modifiers directly from X11 - */ -#ifdef HAVE_TEXTMODE_X11_SUPPORT - if (x11_window != 0) -#endif /* HAVE_TEXTMODE_X11_SUPPORT */ + /* Convert Back Tab to Shift+Tab */ + if (c == KEY_BTAB) { - if ((c == '\t') && (mod & (KEY_M_SHIFT | KEY_M_CTRL))) - { - c = KEY_BTAB; - mod = 0; - } + c = '\t'; + mod = KEY_M_SHIFT; } /* F0 is the same as F10 for out purposes */ @@ -1472,10 +1472,10 @@ return 0; name = g_strstrip (g_strdup (name)); - p = lc_keys = g_strsplit_set (name, "-+ ", -1); + lc_keys = g_strsplit_set (name, "-+ ", -1); g_free ((char *) name); - while ((p != NULL) && (*p != NULL)) + for (p = lc_keys; p != NULL && *p != NULL; p++) { if ((*p)[0] != '\0') { @@ -1496,8 +1496,6 @@ break; } } - - p++; } g_strfreev (lc_keys); @@ -1506,7 +1504,6 @@ if (k <= 0) return 0; - if (label != NULL) { GString *s; @@ -1581,9 +1578,6 @@ /* modifier */ unsigned int mod = keycode & KEY_M_MASK; - int use_meta = -1; - int use_ctrl = -1; - int use_shift = -1; int key_idx = -1; GString *s; @@ -1597,8 +1591,7 @@ { if (lookup_keycode (KEY_M_ALT, &idx)) { - use_meta = idx; - g_string_append (s, key_conv_tab_sorted[use_meta]->name); + g_string_append (s, key_conv_tab_sorted[idx]->name); g_string_append_c (s, '-'); } } @@ -1610,8 +1603,7 @@ if (lookup_keycode (KEY_M_CTRL, &idx)) { - use_ctrl = idx; - g_string_append (s, key_conv_tab_sorted[use_ctrl]->name); + g_string_append (s, key_conv_tab_sorted[idx]->name); g_string_append_c (s, '-'); } } @@ -1619,12 +1611,11 @@ { if (lookup_keycode (KEY_M_ALT, &idx)) { - use_shift = idx; if (k < 127) g_string_append_c (s, (gchar) g_ascii_toupper ((gchar) k)); else { - g_string_append (s, key_conv_tab_sorted[use_shift]->name); + g_string_append (s, key_conv_tab_sorted[idx]->name); g_string_append_c (s, '-'); g_string_append (s, key_conv_tab_sorted[key_idx]->name); } @@ -1955,7 +1946,6 @@ tty_get_event (struct Gpm_Event *event, gboolean redo_event, gboolean block) { int c; - static int flag = 0; /* Return value from select */ #ifdef HAVE_LIBGPM static struct Gpm_Event ev; /* Mouse event */ #endif @@ -1988,6 +1978,7 @@ while (pending_keys == NULL) { int nfd; + static int flag = 0; /* Return value from select */ fd_set select_set; FD_ZERO (&select_set); @@ -2145,7 +2136,17 @@ { /* Mouse event */ xmouse_get_event (event, c == MCKEY_EXTENDED_MOUSE); - return (event->type != 0) ? EV_MOUSE : EV_NONE; + c = (event->type != 0) ? EV_MOUSE : EV_NONE; + } + else if (c == MCKEY_BRACKETED_PASTING_START) + { + bracketed_pasting_in_progress = TRUE; + c = EV_NONE; + } + else if (c == MCKEY_BRACKETED_PASTING_END) + { + bracketed_pasting_in_progress = FALSE; + c = EV_NONE; } return c; @@ -2250,3 +2251,22 @@ } /* --------------------------------------------------------------------------------------------- */ + +void +enable_bracketed_paste (void) +{ + printf (ESC_STR "[?2004h"); + fflush (stdout); +} + +/* --------------------------------------------------------------------------------------------- */ + +void +disable_bracketed_paste (void) +{ + printf (ESC_STR "[?2004l"); + fflush (stdout); + bracketed_pasting_in_progress = FALSE; +} + +/* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.10/lib/tty/key.h mc-4.8.11/lib/tty/key.h --- mc-4.8.10/lib/tty/key.h 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/tty/key.h 2013-10-15 09:52:41.000000000 +0000 @@ -36,6 +36,10 @@ /* Return code for the extended mouse sequence */ #define MCKEY_EXTENDED_MOUSE -3 +/* Return code for brackets of bracketed paste mode */ +#define MCKEY_BRACKETED_PASTING_START -4 +#define MCKEY_BRACKETED_PASTING_END -5 + /*** enums ***************************************************************************************/ /*** structures declarations (and typedefs of structures)*****************************************/ @@ -61,6 +65,8 @@ extern int use_8th_bit_as_meta; extern int mou_auto_repeat; +extern gboolean bracketed_pasting_in_progress; + /*** declarations of public functions ************************************************************/ gboolean define_sequence (int code, const char *seq, int action); @@ -101,6 +107,10 @@ void numeric_keypad_mode (void); void application_keypad_mode (void); +/* Bracketed paste mode */ +void enable_bracketed_paste (void); +void disable_bracketed_paste (void); + /*** inline functions ****************************************************************************/ static inline gboolean diff -Nru mc-4.8.10/lib/tty/keyxdef.c mc-4.8.11/lib/tty/keyxdef.c --- mc-4.8.10/lib/tty/keyxdef.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/tty/keyxdef.c 2013-11-29 18:27:07.000000000 +0000 @@ -415,7 +415,7 @@ if (!_qnx_keys_defined) { - int idx, str_idx; + int idx; int term_setup_ok; __setupterm (NULL, fileno (stdout), &term_setup_ok); @@ -424,7 +424,8 @@ for (idx = 0; idx < sizeof (xtra_key_defines) / sizeof (xtra_key_defines[0]); idx++) { - str_idx = xtra_key_defines[idx].str_idx; + int str_idx = xtra_key_defines[idx].str_idx; + if (__QTISOFFS (str_idx)) { if (*__QTISSTR (str_idx)) diff -Nru mc-4.8.10/lib/tty/tty-ncurses.c mc-4.8.11/lib/tty/tty-ncurses.c --- mc-4.8.10/lib/tty/tty-ncurses.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/tty/tty-ncurses.c 2013-11-29 18:27:07.000000000 +0000 @@ -92,11 +92,12 @@ { #if (NCURSES_VERSION_MAJOR >= 4) && defined (SIGWINCH) struct sigaction act, oact; + + memset (&act, 0, sizeof (act)); act.sa_handler = handler; sigemptyset (&act.sa_mask); - act.sa_flags = 0; #ifdef SA_RESTART - act.sa_flags |= SA_RESTART; + act.sa_flags = SA_RESTART; #endif /* SA_RESTART */ sigaction (SIGWINCH, &act, &oact); #endif /* SIGWINCH */ @@ -218,6 +219,7 @@ tty_shutdown (void) { disable_mouse (); + disable_bracketed_paste (); tty_reset_shell_mode (); tty_noraw_mode (); tty_keypad (FALSE); @@ -525,8 +527,6 @@ void tty_print_anychar (int c) { - unsigned char str[6 + 1]; - if (mc_global.utf8_display || c > 255) { int res; @@ -540,6 +540,7 @@ } else { + unsigned char str[UTF8_CHAR_LEN + 1]; const char *s; str[res] = '\0'; diff -Nru mc-4.8.10/lib/tty/tty-slang.c mc-4.8.11/lib/tty/tty-slang.c --- mc-4.8.10/lib/tty/tty-slang.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/tty/tty-slang.c 2013-11-29 18:27:07.000000000 +0000 @@ -61,10 +61,6 @@ /*** file scope macro definitions ****************************************************************/ -#ifndef SA_RESTART -#define SA_RESTART 0 -#endif - #ifndef SLTT_MAX_SCREEN_COLS #define SLTT_MAX_SCREEN_COLS 512 #endif @@ -172,12 +168,13 @@ slang_reset_softkeys (void) { int key; - char *send; static const char display[] = " "; char tmp[BUF_SMALL]; for (key = 1; key < 9; key++) { + char *send; + g_snprintf (tmp, sizeof (tmp), "k%d", key); send = (char *) SLtt_tgetstr (tmp); if (send != NULL) @@ -347,6 +344,7 @@ char *op_cap; disable_mouse (); + disable_bracketed_paste (); tty_reset_shell_mode (); tty_noraw_mode (); tty_keypad (FALSE); @@ -675,11 +673,12 @@ void tty_print_anychar (int c) { - char str[6 + 1]; - if (c > 255) { - int res = g_unichar_to_utf8 (c, str); + char str[UTF8_CHAR_LEN + 1]; + int res; + + res = g_unichar_to_utf8 (c, str); if (res == 0) { str[0] = '.'; diff -Nru mc-4.8.10/lib/tty/tty.c mc-4.8.11/lib/tty/tty.c --- mc-4.8.10/lib/tty/tty.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/tty/tty.c 2013-11-29 18:27:07.000000000 +0000 @@ -33,6 +33,7 @@ #include #include #include +#include /* memset() */ #include /* exit() */ #ifdef HAVE_SYS_IOCTL_H @@ -118,9 +119,12 @@ { struct sigaction act; + memset (&act, 0, sizeof (act)); act.sa_handler = sigintr_handler; sigemptyset (&act.sa_mask); +#ifdef SA_RESTART act.sa_flags = SA_RESTART; +#endif /* SA_RESTART */ sigaction (SIGINT, &act, NULL); } @@ -131,9 +135,9 @@ { struct sigaction act; + memset (&act, 0, sizeof (act)); act.sa_handler = sigintr_handler; sigemptyset (&act.sa_mask); - act.sa_flags = 0; sigaction (SIGINT, &act, NULL); got_interrupt = 0; } @@ -145,9 +149,9 @@ { struct sigaction act; + memset (&act, 0, sizeof (act)); act.sa_handler = SIG_IGN; sigemptyset (&act.sa_mask); - act.sa_flags = 0; sigaction (SIGINT, &act, NULL); } diff -Nru mc-4.8.10/lib/tty/x11conn.c mc-4.8.11/lib/tty/x11conn.c --- mc-4.8.10/lib/tty/x11conn.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/tty/x11conn.c 2013-11-29 18:27:07.000000000 +0000 @@ -179,14 +179,18 @@ Display * mc_XOpenDisplay (const char *displayname) { - Display *retval; - if (x11_available ()) { if (setjmp (x11_exception) == 0) { + Display *retval; + + /* cppcheck-suppress redundantAssignment */ longjmp_allowed = TRUE; + retval = func_XOpenDisplay (displayname); + + /* cppcheck-suppress redundantAssignment */ longjmp_allowed = FALSE; return retval; } @@ -199,15 +203,20 @@ int mc_XCloseDisplay (Display * display) { - int retval; - if (x11_available ()) { if (setjmp (x11_exception) == 0) { + int retval; + + /* cppcheck-suppress redundantAssignment */ longjmp_allowed = TRUE; + retval = func_XCloseDisplay (display); + + /* cppcheck-suppress redundantAssignment */ longjmp_allowed = FALSE; + return retval; } } @@ -227,11 +236,16 @@ { if (setjmp (x11_exception) == 0) { + /* cppcheck-suppress redundantAssignment */ longjmp_allowed = TRUE; + retval = func_XQueryPointer (display, win, root_return, child_return, root_x_return, root_y_return, win_x_return, win_y_return, mask_return); + + /* cppcheck-suppress redundantAssignment */ longjmp_allowed = FALSE; + return retval; } } diff -Nru mc-4.8.10/lib/unixcompat.h mc-4.8.11/lib/unixcompat.h --- mc-4.8.10/lib/unixcompat.h 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/unixcompat.h 2013-11-29 18:27:07.000000000 +0000 @@ -12,11 +12,11 @@ #define MC_UNIXCOMPAT_H #include /* BSD */ -#ifdef HAVE_SYS_MKDEV_H -#include /* Solaris 9 */ -#endif -#if defined(_AIX) && defined(HAVE_SYS_SYSMACROS_H) -#include /* AIX */ + +#if MAJOR_IN_MKDEV +#include +#elif MAJOR_IN_SYSMACROS +#include #endif #if defined(_AIX) diff -Nru mc-4.8.10/lib/util.c mc-4.8.11/lib/util.c --- mc-4.8.10/lib/util.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/util.c 2013-11-29 18:27:07.000000000 +0000 @@ -207,7 +207,10 @@ ret1 = FALSE; { int ret2; + + /* cppcheck-suppress redundantAssignment */ ret2 = fflush (backup_fd); + /* cppcheck-suppress redundantAssignment */ ret2 = fclose (backup_fd); (void) ret2; } diff -Nru mc-4.8.10/lib/util.h mc-4.8.11/lib/util.h --- mc-4.8.10/lib/util.h 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/util.h 2013-10-15 09:52:41.000000000 +0000 @@ -69,7 +69,7 @@ unsigned int stale_link:1; /* If this is a symlink and points to Charon's land */ unsigned int dir_size_computed:1; /* Size of directory was computed with dirsizes_cmd */ } f; -} file_entry; +} file_entry_t; /*** global variables defined in .c file *********************************************************/ diff -Nru mc-4.8.10/lib/utilunix.c mc-4.8.11/lib/utilunix.c --- mc-4.8.10/lib/utilunix.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/utilunix.c 2013-11-29 18:27:07.000000000 +0000 @@ -180,9 +180,9 @@ { struct sigaction ignore; + memset (&ignore, 0, sizeof (ignore)); ignore.sa_handler = SIG_IGN; sigemptyset (&ignore.sa_mask); - ignore.sa_flags = 0; sigaction (SIGINT, &ignore, &sigactions->intr); sigaction (SIGQUIT, &ignore, &sigactions->quit); @@ -240,7 +240,6 @@ get_owner (int uid) { struct passwd *pwd; - static char ibuf[10]; char *name; static int uid_last; @@ -256,6 +255,8 @@ } else { + static char ibuf[10]; + g_snprintf (ibuf, sizeof (ibuf), "%d", uid); return ibuf; } @@ -267,7 +268,6 @@ get_group (int gid) { struct group *grp; - static char gbuf[10]; char *name; static int gid_last; @@ -283,6 +283,8 @@ } else { + static char gbuf[10]; + g_snprintf (gbuf, sizeof (gbuf), "%d", gid); return gbuf; } @@ -463,7 +465,6 @@ { struct passwd *passwd; const char *p, *q; - char *name; if (*directory != '~') return g_strdup (directory); @@ -485,6 +486,8 @@ } else { + char *name; + name = g_strndup (p, q - p); passwd = getpwnam (name); q++; @@ -624,7 +627,6 @@ custom_canonicalize_pathname (char *path, CANON_PATH_FLAGS flags) { char *p, *s; - size_t len; char *lpath = path; /* path without leading UNC part */ const size_t url_delim_len = strlen (VFS_PATH_URL_DELIMITER); @@ -672,6 +674,8 @@ if (flags & CANON_PATH_REMSLASHDOTS) { + size_t len; + /* Remove trailing slashes */ p = lpath + strlen (lpath) - 1; while (p > lpath && *p == PATH_SEP) @@ -844,7 +848,7 @@ while (p >= lpath && *p != PATH_SEP) p--; - if (p != NULL) + if (p >= lpath) continue; } #endif /* HAVE_CHARSET */ @@ -856,7 +860,6 @@ else s[-1] = '\0'; } - break; } break; diff -Nru mc-4.8.10/lib/vfs/Makefile.in mc-4.8.11/lib/vfs/Makefile.in --- mc-4.8.10/lib/vfs/Makefile.in 2013-08-02 18:56:43.000000000 +0000 +++ mc-4.8.11/lib/vfs/Makefile.in 2013-11-29 18:45:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,9 +80,9 @@ host_triplet = @host@ @ENABLE_VFS_NET_TRUE@am__append_1 = netutil.c netutil.h subdir = lib/vfs -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -168,6 +196,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -432,6 +477,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libmcvfs.la: $(libmcvfs_la_OBJECTS) $(libmcvfs_la_DEPENDENCIES) $(EXTRA_libmcvfs_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libmcvfs_la_OBJECTS) $(libmcvfs_la_LIBADD) $(LIBS) @@ -477,26 +523,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -508,15 +543,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -525,9 +556,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -680,9 +712,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -692,7 +724,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/lib/vfs/direntry.c mc-4.8.11/lib/vfs/direntry.c --- mc-4.8.10/lib/vfs/direntry.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/vfs/direntry.c 2013-11-29 18:27:07.000000000 +0000 @@ -245,7 +245,6 @@ { struct vfs_s_entry *ent = NULL; char *const path = g_strdup (a_path); - struct vfs_s_entry *retval = NULL; GList *iter; if (root->super->root != root) @@ -262,11 +261,11 @@ dirname = g_path_get_dirname (path); name = g_path_get_basename (path); ino = vfs_s_find_inode (me, root->super, dirname, follow, flags | FL_DIR); - retval = vfs_s_find_entry_tree (me, ino, name, follow, flags); + ent = vfs_s_find_entry_tree (me, ino, name, follow, flags); g_free (dirname); g_free (name); g_free (path); - return retval; + return ent; } iter = g_list_find_custom (root->subdir, path, (GCompareFunc) vfs_s_entry_compare); @@ -1238,7 +1237,6 @@ char *dirname, *name; struct vfs_s_entry *ent; struct vfs_s_inode *dir; - int tmp_handle; /* If the filesystem is read-only, disable file creation */ if (!(flags & O_CREAT) || !(path_element->class->write)) @@ -1258,6 +1256,7 @@ vfs_s_insert_entry (path_element->class, dir, ent); if ((VFSDATA (path_element)->flags & VFS_S_USETMP) != 0) { + int tmp_handle; vfs_path_t *tmp_vpath; tmp_handle = vfs_mkstemps (&tmp_vpath, path_element->class->name, name); @@ -1547,7 +1546,6 @@ int vfs_s_get_line_interruptible (struct vfs_class *me, char *buffer, int size, int fd) { - int n; int i; (void) me; @@ -1555,6 +1553,8 @@ tty_enable_interrupt_key (); for (i = 0; i < size - 1; i++) { + int n; + n = read (fd, buffer + i, 1); tty_disable_interrupt_key (); if (n == -1 && errno == EINTR) diff -Nru mc-4.8.10/lib/vfs/interface.c mc-4.8.11/lib/vfs/interface.c --- mc-4.8.10/lib/vfs/interface.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/vfs/interface.c 2013-11-29 18:27:07.000000000 +0000 @@ -80,7 +80,7 @@ mc_def_getlocalcopy (const vfs_path_t * filename_vpath) { vfs_path_t *tmp_vpath = NULL; - int fdin = -1, fdout = -1; + int fdin, fdout = -1; ssize_t i; char buffer[BUF_1K * 8]; struct stat mystat; diff -Nru mc-4.8.10/lib/vfs/netutil.c mc-4.8.11/lib/vfs/netutil.c --- mc-4.8.10/lib/vfs/netutil.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/vfs/netutil.c 2013-11-29 18:27:07.000000000 +0000 @@ -29,6 +29,7 @@ #include #include +#include /* memset() */ #include "lib/global.h" @@ -68,8 +69,8 @@ return; got_sigpipe = 0; + memset (&sa, 0, sizeof (sa)); sa.sa_handler = sig_pipe; - sa.sa_flags = 0; sigemptyset (&sa.sa_mask); sigaction (SIGPIPE, &sa, NULL); diff -Nru mc-4.8.10/lib/vfs/parse_ls_vga.c mc-4.8.11/lib/vfs/parse_ls_vga.c --- mc-4.8.10/lib/vfs/parse_ls_vga.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/vfs/parse_ls_vga.c 2013-11-29 18:27:07.000000000 +0000 @@ -213,6 +213,7 @@ if (strlen (str) != 4) return 0; + /* cppcheck-suppress invalidscanf */ if (sscanf (str, "%ld", &year) != 1) return 0; @@ -570,6 +571,7 @@ { p[2] = p[5] = '-'; + /* cppcheck-suppress invalidscanf */ if (sscanf (p, "%2d-%2d-%d", &d[0], &d[1], &d[2]) == 3) { /* Months are zero based */ @@ -755,14 +757,17 @@ /* Corner case: there is no whitespace(s) between maj & min */ if (!is_num (idx2) && idx2 == 2) { + /* cppcheck-suppress invalidscanf */ if (!is_num (++idx2) || sscanf (columns[idx2], " %d,%d", &maj, &min) != 2) goto error; } else { + /* cppcheck-suppress invalidscanf */ if (!is_num (idx2) || sscanf (columns[idx2], " %d,", &maj) != 1) goto error; + /* cppcheck-suppress invalidscanf */ if (!is_num (++idx2) || sscanf (columns[idx2], " %d", &min) != 1) goto error; } diff -Nru mc-4.8.10/lib/vfs/path.c mc-4.8.11/lib/vfs/path.c --- mc-4.8.10/lib/vfs/path.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/vfs/path.c 2013-11-29 18:27:07.000000000 +0000 @@ -239,7 +239,7 @@ { char *pcopy; const char *pend; - char *colon, *inner_colon, *at, *rest; + char *colon, *at, *rest; path_element->port = 0; @@ -254,6 +254,8 @@ rest = pcopy; else { + char *inner_colon; + *at = '\0'; inner_colon = strchr (pcopy, ':'); if (inner_colon != NULL) @@ -290,6 +292,7 @@ if (colon != NULL) { *colon = '\0'; + /* cppcheck-suppress invalidscanf */ if (sscanf (colon + 1, "%d", &path_element->port) == 1) { if (path_element->port <= 0 || path_element->port >= 65536) @@ -443,7 +446,6 @@ { char *vfs_prefix_start; char *real_vfs_prefix_start = url_delimiter; - char *slash_pointer; struct vfs_s_subclass *sub = NULL; while (real_vfs_prefix_start > path && *(real_vfs_prefix_start) != PATH_SEP) @@ -463,6 +465,8 @@ sub = VFSDATA (element); if (sub != NULL && (sub->flags & VFS_S_REMOTE) != 0) { + char *slash_pointer; + slash_pointer = strchr (url_delimiter, PATH_SEP); if (slash_pointer == NULL) { @@ -739,7 +743,7 @@ else vpath = vfs_path_from_str_uri_parser (path, flags); - vpath->str = vfs_path_to_str_flags (vpath, 0, VPF_NONE); + vpath->str = vfs_path_to_str_flags (vpath, 0, flags); g_free (path); return vpath; @@ -1338,19 +1342,22 @@ for (element_index = 0; element_index < vfs_path_elements_count (vpath); element_index++) { const vfs_path_element_t *element; - char **path_tokens, **iterator; + const char *token, *prev_token; element = vfs_path_get_by_index (vpath, element_index); - path_tokens = iterator = g_strsplit (element->path, PATH_SEP_STR, -1); - while (*iterator != NULL) + for (prev_token = element->path; (token = strchr (prev_token, PATH_SEP)) != NULL; + prev_token = token + 1) { - if (**iterator != '\0') + /* skip empty substring */ + if (token != prev_token) count_tokens++; - iterator++; } - g_strfreev (path_tokens); + + if (*prev_token != '\0') + count_tokens++; } + return count_tokens; } @@ -1405,9 +1412,9 @@ g_string_assign (element_tokens, ""); element = vfs_path_get_by_index (vpath, element_index); - path_tokens = iterator = g_strsplit (element->path, PATH_SEP_STR, -1); + path_tokens = g_strsplit (element->path, PATH_SEP_STR, -1); - while (*iterator != NULL) + for (iterator = path_tokens; *iterator != NULL; iterator++) { if (**iterator != '\0') { @@ -1428,7 +1435,6 @@ else start_position--; } - iterator++; } g_strfreev (path_tokens); vfs_path_tokens_add_class_info (element, ret_tokens, element_tokens); diff -Nru mc-4.8.10/lib/vfs/utilvfs.c mc-4.8.11/lib/vfs/utilvfs.c --- mc-4.8.10/lib/vfs/utilvfs.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/vfs/utilvfs.c 2013-11-29 18:27:07.000000000 +0000 @@ -2,7 +2,7 @@ Utilities for VFS modules. Copyright (C) 1988, 1992, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2011 + 2005, 2006, 2007, 2011, 2013 The Free Software Foundation, Inc. Copyright (C) 1995, 1996 Miguel de Icaza @@ -60,11 +60,13 @@ #define TGNMLEN 256 #endif -#define myuid ( my_uid < 0? (my_uid = getuid()): my_uid ) -#define mygid ( my_gid < 0? (my_gid = getgid()): my_gid ) - #define MC_HISTORY_VFS_PASSWORD "mc.vfs.password" +/* + * FIXME2, the "-993" is to reduce the chance of a hit on the first lookup. + */ +#define GUID_DEFAULT_CONST -993 + /*** file scope type declarations ****************************************************************/ /*** file scope variables ************************************************************************/ @@ -96,7 +98,6 @@ /** * Look up a user or group name from a uid/gid, maintaining a cache. * FIXME, for now it's a one-entry cache. - * FIXME2, the "-993" is to reduce the chance of a hit on the first lookup. * This file should be modified for non-unix systems to do something * reasonable. */ @@ -106,15 +107,14 @@ int vfs_finduid (const char *uname) { - static int saveuid = -993; - static char saveuname[TUNMLEN]; - static int my_uid = -993; - - struct passwd *pw; + static int saveuid = GUID_DEFAULT_CONST; + static char saveuname[TUNMLEN] = "\0"; if (uname[0] != saveuname[0] /* Quick test w/o proc call */ || 0 != strncmp (uname, saveuname, TUNMLEN)) { + struct passwd *pw; + g_strlcpy (saveuname, uname, TUNMLEN); pw = getpwnam (uname); if (pw) @@ -123,7 +123,12 @@ } else { - saveuid = myuid; + static int my_uid = GUID_DEFAULT_CONST; + + if (my_uid < 0) + my_uid = getuid (); + + saveuid = my_uid; } } return saveuid; @@ -134,15 +139,15 @@ int vfs_findgid (const char *gname) { - static int savegid = -993; - static char savegname[TGNMLEN]; - static int my_gid = -993; + static int savegid = GUID_DEFAULT_CONST; + static char savegname[TGNMLEN] = "\0"; - struct group *gr; if (gname[0] != savegname[0] /* Quick test w/o proc call */ || 0 != strncmp (gname, savegname, TUNMLEN)) { + struct group *gr; + g_strlcpy (savegname, gname, TUNMLEN); gr = getgrnam (gname); if (gr) @@ -151,7 +156,12 @@ } else { - savegid = mygid; + static int my_gid = GUID_DEFAULT_CONST; + + if (my_gid < 0) + my_gid = getgid (); + + savegid = my_gid; } } return savegid; @@ -232,7 +242,7 @@ char *pcopy; size_t pcopy_len; const char *pend; - char *dir, *colon, *inner_colon, *at, *rest; + char *dir, *colon, *at, *rest; path_element = g_new0 (vfs_path_element_t, 1); path_element->port = default_port; @@ -264,6 +274,8 @@ rest = pcopy; else { + char *inner_colon; + *at = '\0'; inner_colon = strchr (pcopy, ':'); if (inner_colon != NULL) @@ -307,6 +319,7 @@ if (colon != NULL) { *colon = '\0'; + /* cppcheck-suppress invalidscanf */ if (sscanf (colon + 1, "%d", &path_element->port) == 1) { if (path_element->port <= 0 || path_element->port >= 65536) diff -Nru mc-4.8.10/lib/vfs/vfs.c mc-4.8.11/lib/vfs/vfs.c --- mc-4.8.10/lib/vfs/vfs.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/vfs/vfs.c 2013-11-29 18:27:07.000000000 +0000 @@ -113,7 +113,6 @@ estr_t state = ESTR_SUCCESS; #ifdef HAVE_CHARSET const char *semi; - const char *slash; if (size == 0) return ESTR_SUCCESS; @@ -125,6 +124,7 @@ if (semi != NULL && (semi == path || *(semi - 1) == PATH_SEP)) { char encoding[16]; + const char *slash; GIConv coder = INVALID_CONV; int ms; @@ -336,17 +336,13 @@ /* --------------------------------------------------------------------------------------------- */ -char * +const char * vfs_translate_path (const char *path) { estr_t state; g_string_set_size (vfs_str_buffer, 0); state = _vfs_translate_path (path, -1, str_cnv_from_term, vfs_str_buffer); - /* - strict version - return (state == 0) ? vfs_str_buffer->data : NULL; - */ return (state != ESTR_FAILURE) ? vfs_str_buffer->str : NULL; } @@ -355,10 +351,10 @@ char * vfs_translate_path_n (const char *path) { - char *result; + const char *result; result = vfs_translate_path (path); - return (result != NULL) ? g_strdup (result) : NULL; + return g_strdup (result); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.10/lib/vfs/vfs.h mc-4.8.11/lib/vfs/vfs.h --- mc-4.8.10/lib/vfs/vfs.h 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/vfs/vfs.h 2013-10-15 09:52:41.000000000 +0000 @@ -247,7 +247,7 @@ /* translate path back to terminal encoding, remove all #enc: * every invalid character is replaced with question mark * return static buffer */ -char *vfs_translate_path (const char *path); +const char *vfs_translate_path (const char *path); /* return new string */ char *vfs_translate_path_n (const char *path); diff -Nru mc-4.8.10/lib/widget/Makefile.in mc-4.8.11/lib/widget/Makefile.in --- mc-4.8.10/lib/widget/Makefile.in 2013-08-02 18:56:43.000000000 +0000 +++ mc-4.8.11/lib/widget/Makefile.in 2013-11-29 18:45:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = lib/widget -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -165,6 +193,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -446,6 +491,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libmcwidget.la: $(libmcwidget_la_OBJECTS) $(libmcwidget_la_DEPENDENCIES) $(EXTRA_libmcwidget_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libmcwidget_la_OBJECTS) $(libmcwidget_la_LIBADD) $(LIBS) @@ -502,26 +548,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -533,15 +568,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -550,9 +581,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -705,9 +737,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -717,7 +749,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/lib/widget/buttonbar.c mc-4.8.11/lib/widget/buttonbar.c --- mc-4.8.10/lib/widget/buttonbar.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/widget/buttonbar.c 2013-11-29 18:27:07.000000000 +0000 @@ -162,7 +162,6 @@ { WButtonBar *bb = BUTTONBAR (w); int i; - const char *text; switch (msg) { @@ -187,6 +186,7 @@ for (i = 0; i < BUTTONBAR_LABELS_NUM; i++) { int width; + const char *text; width = buttonbar_get_button_width (bb, i); if (width <= 0) diff -Nru mc-4.8.10/lib/widget/dialog.c mc-4.8.11/lib/widget/dialog.c --- mc-4.8.10/lib/widget/dialog.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/widget/dialog.c 2013-11-29 18:27:07.000000000 +0000 @@ -493,7 +493,7 @@ dlg_one_down (h); return; } - else if (d_key == KEY_BTAB) + else if ((d_key & ~(KEY_M_SHIFT | KEY_M_CTRL)) == '\t') { dlg_one_up (h); return; @@ -520,6 +520,7 @@ if (handled == MSG_NOT_HANDLED) handled = dlg_handle_key (h, d_key); + (void) handled; send_message (h, NULL, MSG_POST_KEY, d_key, NULL); } @@ -528,7 +529,6 @@ static void frontend_dlg_run (WDialog * h) { - int d_key; Gpm_Event event; event.x = -1; @@ -542,6 +542,8 @@ while (h->state == DLG_ACTIVE) { + int d_key; + if (mc_global.tty.winch_flag != 0) dialog_change_screen_size (); @@ -800,7 +802,7 @@ g_free (t); } - /* unique name got event group for this dialog */ + /* unique name of event group for this dialog */ new_d->event_group = g_strdup_printf ("%s_%p", MCEVENT_GROUP_DIALOG, (void *) new_d); return new_d; @@ -1192,11 +1194,13 @@ h->state = DLG_ACTIVE; - /* Select the first widget that takes focus */ + /* first send MSG_DRAW to dialog itself and all widgets... */ + dlg_redraw (h); + + /* ...then send MSG_FOCUS to select the first widget that can take focus */ while (h->current != NULL && !dlg_focus (h)) h->current = dlg_widget_next (h, h->current); - dlg_redraw (h); h->ret_value = 0; } @@ -1262,8 +1266,7 @@ /* if some widgets have history, save all history at one moment here */ dlg_save_history (h); dlg_broadcast_msg (h, MSG_DESTROY); - g_list_foreach (h->widgets, (GFunc) g_free, NULL); - g_list_free (h->widgets); + g_list_free_full (h->widgets, g_free); mc_event_group_del (h->event_group); g_free (h->event_group); g_free (h->title); diff -Nru mc-4.8.10/lib/widget/history.c mc-4.8.11/lib/widget/history.c --- mc-4.8.10/lib/widget/history.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/widget/history.c 2013-11-29 18:27:07.000000000 +0000 @@ -290,7 +290,7 @@ history_show (GList ** history, Widget * widget, int current) { GList *z, *hlist = NULL, *hi; - size_t maxlen, i, count = 0; + size_t maxlen, count = 0; char *r = NULL; WDialog *query_dlg; WListbox *query_list; @@ -304,6 +304,7 @@ for (z = *history; z != NULL; z = g_list_previous (z)) { WLEntry *entry; + size_t i; i = str_term_width1 ((char *) z->data); maxlen = max (maxlen, i); @@ -382,8 +383,7 @@ dlg_destroy (query_dlg); - g_list_foreach (*history, (GFunc) g_free, NULL); - g_list_free (*history); + g_list_free_full (*history, g_free); *history = g_list_last (z); return r; diff -Nru mc-4.8.10/lib/widget/input.c mc-4.8.11/lib/widget/input.c --- mc-4.8.10/lib/widget/input.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/widget/input.c 2013-11-29 18:27:07.000000000 +0000 @@ -72,7 +72,7 @@ #endif #define should_show_history_button(in) \ - (in->history != NULL && in->field_width > HISTORY_BUTTON_WIDTH * 2 + 1 \ + (in->history.list != NULL && WIDGET (in)->cols > HISTORY_BUTTON_WIDTH * 2 + 1 \ && WIDGET (in)->owner != NULL) /*** file scope type declarations ****************************************************************/ @@ -105,19 +105,19 @@ char c; gboolean disabled = (WIDGET (in)->options & W_DISABLED) != 0; - if (g_list_next (in->history_current) == NULL) + if (g_list_next (in->history.current) == NULL) c = '^'; - else if (g_list_previous (in->history_current) == NULL) + else if (g_list_previous (in->history.current) == NULL) c = 'v'; else c = '|'; - widget_move (in, 0, in->field_width - HISTORY_BUTTON_WIDTH); + widget_move (in, 0, WIDGET (in)->cols - HISTORY_BUTTON_WIDTH); tty_setcolor (disabled ? DISABLED_COLOR : in->color[WINPUTC_HISTORY]); #ifdef LARGE_HISTORY_BUTTON tty_print_string ("[ ]"); - widget_move (in, 0, in->field_width - HISTORY_BUTTON_WIDTH + 1); + widget_move (in, 0, WIDGET (in)->cols - HISTORY_BUTTON_WIDTH + 1); #endif tty_print_char (c); @@ -193,10 +193,10 @@ size_t len; char *r; - len = get_history_length (in->history); + len = get_history_length (in->history.list); - r = history_show (&in->history, WIDGET (in), - g_list_position (in->history_current, in->history)); + r = history_show (&in->history.list, WIDGET (in), + g_list_position (in->history.list, in->history.list)); if (r != NULL) { input_assign_text (in, r); @@ -204,8 +204,8 @@ } /* Has history cleaned up or not? */ - if (len != get_history_length (in->history)) - in->history_changed = TRUE; + if (len != get_history_length (in->history.list)) + in->history.changed = TRUE; } /* --------------------------------------------------------------------------------------------- */ @@ -261,7 +261,7 @@ g_free (t); t = g_strdup (empty ? "" : text); - if (!empty && in->history_name != NULL && in->strip_password) + if (!empty && in->history.name != NULL && in->strip_password) { /* We got string user:pass@host without any VFS prefixes @@ -275,12 +275,12 @@ t = url_with_stripped_password; } - if (in->history == NULL || in->history->data == NULL || strcmp (in->history->data, t) != 0 || - in->history_changed) + if (in->history.list == NULL || in->history.list->data == NULL + || strcmp (in->history.list->data, t) != 0 || in->history.changed) { - in->history = list_append_unique (in->history, t); - in->history_current = in->history; - in->history_changed = TRUE; + in->history.list = list_append_unique (in->history.list, t); + in->history.current = in->history.list; + in->history.changed = TRUE; } else g_free (t); @@ -312,7 +312,6 @@ static cb_ret_t insert_char (WInput * in, int c_code) { - size_t i; int res; if (in->highlight) @@ -342,9 +341,12 @@ if (strlen (in->buffer) + 1 + in->charpoint >= in->current_max_size) { /* Expand the buffer */ - size_t new_length = in->current_max_size + in->field_width + in->charpoint; - char *narea = g_try_renew (char, in->buffer, new_length); - if (narea) + size_t new_length; + char *narea; + + new_length = in->current_max_size + WIDGET (in)->cols + in->charpoint; + narea = g_try_renew (char, in->buffer, new_length); + if (narea != NULL) { in->buffer = narea; in->current_max_size = new_length; @@ -353,6 +355,7 @@ if (strlen (in->buffer) + in->charpoint < in->current_max_size) { + size_t i; /* bytes from begin */ size_t ins_point = str_offset_to_pos (in->buffer, in->point); /* move chars */ @@ -634,18 +637,18 @@ { GList *prev; - if (in->history == NULL) + if (in->history.list == NULL) return; if (in->need_push) push_history (in, in->buffer); - prev = g_list_previous (in->history_current); + prev = g_list_previous (in->history.current); if (prev != NULL) { input_assign_text (in, (char *) prev->data); - in->history_current = prev; - in->history_changed = TRUE; + in->history.current = prev; + in->history.changed = TRUE; in->need_push = FALSE; } } @@ -664,20 +667,20 @@ return; } - if (in->history == NULL) + if (in->history.list == NULL) return; - next = g_list_next (in->history_current); + next = g_list_next (in->history.current); if (next == NULL) { input_assign_text (in, ""); - in->history_current = in->history; + in->history.current = in->history.list; } else { input_assign_text (in, (char *) next->data); - in->history_current = next; - in->history_changed = TRUE; + in->history.current = next; + in->history.changed = TRUE; in->need_push = FALSE; } } @@ -834,36 +837,22 @@ { WInput *in = INPUT (init_data); ev_history_load_save_t *ev = (ev_history_load_save_t *) data; - const char *def_text; - size_t buffer_len; (void) event_group_name; (void) event_name; - in->history = history_load (ev->cfg, in->history_name); - in->history_current = in->history; + in->history.list = history_load (ev->cfg, in->history.name); + in->history.current = in->history.list; - if (in->init_text == NULL) - def_text = ""; - else if (in->init_text == INPUT_LAST_TEXT) + if (in->init_from_history) { - if (in->history != NULL && in->history->data != NULL) - def_text = (const char *) in->history->data; - else - def_text = ""; + const char *def_text = ""; - in->init_text = NULL; - } - else - def_text = in->init_text; + if (in->history.list != NULL && in->history.list->data != NULL) + def_text = (const char *) in->history.list->data; - buffer_len = strlen (def_text); - buffer_len = 1 + max ((size_t) in->field_width, buffer_len); - in->current_max_size = buffer_len; - if (buffer_len > (size_t) in->field_width) - in->buffer = g_realloc (in->buffer, buffer_len); - strcpy (in->buffer, def_text); - in->point = str_length (in->buffer); + input_assign_text (in, def_text); + } return TRUE; } @@ -885,9 +874,9 @@ ev_history_load_save_t *ev = (ev_history_load_save_t *) data; push_history (in, in->buffer); - if (in->history_changed) - history_save (ev->cfg, in->history_name, in->history); - in->history_changed = FALSE; + if (in->history.changed) + history_save (ev->cfg, in->history.name, in->history.list); + in->history.changed = FALSE; } return TRUE; @@ -907,18 +896,14 @@ input_free_completions (in); /* clean history */ - if (in->history != NULL) + if (in->history.list != NULL) { /* history is already saved before this moment */ - in->history = g_list_first (in->history); - g_list_foreach (in->history, (GFunc) g_free, NULL); - g_list_free (in->history); + in->history.list = g_list_first (in->history.list); + g_list_free_full (in->history.list, g_free); } - g_free (in->history_name); - + g_free (in->history.name); g_free (in->buffer); - input_free_completions (in); - g_free (in->init_text); g_free (kill_buffer); kill_buffer = NULL; @@ -949,8 +934,7 @@ dlg_select_widget (w); - if (local.x >= in->field_width - HISTORY_BUTTON_WIDTH + 1 - && should_show_history_button (in)) + if (local.x >= w->cols - HISTORY_BUTTON_WIDTH + 1 && should_show_history_button (in)) do_show_hist (in); else { @@ -1020,34 +1004,35 @@ memmove (in->color, input_colors, sizeof (input_colors_t)); - in->field_width = width; in->first = TRUE; in->highlight = FALSE; in->term_first_shown = 0; in->disable_update = 0; - in->mark = 0; - in->need_push = TRUE; in->is_password = FALSE; - in->charpoint = 0; in->strip_password = FALSE; /* in->buffer will be corrected in "history_load" event handler */ in->current_max_size = width + 1; in->buffer = g_new0 (char, in->current_max_size); - in->point = 0; - - in->init_text = (def_text == INPUT_LAST_TEXT) ? INPUT_LAST_TEXT : g_strdup (def_text); + /* init completions before input_assign_text() call */ in->completions = NULL; in->completion_flags = completion_flags; + in->init_from_history = (def_text == INPUT_LAST_TEXT); + + if (in->init_from_history || def_text == NULL) + def_text = ""; + + input_assign_text (in, def_text); + /* prepare to history setup */ - in->history = NULL; - in->history_current = NULL; - in->history_changed = FALSE; - in->history_name = NULL; + in->history.list = NULL; + in->history.current = NULL; + in->history.changed = FALSE; + in->history.name = NULL; if ((histname != NULL) && (*histname != '\0')) - in->history_name = g_strdup (histname); + in->history.name = g_strdup (histname); /* history will be loaded later */ in->label = NULL; @@ -1100,10 +1085,10 @@ case MSG_ACTION: return input_execute_cmd (in, parm); + case MSG_RESIZE: case MSG_FOCUS: case MSG_UNFOCUS: case MSG_DRAW: - case MSG_RESIZE: input_update (in, FALSE); return MSG_HANDLED; @@ -1144,16 +1129,6 @@ /* --------------------------------------------------------------------------------------------- */ -void -input_set_origin (WInput * in, int x, int field_width) -{ - WIDGET (in)->x = x; - in->field_width = WIDGET (in)->cols = field_width; - input_update (in, FALSE); -} - -/* --------------------------------------------------------------------------------------------- */ - cb_ret_t input_handle_char (WInput * in, int key) { @@ -1218,14 +1193,24 @@ void input_assign_text (WInput * in, const char *text) { + Widget *w = WIDGET (in); + size_t text_len, buffer_len; + + if (text == NULL) + text = ""; + input_free_completions (in); - g_free (in->buffer); - in->current_max_size = strlen (text) + 1; - in->buffer = g_strndup (text, in->current_max_size); /* was in->buffer->text */ - in->point = str_length (in->buffer); in->mark = 0; in->need_push = TRUE; in->charpoint = 0; + + text_len = strlen (text); + buffer_len = 1 + max ((size_t) w->cols, text_len); + in->current_max_size = buffer_len; + if (buffer_len > (size_t) w->cols) + in->buffer = g_realloc (in->buffer, buffer_len); + memmove (in->buffer, text, text_len + 1); + in->point = str_length (in->buffer); input_update (in, TRUE); } @@ -1267,35 +1252,35 @@ { Widget *w = WIDGET (in); int has_history = 0; - int i; int buf_len; const char *cp; int pw; - if (should_show_history_button (in)) - has_history = HISTORY_BUTTON_WIDTH; - if (in->disable_update != 0) return; + /* don't draw widget not put into dialog */ + if (w->owner == NULL || w->owner->state != DLG_ACTIVE) + return; + + if (should_show_history_button (in)) + has_history = HISTORY_BUTTON_WIDTH; + buf_len = str_length (in->buffer); + + /* Adjust the mark */ + in->mark = min (in->mark, buf_len); + pw = str_term_width2 (in->buffer, in->point); /* Make the point visible */ - if ((pw < in->term_first_shown) || (pw >= in->term_first_shown + in->field_width - has_history)) + if ((pw < in->term_first_shown) || (pw >= in->term_first_shown + w->cols - has_history)) { - in->term_first_shown = pw - (in->field_width / 3); + in->term_first_shown = pw - (w->cols / 3); if (in->term_first_shown < 0) in->term_first_shown = 0; } - /* Adjust the mark */ - in->mark = min (in->mark, buf_len); - - /* don't draw widget not put into dialog */ - if (w->owner == NULL || w->owner->state != DLG_ACTIVE) - return; - if (has_history != 0) draw_history_button (in); @@ -1312,7 +1297,7 @@ { if (!in->highlight) tty_print_string (str_term_substring (in->buffer, in->term_first_shown, - in->field_width - has_history)); + w->cols - has_history)); else { long m1, m2; @@ -1320,8 +1305,7 @@ if (input_eval_marks (in, &m1, &m2)) { tty_setcolor (in->color[WINPUTC_MAIN]); - cp = str_term_substring (in->buffer, in->term_first_shown, - in->field_width - has_history); + cp = str_term_substring (in->buffer, in->term_first_shown, w->cols - has_history); tty_print_string (cp); tty_setcolor (in->color[WINPUTC_MARK]); if (m1 < in->term_first_shown) @@ -1338,8 +1322,7 @@ widget_move (in, 0, m1 - in->term_first_shown); buf_width = str_term_width2 (in->buffer, m1); sel_width = - min (m2 - m1, - (in->field_width - has_history) - (buf_width - in->term_first_shown)); + min (m2 - m1, (w->cols - has_history) - (buf_width - in->term_first_shown)); tty_print_string (str_term_substring (in->buffer, m1, sel_width)); } } @@ -1347,9 +1330,11 @@ } else { - cp = str_term_substring (in->buffer, in->term_first_shown, in->field_width - has_history); + int i; + + cp = str_term_substring (in->buffer, in->term_first_shown, w->cols - has_history); tty_setcolor (in->color[WINPUTC_MAIN]); - for (i = 0; i < in->field_width - has_history; i++) + for (i = 0; i < w->cols - has_history; i++) { if (i < (buf_len - in->term_first_shown) && cp[0] != '\0') tty_print_char ('*'); diff -Nru mc-4.8.10/lib/widget/input.h mc-4.8.11/lib/widget/input.h --- mc-4.8.10/lib/widget/input.h 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/lib/widget/input.h 2013-11-29 18:27:07.000000000 +0000 @@ -52,16 +52,11 @@ gboolean highlight; /* there is a selected block */ int term_first_shown; /* column of the first shown character */ size_t current_max_size; /* maximum length of input line (bytes) */ - int field_width; /* width of the editing field */ gboolean first; /* is first keystroke? */ int disable_update; /* do we want to skip updates? */ gboolean is_password; /* is this a password input line? */ - char *init_text; /* initial text of input line */ + gboolean init_from_history; /* init text will be get from history */ char *buffer; /* pointer to editing buffer */ - char *history_name; /* name of history for loading and saving */ - GList *history; /* the history */ - GList *history_current; /* current history item */ - gboolean history_changed; /* the history has changed */ gboolean need_push; /* need to push the current Input on hist? */ gboolean strip_password; /* need to strip password before placing string to history */ char **completions; /* possible completions array */ @@ -69,6 +64,13 @@ char charbuf[MB_LEN_MAX]; /* buffer for multibytes characters */ size_t charpoint; /* point to end of mulibyte sequence in charbuf */ WLabel *label; /* label associated with this input line */ + struct input_history_t + { + char *name; /* name of history for loading and saving */ + GList *list; /* the history */ + GList *current; /* current history item */ + gboolean changed; /* the history has changed */ + } history; } WInput; /*** global variables defined in .c file *********************************************************/ @@ -85,7 +87,6 @@ /* callbac is public; needed for command line */ cb_ret_t input_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data); const int *input_get_default_colors (void); -void input_set_origin (WInput * i, int x, int field_width); cb_ret_t input_handle_char (WInput * in, int key); int input_key_is_in_map (WInput * in, int key); void input_assign_text (WInput * in, const char *text); diff -Nru mc-4.8.10/lib/widget/input_complete.c mc-4.8.11/lib/widget/input_complete.c --- mc-4.8.10/lib/widget/input_complete.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/widget/input_complete.c 2013-11-29 18:27:07.000000000 +0000 @@ -569,6 +569,7 @@ }; char *p, *found; + /* cppcheck-suppress uninitvar */ SHOW_C_CTX ("command_completion_function"); if (!(flags & INPUT_COMPLETE_COMMANDS)) @@ -735,8 +736,6 @@ lowest common denominator. That then becomes match_list[0]. */ if (matches) { - register size_t i = 1; - int low = 4096; /* Count of max-matched characters. */ /* If only one match, just use that. */ if (matches == 1) @@ -746,6 +745,8 @@ } else { + size_t i = 1; + int low = 4096; /* Count of max-matched characters. */ size_t j; qsort (match_list + 1, matches, sizeof (char *), match_compare); @@ -846,12 +847,11 @@ state->in_command_position++; else if (strchr (command_separator_chars, ti[0]) != NULL) { - int this_char, prev_char; - state->in_command_position++; - if (ti != text) { + int this_char, prev_char; + /* Handle the two character tokens '>&', '<&', and '>|'. We are not in a command position after one of these. */ this_char = ti[0]; @@ -937,20 +937,21 @@ { char *const cdpath_ref = g_strdup (getenv ("CDPATH")); char *cdpath = cdpath_ref; - char c, *s; + char c; + + c = (cdpath == NULL) ? '\0' : ':'; - if (cdpath == NULL) - c = 0; - else - c = ':'; while (!matches && c == ':') { + char *s; + s = strchr (cdpath, ':'); + /* cppcheck-suppress nullPointer */ if (s == NULL) - s = strchr (cdpath, 0); + s = strchr (cdpath, '\0'); c = *s; - *s = 0; - if (*cdpath) + *s = '\0'; + if (*cdpath != '\0') { state->r = mc_build_filename (cdpath, state->word, NULL); SHOW_C_CTX ("try_complete:filename_subst_2"); @@ -982,12 +983,13 @@ { /* Expand the buffer */ char *narea; + Widget *w = WIDGET (in); - narea = g_try_realloc (in->buffer, in->current_max_size + size + in->field_width); + narea = g_try_realloc (in->buffer, in->current_max_size + size + w->cols); if (narea != NULL) { in->buffer = narea; - in->current_max_size += size + in->field_width; + in->current_max_size += size + w->cols; } } if (strlen (in->buffer) + 1 < (size_t) in->current_max_size) @@ -1007,7 +1009,6 @@ static cb_ret_t query_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data) { - static char buff[MB_LEN_MAX] = ""; static int bl = 0; WDialog *h = DIALOG (w); @@ -1083,6 +1084,7 @@ } else { + static char buff[MB_LEN_MAX] = ""; GList *e; int i; int need_redraw = 0; @@ -1349,12 +1351,19 @@ matches = completion_matches (state.word, username_completion_function, state.flags); } - /* And finally if this word is in a command position, then + /* If this word is in a command position, then complete over possible command names, including aliases, functions, and command names. */ if (matches == NULL) matches = try_complete_all_possible (&state, text, lc_start); + /* And finally if nothing found, try complete directory name */ + if (matches == NULL) + { + state.in_command_position = 0; + matches = try_complete_all_possible (&state, text, lc_start); + } + g_free (state.word); if (matches != NULL && diff -Nru mc-4.8.10/lib/widget/listbox-window.c mc-4.8.11/lib/widget/listbox-window.c --- mc-4.8.10/lib/widget/listbox-window.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/widget/listbox-window.c 2013-11-29 18:27:07.000000000 +0000 @@ -70,7 +70,7 @@ const int space = 4; - int xpos, ypos, len; + int xpos, ypos; Listbox *listbox; /* Adjust sizes */ @@ -78,6 +78,8 @@ if (title != NULL) { + int len; + len = str_term_width1 (title) + 4; cols = max (cols, len); } diff -Nru mc-4.8.10/lib/widget/listbox.c mc-4.8.11/lib/widget/listbox.c --- mc-4.8.10/lib/widget/listbox.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/widget/listbox.c 2013-11-29 18:27:07.000000000 +0000 @@ -688,8 +688,7 @@ { if ((l != NULL) && (l->count != 0)) { - g_list_foreach (l->list, (GFunc) listbox_entry_free, NULL); - g_list_free (l->list); + g_list_free_full (l->list, listbox_entry_free); l->list = NULL; l->count = l->pos = l->top = 0; } diff -Nru mc-4.8.10/lib/widget/menu.c mc-4.8.11/lib/widget/menu.c --- mc-4.8.10/lib/widget/menu.c 2013-08-02 18:02:40.000000000 +0000 +++ mc-4.8.11/lib/widget/menu.c 2013-11-29 18:27:07.000000000 +0000 @@ -395,7 +395,6 @@ menubar_first (WMenuBar * menubar) { menu_t *menu = MENU (g_list_nth_data (menubar->menu, menubar->selected)); - menu_entry_t *entry; if (menu->selected == 0) return; @@ -406,6 +405,8 @@ while (TRUE) { + menu_entry_t *entry; + entry = MENUENTRY (g_list_nth_data (menu->entries, menu->selected)); if ((entry == NULL) || (entry->command == CK_IgnoreKey)) @@ -827,8 +828,7 @@ destroy_menu (menu_t * menu) { release_hotkey (menu->text); - g_list_foreach (menu->entries, (GFunc) menu_entry_free, NULL); - g_list_free (menu->entries); + g_list_free_full (menu->entries, (GDestroyNotify) menu_entry_free); g_free (menu->help_node); g_free (menu); } @@ -859,10 +859,8 @@ { /* delete previous menu */ if (menubar->menu != NULL) - { - g_list_foreach (menubar->menu, (GFunc) destroy_menu, NULL); - g_list_free (menubar->menu); - } + g_list_free_full (menubar->menu, (GDestroyNotify) destroy_menu); + /* add new menu */ menubar->is_active = FALSE; menubar->is_dropped = FALSE; diff -Nru mc-4.8.10/lib/widget/quick.c mc-4.8.11/lib/widget/quick.c --- mc-4.8.10/lib/widget/quick.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/widget/quick.c 2013-10-15 09:52:41.000000000 +0000 @@ -493,7 +493,8 @@ } /* forced update internal variables of inpuit line */ - input_set_origin (INPUT (item->widget), item->widget->x, item->widget->cols); + widget_set_size (item->widget, item->widget->y, item->widget->x, 1, + item->widget->cols); } break; diff -Nru mc-4.8.10/lib/widget/widget-common.c mc-4.8.11/lib/widget/widget-common.c --- mc-4.8.10/lib/widget/widget-common.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/widget/widget-common.c 2013-10-15 09:45:12.000000000 +0000 @@ -145,6 +145,7 @@ w->y = y; w->cols = cols; w->lines = lines; + w->pos_flags = WPOS_KEEP_DEFAULT; w->callback = callback; w->mouse = mouse_handler; w->set_options = widget_default_set_options_callback; diff -Nru mc-4.8.10/lib/widget/wtools.c mc-4.8.11/lib/widget/wtools.c --- mc-4.8.10/lib/widget/wtools.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/lib/widget/wtools.c 2013-11-29 18:27:07.000000000 +0000 @@ -274,12 +274,10 @@ va_list ap; WDialog *query_dlg; WButton *button; - WButton *defbutton = NULL; int win_len = 0; int i; int result = -1; int cols, lines; - char *cur_name; const int *query_colors = (flags & D_ERROR) != 0 ? alarm_colors : dialog_colors; dlg_flags_t dlg_flags = (flags & D_CENTER) != 0 ? (DLG_CENTER | DLG_TRYUP) : DLG_NONE; @@ -311,9 +309,10 @@ if (count > 0) { + WButton *defbutton = NULL; + add_widget_autopos (query_dlg, label_new (2, 3, text), WPOS_KEEP_TOP | WPOS_CENTER_HORZ, NULL); - add_widget (query_dlg, hline_new (lines - 4, -1, -1)); cols = (cols - win_len - 2) / 2 + 2; @@ -321,6 +320,7 @@ for (i = 0; i < count; i++) { int xpos; + char *cur_name; cur_name = va_arg (ap, char *); xpos = str_term_width1 (cur_name) + 6; @@ -487,11 +487,12 @@ input_complete_t completion_flags) { char *result; - char *expanded; result = input_dialog (header, text, history_name, def_text, completion_flags); if (result) { + char *expanded; + expanded = tilde_expand (result); g_free (result); return expanded; diff -Nru mc-4.8.10/m4/libtool.m4 mc-4.8.11/m4/libtool.m4 --- mc-4.8.10/m4/libtool.m4 2012-09-23 07:32:14.000000000 +0000 +++ mc-4.8.11/m4/libtool.m4 2013-10-17 17:50:40.000000000 +0000 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1326,7 +1326,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1345,7 +1348,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) diff -Nru mc-4.8.10/misc/Makefile.in mc-4.8.11/misc/Makefile.in --- mc-4.8.10/misc/Makefile.in 2013-08-02 18:56:44.000000000 +0000 +++ mc-4.8.11/misc/Makefile.in 2013-11-29 18:45:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,8 +83,8 @@ #if CHARSET is defined, mc.charsets is already here @CHARSET_FALSE@am__append_2 = mc.charsets subdir = misc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/mc.ext.in $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs $(srcdir)/mc.ext.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -160,13 +188,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -175,9 +204,29 @@ DATA = $(cfg_DATA) $(noinst_DATA) $(pkgdata_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -571,14 +620,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -599,31 +647,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -639,12 +669,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -656,15 +681,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -673,9 +694,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -853,24 +875,21 @@ uninstall-am: uninstall-cfgDATA uninstall-cfgSCRIPTS \ uninstall-pkgdataDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-cfgDATA install-cfgSCRIPTS install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-pkgdataDATA install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-cfgDATA \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-cfgDATA install-cfgSCRIPTS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-pkgdataDATA install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am uninstall-cfgDATA \ uninstall-cfgSCRIPTS uninstall-pkgdataDATA diff -Nru mc-4.8.10/misc/ext.d/Makefile.in mc-4.8.11/misc/ext.d/Makefile.in --- mc-4.8.10/misc/ext.d/Makefile.in 2013-08-02 18:56:44.000000000 +0000 +++ mc-4.8.11/misc/ext.d/Makefile.in 2013-11-29 18:45:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = misc/ext.d -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/doc.sh.in $(srcdir)/misc.sh.in $(srcdir)/text.sh.in \ - $(srcdir)/web.sh.in $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs $(srcdir)/doc.sh.in \ + $(srcdir)/misc.sh.in $(srcdir)/text.sh.in $(srcdir)/web.sh.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -161,6 +189,7 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -482,11 +511,9 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -627,16 +654,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extSCRIPTS install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-extSCRIPTS + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-extSCRIPTS \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-extSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/misc/ext.d/misc.sh.in mc-4.8.11/misc/ext.d/misc.sh.in --- mc-4.8.10/misc/ext.d/misc.sh.in 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/misc/ext.d/misc.sh.in 2013-11-29 18:27:07.000000000 +0000 @@ -22,8 +22,8 @@ file "${MC_EXT_FILENAME}" && nm -C "${MC_EXT_FILENAME}" ;; lib) - gplib -t "${MC_EXT_FILENAME}" || >&2 | \ - @PERL@ -e '@a=split /[\s\t]+/, <>; printf ("%-30s | %10d | %s.%s.%02d | %s\n", $a[0], ($a[1]*1),$a[7], lc($a[4]), $a[5], $a[6]);' + gplib -t "${MC_EXT_FILENAME}" | \ + @PERL@ -e 'while (<>) { @a=split /[\s\t]+/, $_; printf ("%-30s | %10d | %s.%s.%02d | %s\n", $a[0], ($a[1]*1),$a[7], lc($a[4]), $a[5], $a[6]);}' ;; so) file "${MC_EXT_FILENAME}" && nm -C -D "${MC_EXT_FILENAME}" diff -Nru mc-4.8.10/misc/macros.d/Makefile.in mc-4.8.11/misc/macros.d/Makefile.in --- mc-4.8.10/misc/macros.d/Makefile.in 2013-08-02 18:56:44.000000000 +0000 +++ mc-4.8.11/misc/macros.d/Makefile.in 2013-11-29 18:45:49.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = misc/macros.d -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/config/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ @@ -160,6 +188,7 @@ } am__installdirs = "$(DESTDIR)$(macrodir)" DATA = $(macro_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -444,11 +473,9 @@ @list='$(macro_DATA)'; test -n "$(macrodir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(macrodir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -589,16 +616,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-macroDATA install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-macroDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-macroDATA \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-macroDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/misc/mc.default.keymap mc-4.8.11/misc/mc.default.keymap --- mc-4.8.10/misc/mc.default.keymap 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/misc/mc.default.keymap 2013-10-15 09:52:41.000000000 +0000 @@ -227,14 +227,14 @@ WordLeft = ctrl-left; ctrl-z WordRight = ctrl-right; ctrl-x Enter = enter -Return = shift-enter +Return = shift-enter; ctrl-enter; ctrl-shift-enter BackSpace = backspace; ctrl-h Delete = delete; ctrl-d PageUp = pgup PageDown = pgdn Home = home End = end -Tab = tab +Tab = tab; shift-tab; ctrl-tab; ctrl-shift-tab Undo = ctrl-u Redo = alt-r Top = ctrl-home; alt-lt diff -Nru mc-4.8.10/misc/mc.emacs.keymap mc-4.8.11/misc/mc.emacs.keymap --- mc-4.8.10/misc/mc.emacs.keymap 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/misc/mc.emacs.keymap 2013-10-15 09:52:41.000000000 +0000 @@ -227,14 +227,14 @@ WordLeft = ctrl-left; alt-b WordRight = ctrl-right; alt-f Enter = enter -Return = shift-enter +Return = shift-enter; ctrl-enter; ctrl-shift-enter BackSpace = backspace Delete = delete PageUp = pgup; alt-v PageDown = pgdn; ctrl-v Home = home; ctrl-a End = end; ctrl-e -Tab = tab +Tab = tab; shift-tab; ctrl-tab; ctrl-shift-tab Undo = ctrl-u # Redo = Top = ctrl-home; alt-lt diff -Nru mc-4.8.10/misc/mc.keymap mc-4.8.11/misc/mc.keymap --- mc-4.8.10/misc/mc.keymap 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/misc/mc.keymap 2013-10-15 09:52:41.000000000 +0000 @@ -227,14 +227,14 @@ WordLeft = ctrl-left; ctrl-z WordRight = ctrl-right; ctrl-x Enter = enter -Return = shift-enter +Return = shift-enter; ctrl-enter; ctrl-shift-enter BackSpace = backspace; ctrl-h Delete = delete; ctrl-d PageUp = pgup PageDown = pgdn Home = home End = end -Tab = tab +Tab = tab; shift-tab; ctrl-tab; ctrl-shift-tab Undo = ctrl-u Redo = alt-r Top = ctrl-home; alt-lt diff -Nru mc-4.8.10/misc/mc.lib mc-4.8.11/misc/mc.lib --- mc-4.8.10/misc/mc.lib 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/misc/mc.lib 2013-11-29 18:27:07.000000000 +0000 @@ -1,13 +1,13 @@ [External editor or viewer parameters] - vi=%filename +%lineno - vim=%filename +%lineno - view=%filename +%lineno - emacs=%filename +%lineno - nano=%filename +%lineno - joe=%filename +%lineno - more=%filename +%lineno - less=%filename +%linenog - mcedit=%filename:%lineno +vi=+%lineno %filename +vim=+%lineno %filename +view=+%lineno %filename +emacs=+%lineno %filename +nano=+%lineno %filename +joe=+%lineno %filename +more=+%lineno %filename +less=+%lineno %filename +mcedit=%filename:%lineno [Special dirs] list=/afs;/coda;/:;/...;/net;/#smb @@ -131,6 +131,9 @@ [terminal:xterm-256color] copy=xterm +[terminal:screen] +copy=xterm + [terminal:ibmpc3] f11=\\e[Y f12=\\e[Z diff -Nru mc-4.8.10/misc/skins/Makefile.in mc-4.8.11/misc/skins/Makefile.in --- mc-4.8.10/misc/skins/Makefile.in 2013-08-02 18:56:45.000000000 +0000 +++ mc-4.8.11/misc/skins/Makefile.in 2013-11-29 18:45:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = misc/skins -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/config/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ @@ -160,6 +188,7 @@ } am__installdirs = "$(DESTDIR)$(skindir)" DATA = $(skin_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -455,11 +484,9 @@ @list='$(skin_DATA)'; test -n "$(skindir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(skindir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -600,16 +627,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-skinDATA \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-skinDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-skinDATA install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-skinDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/misc/skins/dark.ini mc-4.8.11/misc/skins/dark.ini --- mc-4.8.10/misc/skins/dark.ini 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/misc/skins/dark.ini 2013-11-29 18:27:07.000000000 +0000 @@ -76,7 +76,7 @@ menuhot=white;blue menusel=black;cyan menuhotsel=white;cyan - menuinactive=black;white + menuinactive=black;lightgray [help] _default_=black;lightgray @@ -88,8 +88,8 @@ [editor] _default_=lightgray;black - editbold=yellow;brightgreen - editmarked=black;white + editbold=yellow;green + editmarked=black;lightgray editwhitespace=brightblue;black editlinestate=white;cyan bookmark=white;red @@ -114,14 +114,14 @@ changed=white;cyan removed=white;red folder=blue;black - error=red;white + error=red;lightgray [buttonbar] - hotkey=red;white - button=black;white + hotkey=red;lightgray + button=black;lightgray [statusbar] - _default_=black;white + _default_=black;lightgray [popupmenu] _default_=lightgray;blue diff -Nru mc-4.8.10/misc/skins/darkfar.ini mc-4.8.11/misc/skins/darkfar.ini --- mc-4.8.10/misc/skins/darkfar.ini 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/misc/skins/darkfar.ini 2013-11-29 18:27:07.000000000 +0000 @@ -76,7 +76,7 @@ menuhot=white;blue menusel=black;cyan menuhotsel=white;cyan - menuinactive=black;white + menuinactive=black;lightgray [help] _default_=black;lightgray @@ -88,8 +88,8 @@ [editor] _default_=lightgray;black - editbold=yellow;brightgreen - editmarked=black;white + editbold=yellow;green + editmarked=black;lightgray editwhitespace=brightblue;black editlinestate=white;cyan bookmark=white;red @@ -114,14 +114,14 @@ changed=white;cyan removed=white;red folder=blue;black - error=red;white + error=red; [buttonbar] - hotkey=red;white - button=black;white + hotkey=red;lightgray + button=black;lightgray [statusbar] - _default_=black;white + _default_=black;lightgray [popupmenu] _default_=lightgray;blue diff -Nru mc-4.8.10/misc/skins/default.ini mc-4.8.11/misc/skins/default.ini --- mc-4.8.10/misc/skins/default.ini 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/misc/skins/default.ini 2013-11-29 18:27:07.000000000 +0000 @@ -96,7 +96,7 @@ [editor] _default_=lightgray;blue - editbold=yellow;brightgreen + editbold=yellow;green editmarked=black;cyan editwhitespace=brightblue;blue editlinestate=white;cyan @@ -122,7 +122,7 @@ changed=white;cyan removed=white;red folder=blue;black - error=red;white + error=red;lightgray [popupmenu] _default_=white;cyan diff -Nru mc-4.8.10/misc/skins/double-lines.ini mc-4.8.11/misc/skins/double-lines.ini --- mc-4.8.10/misc/skins/double-lines.ini 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/misc/skins/double-lines.ini 2013-11-29 18:27:07.000000000 +0000 @@ -95,7 +95,7 @@ [editor] _default_=lightgray;blue - editbold=yellow;brightgreen + editbold=yellow;green editmarked=black;cyan editwhitespace=brightblue;blue editlinestate=white;cyan @@ -121,7 +121,7 @@ changed=white;cyan removed=white;red folder=blue;black - error=red;white + error=red;lightgray [popupmenu] _default_=white;cyan diff -Nru mc-4.8.10/misc/skins/featured.ini mc-4.8.11/misc/skins/featured.ini --- mc-4.8.10/misc/skins/featured.ini 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/misc/skins/featured.ini 2013-11-29 18:27:07.000000000 +0000 @@ -97,7 +97,7 @@ [editor] _default_=lightgray;blue - editbold=yellow;brightgreen + editbold=yellow;green editmarked=black;cyan editwhitespace=brightblue;blue editlinestate=white;cyan @@ -123,7 +123,7 @@ changed=white;cyan removed=white;red folder=blue;black - error=red;white + error=red;lightgray [popupmenu] _default_=white;cyan diff -Nru mc-4.8.10/misc/skins/gotar.ini mc-4.8.11/misc/skins/gotar.ini --- mc-4.8.10/misc/skins/gotar.ini 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/misc/skins/gotar.ini 2013-11-29 18:27:07.000000000 +0000 @@ -29,7 +29,7 @@ selected=white;blue marked=brightred; markselect=yellow; - gauge=;yellow + gauge=;brown input=brightgreen; disabled=gray;blue reverse=brightgreen;blue diff -Nru mc-4.8.10/misc/skins/mc46.ini mc-4.8.11/misc/skins/mc46.ini --- mc-4.8.10/misc/skins/mc46.ini 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/misc/skins/mc46.ini 2013-11-29 18:27:07.000000000 +0000 @@ -113,7 +113,7 @@ changed=white;cyan removed=white;red folder=blue;black - error=red;white + error=red;lightgray [popupmenu] _default_=white;cyan diff -Nru mc-4.8.10/misc/skins/nicedark.ini mc-4.8.11/misc/skins/nicedark.ini --- mc-4.8.10/misc/skins/nicedark.ini 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/misc/skins/nicedark.ini 2013-11-29 18:27:07.000000000 +0000 @@ -121,7 +121,7 @@ changed=white;cyan removed=white;red folder=blue;black - error=red;white + error=red;lightgray [popupmenu] _default_=lightgray;black diff -Nru mc-4.8.10/misc/syntax/Makefile.in mc-4.8.11/misc/syntax/Makefile.in --- mc-4.8.10/misc/syntax/Makefile.in 2013-08-02 18:56:45.000000000 +0000 +++ mc-4.8.11/misc/syntax/Makefile.in 2013-11-29 18:45:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,8 +79,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = misc/syntax -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/Syntax.in $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs $(srcdir)/Syntax.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -160,6 +188,7 @@ } am__installdirs = "$(DESTDIR)$(syntaxdir)" DATA = $(syntax_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -519,11 +548,9 @@ @list='$(syntax_DATA)'; test -n "$(syntaxdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(syntaxdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -664,16 +691,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-syntaxDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-syntaxDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-syntaxDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-syntaxDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/misc/syntax/Syntax.in mc-4.8.11/misc/syntax/Syntax.in --- mc-4.8.10/misc/syntax/Syntax.in 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/misc/syntax/Syntax.in 2013-11-29 18:27:07.000000000 +0000 @@ -115,7 +115,7 @@ file ..\*\\.(java|JAVA|Java|jav|groovy|GROOVY|Groovy)$ Java\sProgram include java.syntax -file ..\*\\.(properties|config) Java\sFile +file ..\*\\.(properties|config)$ Java\sFile include properties.syntax file ..\*\\.(cs|CS)$ C\#\sProgram Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/az.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/az.gmo differ diff -Nru mc-4.8.10/po/az.po mc-4.8.11/po/az.po --- mc-4.8.10/po/az.po 2013-08-02 19:06:21.000000000 +0000 +++ mc-4.8.11/po/az.po 2013-11-29 18:46:59.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/mc/language/" "az/)\n" @@ -4064,6 +4064,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Silinir" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/be.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/be.gmo differ diff -Nru mc-4.8.10/po/be.po mc-4.8.11/po/be.po --- mc-4.8.10/po/be.po 2013-08-02 19:06:21.000000000 +0000 +++ mc-4.8.11/po/be.po 2013-11-29 18:46:59.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/mc/language/" "be/)\n" @@ -4278,6 +4278,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Выдаляецца" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/bg.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/bg.gmo differ diff -Nru mc-4.8.10/po/bg.po mc-4.8.11/po/bg.po --- mc-4.8.10/po/bg.po 2013-08-02 19:06:21.000000000 +0000 +++ mc-4.8.11/po/bg.po 2013-11-29 18:46:59.000000000 +0000 @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-08-02 07:19+0000\n" -"Last-Translator: Yasen Pramatarov \n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" +"Last-Translator: Piotr Drąg \n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/mc/language/" "bg/)\n" "Language: bg\n" @@ -4078,6 +4078,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Изтривам" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/ca.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/ca.gmo differ diff -Nru mc-4.8.10/po/ca.po mc-4.8.11/po/ca.po --- mc-4.8.10/po/ca.po 2013-08-02 19:06:21.000000000 +0000 +++ mc-4.8.11/po/ca.po 2013-11-29 18:46:59.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/mc/language/" "ca/)\n" @@ -4095,6 +4095,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Suprimint" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/cs.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/cs.gmo differ diff -Nru mc-4.8.10/po/cs.po mc-4.8.11/po/cs.po --- mc-4.8.10/po/cs.po 2013-08-02 19:06:21.000000000 +0000 +++ mc-4.8.11/po/cs.po 2013-11-29 18:46:59.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Czech (http://www.transifex.com/projects/p/mc/language/cs/)\n" "Language: cs\n" @@ -4215,6 +4215,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Maže se" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/da.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/da.gmo differ diff -Nru mc-4.8.10/po/da.po mc-4.8.11/po/da.po --- mc-4.8.10/po/da.po 2013-08-02 19:06:21.000000000 +0000 +++ mc-4.8.11/po/da.po 2013-11-29 18:46:59.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Danish (http://www.transifex.com/projects/p/mc/language/da/)\n" "Language: da\n" @@ -4211,6 +4211,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Sletter" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/de.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/de.gmo differ diff -Nru mc-4.8.10/po/de.po mc-4.8.11/po/de.po --- mc-4.8.10/po/de.po 2013-08-02 19:06:21.000000000 +0000 +++ mc-4.8.11/po/de.po 2013-11-29 18:47:00.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: German (http://www.transifex.com/projects/p/mc/language/de/)\n" "Language: de\n" @@ -4239,6 +4239,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Lösche" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/de_CH.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/de_CH.gmo differ diff -Nru mc-4.8.10/po/de_CH.po mc-4.8.11/po/de_CH.po --- mc-4.8.10/po/de_CH.po 2013-08-02 19:06:21.000000000 +0000 +++ mc-4.8.11/po/de_CH.po 2013-11-29 18:46:59.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/mc/" "language/de_CH/)\n" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/el.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/el.gmo differ diff -Nru mc-4.8.10/po/el.po mc-4.8.11/po/el.po --- mc-4.8.10/po/el.po 2013-08-02 19:06:21.000000000 +0000 +++ mc-4.8.11/po/el.po 2013-11-29 18:47:00.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Greek (http://www.transifex.com/projects/p/mc/language/el/)\n" "Language: el\n" @@ -4170,6 +4170,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Γίνεται διαγραφή" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/eo.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/eo.gmo differ diff -Nru mc-4.8.10/po/eo.po mc-4.8.11/po/eo.po --- mc-4.8.10/po/eo.po 2013-08-02 19:06:22.000000000 +0000 +++ mc-4.8.11/po/eo.po 2013-11-29 18:47:00.000000000 +0000 @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-07 23:58+0000\n" -"Last-Translator: Keith Bowes \n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" +"Last-Translator: Piotr Drąg \n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/mc/language/" "eo/)\n" "Language: eo\n" @@ -4287,6 +4287,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Ne eblas atingi lokan kopion de /ftp://some.host/editme.txt" - -#~ msgid "Deleting" -#~ msgstr "Foriganta je" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/es.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/es.gmo differ diff -Nru mc-4.8.10/po/es.po mc-4.8.11/po/es.po --- mc-4.8.10/po/es.po 2013-08-02 19:06:22.000000000 +0000 +++ mc-4.8.11/po/es.po 2013-11-29 18:47:00.000000000 +0000 @@ -13,9 +13,9 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 09:37+0000\n" -"Last-Translator: David Martin \n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" +"Last-Translator: Piotr Drąg \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/mc/language/" "es/)\n" "Language: es\n" @@ -4297,6 +4297,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Imposible obtener una copia local de /ftp://some.host/editme.txt" - -#~ msgid "Deleting" -#~ msgstr "Borrando" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/et.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/et.gmo differ diff -Nru mc-4.8.10/po/et.po mc-4.8.11/po/et.po --- mc-4.8.10/po/et.po 2013-08-02 19:06:22.000000000 +0000 +++ mc-4.8.11/po/et.po 2013-11-29 18:47:00.000000000 +0000 @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# kristjanrats , 2013 +# Kristjan Räts , 2013 msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-30 09:29+0000\n" -"Last-Translator: kristjanrats \n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" +"Last-Translator: Kristjan Räts \n" "Language-Team: Estonian (http://www.transifex.com/projects/p/mc/language/" "et/)\n" "Language: et\n" @@ -20,34 +20,34 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Warning: cannot load codepages list" -msgstr "" +msgstr "Hoiatus: koodilehtede laadimine nurjus" msgid "7-bit ASCII" -msgstr "" +msgstr "7-bitine ASCII" #, c-format msgid "Cannot translate from %s to %s" -msgstr "" +msgstr "Tõlkimine %s-st %s-ks nurjus" msgid "Event system already initialized" -msgstr "" +msgstr "Sündmuste süsteem on juba lähtestatud" msgid "Failed to initialize event system" -msgstr "" +msgstr "Sündmuste süsteemi lähtestamine ebaõnnestus" msgid "Event system not initialized" -msgstr "" +msgstr "Sündmuste süsteem ei ole lähtestatud" msgid "Check input data! Some of parameters are NULL!" -msgstr "" +msgstr "Kontrolli sisendandmeid! Mõned parameetrid on NULLid!" #, c-format msgid "Unable to create group '%s' for events!" -msgstr "" +msgstr "Grupi \"%s\" loomine sündmustele ebaõnnestus!" #, c-format msgid "Unable to create event '%s'!" -msgstr "" +msgstr "Sündmust \"%s\" ei õnnestunud luua!" #, c-format msgid "" @@ -55,26 +55,29 @@ "User: %s\n" "Process ID: %d" msgstr "" +"Fail \"%s\" on juba avatud muutmiseks.\n" +"Kasutaja: %s\n" +"Protsessi ID: %d" msgid "File locked" -msgstr "" +msgstr "Fail on lukustatud" msgid "&Grab lock" -msgstr "" +msgstr "&Haara lukk" msgid "&Ignore lock" -msgstr "" +msgstr "&Eira lukku" #, c-format msgid "Cannot create %s directory" -msgstr "" +msgstr "%s kataloogi loomine nurjus" msgid "FATAL: not a directory:" -msgstr "" +msgstr "Viga: ei ole kataloog:" #, c-format msgid "An error occurred while migrating user settings: %s" -msgstr "" +msgstr "Viga kasutaja seadete migreerimisel: %s" #, c-format msgid "" @@ -83,52 +86,62 @@ "To get more info, please visit\n" "http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html" msgstr "" +"Su vanad seaded toodi %s'st üle\n" +"Freedesktopi soovitatud kataloogidesse.\n" +"Lisainfot leiad aadressilt\n" +"http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html" #, c-format msgid "" "Your old settings were migrated from %s\n" "to %s\n" msgstr "" +"Su vanad seaded kanti failist %s\n" +"üle faili %s\n" msgid "Search string not found" -msgstr "" +msgstr "Otsitavat stringi ei leitud" msgid "Not implemented yet" -msgstr "" +msgstr "Veel teostamata" msgid "Num of replace tokens not equal to num of found tokens" -msgstr "" +msgstr "Asendatavate sõnede arv erineb leitud sõnede arvust" #, c-format msgid "Invalid token number %d" -msgstr "" +msgstr "Vigane sõnede arv %d" msgid "Regular expression error" -msgstr "" +msgstr "Regulaaravaldise viga" msgid "No&rmal" -msgstr "" +msgstr "&Harilik" msgid "Re&gular expression" -msgstr "" +msgstr "&Regulaaravaldis" msgid "He&xadecimal" -msgstr "" +msgstr "Kuueteistkümnend" msgid "Wil&dcard search" -msgstr "" +msgstr "&Metamärkidega otsing" #, c-format msgid "" "Unable to load '%s' skin.\n" "Default skin has been loaded" msgstr "" +"Naha '%s' laadimine ebaõnnestus.\n" +"Laeti vaikimisi nahk" #, c-format msgid "" "Unable to parse '%s' skin.\n" "Default skin has been loaded" msgstr "" +"Naha '%s' parsimine ebaõnnestus.\n" +"Laeti vaikimisi nahk" #, c-format msgid "" @@ -136,469 +149,474 @@ "on non-256 colors terminal.\n" "Default skin has been loaded" msgstr "" +"256-värvi toega naha \"%s\" kasutamine terminalil,\n" +"mis ei toeta 256 värvi on võimatu.\n" +"Laeti vaikimisi nahk" msgid "Function key 1" -msgstr "" +msgstr "Klahv F1" msgid "Function key 2" -msgstr "" +msgstr "Klahv F2" msgid "Function key 3" -msgstr "" +msgstr "Klahv F3" msgid "Function key 4" -msgstr "" +msgstr "Klahv F4" msgid "Function key 5" -msgstr "" +msgstr "Klahv F5" msgid "Function key 6" -msgstr "" +msgstr "Klahv F6" msgid "Function key 7" -msgstr "" +msgstr "Klahv F7" msgid "Function key 8" -msgstr "" +msgstr "Klahv F8" msgid "Function key 9" -msgstr "" +msgstr "Klahv F9" msgid "Function key 10" -msgstr "" +msgstr "Klahv F10" msgid "Function key 11" -msgstr "" +msgstr "Klahv F11" msgid "Function key 12" -msgstr "" +msgstr "Klahv F12" msgid "Function key 13" -msgstr "" +msgstr "Klahv F13" msgid "Function key 14" -msgstr "" +msgstr "Klahv F14" msgid "Function key 15" -msgstr "" +msgstr "Klahv F15" msgid "Function key 16" -msgstr "" +msgstr "Klahv F16" msgid "Function key 17" -msgstr "" +msgstr "Klahv F17" msgid "Function key 18" -msgstr "" +msgstr "Klahv F18" msgid "Function key 19" -msgstr "" +msgstr "Klahv F19" msgid "Function key 20" -msgstr "" +msgstr "Klahv F20" msgid "Backspace key" -msgstr "" +msgstr "Tagasisamm" msgid "End key" -msgstr "" +msgstr "Klahv End" msgid "Up arrow key" -msgstr "" +msgstr "Nool üles" msgid "Down arrow key" -msgstr "" +msgstr "Nool alla" msgid "Left arrow key" -msgstr "" +msgstr "Nool vasakule" msgid "Right arrow key" -msgstr "" +msgstr "Nool paremale" msgid "Home key" -msgstr "" +msgstr "Klahv Home" msgid "Page Down key" -msgstr "" +msgstr "Klahv Page Down" msgid "Page Up key" -msgstr "" +msgstr "Klahv Page Up" msgid "Insert key" -msgstr "" +msgstr "Klahv Insert" msgid "Delete key" -msgstr "" +msgstr "Klahv Delete" msgid "Completion/M-tab" -msgstr "" +msgstr "Lõpetamine/M-Tab" msgid "Back Tabulation S-tab" -msgstr "" +msgstr "Tagurpidi tab. S-Tab" msgid "+ on keypad" -msgstr "" +msgstr "numbristiku +" msgid "- on keypad" -msgstr "" +msgstr "numbristiku -" msgid "Slash on keypad" -msgstr "" +msgstr "numbristiku /" msgid "* on keypad" -msgstr "" +msgstr "numbristiku *" msgid "Escape key" -msgstr "Pao klahv" +msgstr "Klahv Esc" msgid "Left arrow keypad" -msgstr "" +msgstr "numbristiku nool vasakule" msgid "Right arrow keypad" -msgstr "" +msgstr "numbristiku nool paremale" msgid "Up arrow keypad" -msgstr "" +msgstr "numbristiku nool ülesse" msgid "Down arrow keypad" -msgstr "" +msgstr "numbristiku nool alla" msgid "Home on keypad" -msgstr "" +msgstr "numbristiku Home" msgid "End on keypad" -msgstr "" +msgstr "numbristiku End" msgid "Page Down keypad" -msgstr "" +msgstr "numbristiku PgDn" msgid "Page Up keypad" -msgstr "" +msgstr "numbristiku PgUp" msgid "Insert on keypad" -msgstr "" +msgstr "numbristiku Ins" msgid "Delete on keypad" -msgstr "" +msgstr "numbristiku Del" msgid "Enter on keypad" -msgstr "" +msgstr "numbristiku Enter" msgid "Function key 21" -msgstr "" +msgstr "Klahv F21" msgid "Function key 22" -msgstr "" +msgstr "Klahv F22" msgid "Function key 23" -msgstr "" +msgstr "Klahv F23" msgid "Function key 24" -msgstr "" +msgstr "Klahv F24" msgid "A1 key" -msgstr "" +msgstr "Klahv A1" msgid "C1 key" -msgstr "" +msgstr "Klahv C1" msgid "Plus" -msgstr "" +msgstr "Pluss +" msgid "Minus" -msgstr "" +msgstr "Miinus -" msgid "Asterisk" -msgstr "" +msgstr "Tärn *" msgid "Dot" -msgstr "" +msgstr "Punkt ." msgid "Less than" -msgstr "" +msgstr "Väiksem kui <" msgid "Great than" -msgstr "" +msgstr "Suurem kui >" msgid "Equal" -msgstr "" +msgstr "Võrdub =" msgid "Comma" -msgstr "" +msgstr "Koma ," msgid "Apostrophe" -msgstr "" +msgstr "Ülakoma '" msgid "Colon" -msgstr "" +msgstr "Koolon :" msgid "Exclamation mark" -msgstr "Hüüumärk" +msgstr "Hüüumärk !" msgid "Question mark" -msgstr "Küsimärk" +msgstr "Küsimärk ?" msgid "Ampersand" -msgstr "" +msgstr "Ampersand &" msgid "Dollar sign" -msgstr "" +msgstr "Dollar $" msgid "Quotation mark" -msgstr "" +msgstr "Jutumärk \"" msgid "Percent sign" -msgstr "" +msgstr "Protsendi märk" msgid "Caret" -msgstr "" +msgstr "Katus ^" msgid "Tilda" -msgstr "" +msgstr "Tilde ~" msgid "Prime" -msgstr "" +msgstr "Priim ´" msgid "Underline" -msgstr "" +msgstr "Alljoon _" msgid "Understrike" -msgstr "" +msgstr "Läbilöök" msgid "Pipe" -msgstr "" +msgstr "Toru |" msgid "Left parenthesis" -msgstr "" +msgstr "Vasak sulg" msgid "Right parenthesis" -msgstr "" +msgstr "Parem sulg" msgid "Left bracket" -msgstr "" +msgstr "Vasak nurksulg" msgid "Right bracket" -msgstr "" +msgstr "Parem nurksulg" msgid "Left brace" -msgstr "" +msgstr "Vasak looksulg" msgid "Right brace" -msgstr "" +msgstr "Parem looksulg" msgid "Enter" -msgstr "" +msgstr "Klahv Enter" msgid "Tab key" -msgstr "" +msgstr "Klahv Tab" msgid "Space key" -msgstr "" +msgstr "Klahv Space" msgid "Slash key" -msgstr "" +msgstr "Kaldkriips /" msgid "Backslash key" -msgstr "" +msgstr "Tagurpidi kaldkriips \\" msgid "Number sign #" -msgstr "" +msgstr "Klahv #" #. TRANSLATORS: Please translate as in "at sign" (@). msgid "At sign" -msgstr "" +msgstr "Klahv @" msgid "Ctrl" -msgstr "" +msgstr "Klahv Ctrl" msgid "Alt" -msgstr "" +msgstr "AltKlahv Alt" msgid "Shift" -msgstr "" +msgstr "Klahv Shift" msgid "The TERM environment variable is unset!\n" -msgstr "" +msgstr "Keskkonnamuutujat TERM on määramata!\n" #, c-format msgid "" "Screen size %dx%d is not supported.\n" "Check the TERM environment variable.\n" msgstr "" +"Ekraani suurus %dx%d ei ole toetatud.\n" +"Kontrolli keskkonna muutujat TERM.\n" msgid "Warning" -msgstr "" +msgstr "Hoiatus" msgid "Pipe failed" -msgstr "" +msgstr "Funktsioon pipe ebaõnnestus" msgid "Dup failed" -msgstr "" +msgstr "Funktsioon dup ebaõnnestus" msgid "Error dup'ing old error pipe" -msgstr "" +msgstr "Tõrge vana veatoru paljundamisel" #, c-format msgid "Directory cache expired for %s" -msgstr "" +msgstr "Kataloogi %s vahemälu sisu on aegunud" msgid "bytes transferred" -msgstr "" +msgstr "baiti saadetud" msgid "Starting linear transfer..." -msgstr "" +msgstr "Alustatakse lineaarset saatmist..." msgid "Getting file" -msgstr "" +msgstr "Hangitakse faili" msgid "Changes to file lost" -msgstr "" +msgstr "Faili muudatused unustati" #, c-format msgid "%s is not a directory\n" -msgstr "" +msgstr "%s ei ole kataloog\n" #, c-format msgid "Directory %s is not owned by you\n" -msgstr "" +msgstr "Sa ei ole kataloogi %s omanik\n" #, c-format msgid "Cannot set correct permissions for directory %s\n" -msgstr "" +msgstr "Kataloogi %s loabittide määramine nurjus\n" #, c-format msgid "Cannot create temporary directory %s: %s\n" -msgstr "" +msgstr "Ajutise kataloogi %s loomine nurjus: %s\n" #, c-format msgid "Temporary files will be created in %s\n" -msgstr "" +msgstr "Ajutised failid luuakse kataloogis %s\n" #, c-format msgid "Temporary files will not be created\n" -msgstr "" +msgstr "Ajutisi faile ei looda\n" #, c-format msgid "Press any key to continue..." -msgstr "" +msgstr "Jätkamiseks vajuta suvalist klahvi..." msgid "Cannot parse:" -msgstr "" +msgstr "Ei saa parsida:" msgid "More parsing errors will be ignored." -msgstr "" +msgstr "Järgnevaid parsimise vigu eiratakse." msgid "Internal error:" -msgstr "" +msgstr "Sisemine viga:" msgid "Password:" -msgstr "" +msgstr "Salasõna:" msgid "Screens" -msgstr "" +msgstr "Ekraanid" msgid "History" -msgstr "" +msgstr "Ajalugu" #. TRANSLATORS: no need to translate 'DialogTitle', it's just a context prefix msgid "DialogTitle|History cleanup" -msgstr "" +msgstr "DialogTitle|Ajaloo kustutamine" msgid "Do you want clean this history?" -msgstr "" +msgstr "Kas sa soovid kustutada selle ajaloo?" msgid "&Yes" -msgstr "" +msgstr "&Jah" msgid "&No" -msgstr "" +msgstr "&Ei" msgid "&OK" -msgstr "" +msgstr "&Olgu" msgid "&Cancel" -msgstr "" +msgstr "&Tühista" msgid "Background process:" -msgstr "" +msgstr "Taustaprotsess:" msgid "Error" -msgstr "" +msgstr "Viga" msgid "Displays the current version" -msgstr "" +msgstr "Kuvab praeguse versiooni" msgid "Print data directory" -msgstr "" +msgstr "Trüki andmete kataloog" msgid "Print extended info about used data directories" -msgstr "" +msgstr "Trüki laiendatud informatsioon andmete kataloogide kasutamisest" msgid "Print configure options" -msgstr "" +msgstr "Trüki seadistuse valikud" msgid "Print last working directory to specified file" -msgstr "" +msgstr "Väljasta viimane töökataloog määratud faili" msgid "Enables subshell support (default)" -msgstr "" +msgstr "Lubab alamkesta toe (vaikimisi)" msgid "Disables subshell support" -msgstr "" +msgstr "Keelab alamkesta toe" msgid "Log ftp dialog to specified file" -msgstr "" +msgstr "Logi FTP dialoog määratud faili" msgid "Set debug level" -msgstr "" +msgstr "Määra silumistase" msgid "Launches the file viewer on a file" -msgstr "" +msgstr "Käivitab failivaaturi failile" msgid "Edit files" -msgstr "" +msgstr "Muuda faile" msgid "Forces xterm features" -msgstr "" +msgstr "Sunnib xterm'i tunnused" msgid "Disable X11 support" -msgstr "" +msgstr "Keela X11 tugi" msgid "Tries to use an old highlight mouse tracking" -msgstr "" +msgstr "Proovitakse kasutada vana esiletõstu hiire rada" msgid "Disable mouse support in text version" -msgstr "" +msgstr "Keela hiire tugi tekstirežiimis" msgid "Tries to use termcap instead of terminfo" -msgstr "" +msgstr "Proovib kasutada terminfo asemel termcap-i" msgid "To run on slow terminals" -msgstr "" +msgstr "Tööks aeglastel terminalidel" msgid "Use stickchars to draw" -msgstr "" +msgstr "Joonista joonestusmärkidega" msgid "Resets soft keys on HP terminals" -msgstr "" +msgstr "Lähtesta HP terminalidel seadistatavad klahvid" msgid "Load definitions of key bindings from specified file" -msgstr "" +msgstr "Lae klahvide seosed määratud failist" msgid "Don't load definitions of key bindings from file, use defaults" -msgstr "" +msgstr "Ära lae klahvide seoseid failist, vaid kasuta vaikeseadistust" msgid "Requests to run in black and white" -msgstr "" +msgstr "Keelab värvide kasutamise" msgid "Request to run in color mode" -msgstr "" +msgstr "Nõuab värvide kasutamist" msgid "Specifies a color configuration" -msgstr "" +msgstr "Määrab värvide seadistuse" msgid "Show mc with specified skin" -msgstr "" +msgstr "Kuva mc määratud nahaga" #. TRANSLATORS: don't translate keywords msgid "" @@ -621,6 +639,25 @@ " Viewer: viewbold, viewunderline, viewselected\n" " Help: helpnormal, helpitalic, helpbold, helplink, helpslink\n" msgstr "" +"--colors VÕTMESÕNA={EES},{TAGA},{TUNNUS}:VÕTMESÕNA2=...\n" +"\n" +"Väärtused {EES}, {TAGA} ja {TUNNUS} võib ära jätta; ärajäetud väärtuse kohal " +"kasutatakse vaikeväärtust.\n" +"\n" +"Võtmesõnad:\n" +" Üldised: errors, disabled, reverse, gauge, header\n" +" input, inputmark, inputunchanged, commandlinemark\n" +" bbarhotkey, bbarbutton, statusbar\n" +" Failide kuva: normal, selected, marked, markselect\n" +" Dialoogid: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" +" errdhotfocus\n" +" Menüüd: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" +" Hüpikmenüüd: pmenunormal, pmenusel, pmenutitle\n" +" Toimeti: editnormal, editbold, editmarked, editwhitespace,\n" +" editlinestate, editbg, editframe, editframeactive\n" +" editframedrag\n" +" Vaatur: viewbold, viewunderline, viewselected\n" +" Abi: helpnormal, helpitalic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -635,93 +672,110 @@ "Attributes:\n" " bold, underline, reverse, blink; append more with '+'\n" msgstr "" +"Standardvärvid:\n" +" black, gray, red, brightred, green, brightgreen, brown,\n" +" yellow, blue, brightblue, magenta, brightmagenta, cyan,\n" +" brightcyan, lightgray, white\n" +"\n" +"Laiendatud värvid, kui 256 värvi on kasutatavad:\n" +" color16 - color255, või rgb000 - rgb555 ja gray0 - gray23\n" +"\n" +"Tunnused:\n" +" bold, underline, reverse, blink; lisamiseks kasuta '+'\n" msgid "Color options" -msgstr "" +msgstr "Värvi seaded" msgid "+number" -msgstr "" +msgstr "+number" msgid "[this_dir] [other_panel_dir]" -msgstr "" +msgstr "[this_dir] [other_panel_dir]" msgid "Set initial line number for the internal editor" -msgstr "" +msgstr "Määra sisseehitatud toimeti esialgne reanumber" msgid "" "\n" "Please send any bug reports (including the output of 'mc -V')\n" "as tickets at www.midnight-commander.org\n" msgstr "" +"\n" +"Palun saada kõik vearaportid (ja käsu 'mc -V' väljund)\n" +"aadressile www.midnight-commander.org\n" #, c-format msgid "GNU Midnight Commander %s\n" -msgstr "" +msgstr "GNU Midnight Commander %s\n" msgid "Main options" -msgstr "" +msgstr "Põhiseaded" msgid "Terminal options" -msgstr "" +msgstr "Terminali seaded" msgid "Arguments parse error!" -msgstr "" +msgstr "Parameetrite parsimise viga!" msgid "No arguments given to the viewer." -msgstr "" +msgstr "Vaaturile parameetreid ei antud." msgid "Two files are required to evoke the diffviewer." -msgstr "" +msgstr "Erinevuste vaatamiseks on vaja kahte faili." msgid "Background process error" -msgstr "" +msgstr "Taustaprotsessi viga" msgid "Unknown error in child" -msgstr "" +msgstr "Tundmatu viga alamprotsessis" msgid "Child died unexpectedly" -msgstr "" +msgstr "Alamprotsess suri ootamatult" msgid "Background protocol error" -msgstr "" +msgstr "Tausta protokolli viga" msgid "Reading failed" -msgstr "" +msgstr "Lugemine ebaõnnestus" msgid "" "Background process sent us a request for more arguments\n" "than we can handle." msgstr "" +"Taustaprotsess saatis soovi enamatele parameetritele\n" +"kui me toetame." msgid "&Dismiss" -msgstr "" +msgstr "&Tühista" msgid "Enter search string:" -msgstr "" +msgstr "Sisesta otsingu sõne:" msgid "Cas&e sensitive" -msgstr "" +msgstr "&Tõstutundlik" msgid "&Backwards" -msgstr "" +msgstr "&Tagurpidi" msgid "&Whole words" -msgstr "" +msgstr "Terveid &sõnu" msgid "&All charsets" -msgstr "" +msgstr "&Kõik märgistikud" msgid "Search" -msgstr "" +msgstr "Otsing" msgid "Search is disabled" -msgstr "" +msgstr "Otsing on keelatud" #, c-format msgid "" "Cannot create temporary diff file\n" "%s" msgstr "" +"Ajutisw erinevuste faili loomine nurjus\n" +"%s" #, c-format msgid "" @@ -729,775 +783,798 @@ "%s%s\n" "%s" msgstr "" +"Varukoopia faili loomine nurjus\n" +"%s%s\n" +"%s" #, c-format msgid "" "Cannot create temporary merge file\n" "%s" msgstr "" +"Ajutise ühendfaili loomine nurjus\n" +"%s" msgid "&Fastest (Assume large files)" -msgstr "" +msgstr "&Kiireim (eelda suuri faile)" msgid "&Minimal (Find a smaller set of change)" -msgstr "" +msgstr "&Vähim (leia väikseim muudatuste hulk)" msgid "Diff algorithm" -msgstr "" +msgstr "Võrdlusalgoritm" msgid "Diff extra options" -msgstr "" +msgstr "Võrdluse lisaparameetrid" msgid "&Ignore case" -msgstr "" +msgstr "Tõstutundet&u" msgid "Ignore tab &expansion" -msgstr "" +msgstr "Eira tabulaatori &laiendamist" msgid "Ignore &space change" -msgstr "" +msgstr "Eira muutuseid &tühimikes" msgid "Ignore all &whitespace" -msgstr "" +msgstr "Eira kõiki &tühimikke" msgid "Strip &trailing carriage return" -msgstr "" +msgstr "Eemalda &realõpu kelgu tagasijooks" msgid "Diff Options" -msgstr "" +msgstr "Võrdluse parameetrid" msgid "Edit" -msgstr "" +msgstr "Muuda" msgid "Edit is disabled" -msgstr "" +msgstr "Muutmine on keelatud" msgid "Goto line (left)" -msgstr "" +msgstr "Mine reale (vasakul)" msgid "Goto line (right)" -msgstr "" +msgstr "Mine reale (paremal)" msgid "Enter line:" -msgstr "" +msgstr "Sisesta rida:" msgid "ButtonBar|Help" -msgstr "" +msgstr "ButtonBar|Abi" msgid "ButtonBar|Save" -msgstr "" +msgstr "ButtonBar|Salvesta" msgid "ButtonBar|Edit" -msgstr "" +msgstr "ButtonBar|Muuda" msgid "ButtonBar|Merge" -msgstr "" +msgstr "ButtonBar|Ühenda" msgid "ButtonBar|Search" -msgstr "" +msgstr "ButtonBar|Otsi" msgid "ButtonBar|Options" -msgstr "" +msgstr "ButtonBar|Seaded" msgid "ButtonBar|Quit" -msgstr "" +msgstr "ButtonBar|Välju" msgid "Quit" -msgstr "" +msgstr "Välju" msgid "File(s) was modified. Save with exit?" -msgstr "" +msgstr "Faili(e) on muudetud. Kas salvestada väljumisel?" msgid "" "Midnight Commander is being shut down.\n" "Save modified file(s)?" msgstr "" +"Midnight Commander on lõpetamas.\n" +"Kas salvestada muudetud fail(id)?" msgid "Diff:" -msgstr "" +msgstr "Erinevused:" #, c-format msgid "\"%s\" is a directory" -msgstr "" +msgstr "\"%s\" on kataloog" #, c-format msgid "" "Cannot stat \"%s\"\n" "%s" msgstr "" +"\"%s\" attribuutide päring nurjus\n" +"%s" msgid "Diff viewer: invalid mode" -msgstr "" +msgstr "Erinevuste vaatur: vale režiim" msgid "Two files are needed to compare" -msgstr "" +msgstr "Võrdlemiseks on vaja kahte faili" msgid "Choose syntax highlighting" -msgstr "" +msgstr "Valsi süntaksi esiletoomine" msgid "< Auto >" -msgstr "" +msgstr "" msgid "< Reload Current Syntax >" -msgstr "" +msgstr "" #, c-format msgid "Cannot open %s for reading" -msgstr "" +msgstr "Faili %s avamine lugemiseks nurjus" #, c-format msgid "Error reading %s" -msgstr "" +msgstr "Viga %s lugemisel" #, c-format msgid "Cannot get size/permissions for %s" -msgstr "" +msgstr "Faili %s suuruse/õiguste küsimine nurjus" #, c-format msgid "\"%s\" is not a regular file" -msgstr "" +msgstr "\"%s\" ei ole harilik fail" #, c-format msgid "" "File \"%s\" is too large.\n" "Open it anyway?" msgstr "" +"Fail \"%s\" on liiga suur.\n" +"Kas avada ta ikkagi?" #, c-format msgid "Error reading from pipe: %s" -msgstr "" +msgstr "Viga torust lugemisel: %s" #, c-format msgid "Cannot open pipe for reading: %s" -msgstr "" +msgstr "Toru avamine lugemiseks nurjus: %s" msgid "File has hard-links. Detach before saving?" -msgstr "" +msgstr "Failil on jäiku viitasid. Kas võtta need enne salvestamist lahti?" msgid "The file has been modified in the meantime. Save anyway?" -msgstr "" +msgstr "Faili on vahepeal muudetud. Kas ikkagi salvestada?" #, c-format msgid "Error writing to pipe: %s" -msgstr "" +msgstr "Viga torusse kirjutamisel: %s" #, c-format msgid "Cannot open pipe for writing: %s" -msgstr "" +msgstr "Toru avamine kirjutamiseks nurjus: %s" #, c-format msgid "Cannot open file for writing: %s" -msgstr "" +msgstr "Faili avamine kirjutamiseks nurjus: %s" msgid "The file you are saving is not finished with a newline" -msgstr "" +msgstr "Fail, mida salvestad, ei lõppe reavahetusega" msgid "C&ontinue" -msgstr "" +msgstr "&Jätka" msgid "&Do not change" -msgstr "" +msgstr "Ä&ra muuda" msgid "&Unix format (LF)" -msgstr "" +msgstr "&Unixi formaat (LF)" msgid "&Windows/DOS format (CR LF)" -msgstr "" +msgstr "&Windowsi/DOSi formaat (CR LF)" msgid "&Macintosh format (CR)" -msgstr "" +msgstr "&Macintoshi formaat (CR)" msgid "Enter file name:" -msgstr "" +msgstr "Sisesta faili nimi:" msgid "Change line breaks to:" -msgstr "" +msgstr "Vaheta reavahetused:" msgid "Save As" -msgstr "" +msgstr "Salvesta kui" msgid "Block is large, you may not be able to undo this action" -msgstr "" +msgstr "Plokk on suur, selle muudatuse tagasi võtmine võib ebaõnnestuda." msgid "&Quick save" -msgstr "" +msgstr "&Kiirsalvestus" msgid "&Safe save" -msgstr "" +msgstr "Kindel &salvestus" msgid "&Do backups with following extension:" -msgstr "" +msgstr "&Varukoopia faili laiend:" msgid "Check &POSIX new line" -msgstr "" +msgstr "Kontrolli &POSIXi uus rida" msgid "Edit Save Mode" -msgstr "" +msgstr "Muuda salvestusrežiim" msgid "Save as" -msgstr "" +msgstr "Salvesta kui" msgid "Cannot save: destination is not a regular file" -msgstr "" +msgstr "Salvestamine nurjus: sihtkoht ei ole harilik fail" msgid "A file already exists with this name" -msgstr "" +msgstr "Sellise nimega fail on juba olemas" msgid "&Overwrite" -msgstr "" +msgstr "K&irjuta üle" msgid "Cannot save file" -msgstr "" +msgstr "Faili salvestamine nurjus" msgid "Delete macro" -msgstr "" +msgstr "Kustuta makro" msgid "Press macro hotkey:" -msgstr "" +msgstr "Vajuta makro kiirklahv:" msgid "Macro not deleted" -msgstr "" +msgstr "Makrot ei kustutatud" msgid "Save macro" -msgstr "" +msgstr "Salvesta makro" msgid "Press the macro's new hotkey:" -msgstr "" +msgstr "Vajuta makro uus kiirklahv:" msgid "Repeat last commands" -msgstr "" +msgstr "Korda viimaseid käske" msgid "Repeat times:" -msgstr "" +msgstr "Korduste arv:" #, c-format msgid "Confirm save file: \"%s\"" -msgstr "" +msgstr "Kinnita faili salvestamine: \"%s\"" msgid "Save file" -msgstr "" +msgstr "Salvesta fail" msgid "&Save" -msgstr "" +msgstr "&Salvesta" msgid "Load" -msgstr "" +msgstr "Laadi" msgid "Syntax file edit" -msgstr "" +msgstr "Süntaksifaili muutmine" msgid "Which syntax file you want to edit?" -msgstr "" +msgstr "Millist süntaksifaili soovid muuta?" msgid "&User" -msgstr "" +msgstr "&Kasutaja" msgid "&System wide" -msgstr "" +msgstr "&Süsteemne" msgid "Menu edit" -msgstr "" +msgstr "Menüü muutmine" msgid "Which menu file do you want to edit?" -msgstr "" +msgstr "Millist menüü failidi soovid muuta?" msgid "&Local" -msgstr "" +msgstr "&Kohalik" msgid "Replace" -msgstr "" +msgstr "Asenda" #, c-format msgid "%ld replacements made" -msgstr "" +msgstr "Teostati %ld asendust" msgid "[NoName]" -msgstr "" +msgstr "[Nimetu]" #, c-format msgid "" "File %s was modified.\n" "Save before close?" msgstr "" +"Faili %s on muudetud.\n" +"Kas salvestada enne sulgemist?" msgid "Close file" -msgstr "" +msgstr "Sulge fail" #, c-format msgid "" "Midnight Commander is being shut down.\n" "Save modified file %s?" msgstr "" +"Midnight Commander on lõpetamas.\n" +"Kas salvestada muudetud fail %s?" msgid "This function is not implemented" -msgstr "" +msgstr "See funktsioon ei ole valmis" msgid "Copy to clipboard" -msgstr "" +msgstr "Kopeeri lõikepuhvrisse" msgid "Unable to save to file" -msgstr "" +msgstr "Faili ei saa salvestada" msgid "Cut to clipboard" -msgstr "" +msgstr "Lõika lõikepuhvrisse" msgid "Goto line" -msgstr "" +msgstr "Mine reale" msgid "Save block" -msgstr "" +msgstr "Salvesta plokk" msgid "Insert file" -msgstr "" +msgstr "Lisa fail" msgid "Cannot insert file" -msgstr "" +msgstr "Faili lisamine nurjus" msgid "Sort block" -msgstr "" +msgstr "Sordi plokk" msgid "You must first highlight a block of text" -msgstr "" +msgstr "Esmalt vali tekstiplokk" msgid "Run sort" -msgstr "" +msgstr "Räivita sortimine" msgid "Enter sort options (see manpage) separated by whitespace:" -msgstr "" +msgstr "Sisesta sortimise parameetrid (loe manuaalist) tüheikutega eraldatult:" msgid "Sort" -msgstr "" +msgstr "Sorteeri" msgid "Cannot execute sort command" -msgstr "" +msgstr "Käsu sort käivitamine nurjus" #, c-format msgid "Sort returned non-zero: %s" -msgstr "" +msgstr "Sort tagastas mittenulli: %s" msgid "Paste output of external command" -msgstr "" +msgstr "Aseta välise käsu väljund" msgid "Enter shell command(s):" -msgstr "" +msgstr "Sisesta kesta käsk(ud):" msgid "External command" -msgstr "" +msgstr "Väline käsk" msgid "Cannot execute command" -msgstr "" +msgstr "Käsu käivitamine nurjus" msgid "mail -s -c " -msgstr "" +msgstr "mail -s -c " msgid "To" -msgstr "" +msgstr "Saaja" msgid "Subject" -msgstr "" +msgstr "Teema" msgid "Copies to" -msgstr "" +msgstr "Koopiad" msgid "Mail" -msgstr "" +msgstr "E-post" msgid "Insert literal" -msgstr "" +msgstr "Lisa täht-täheline" msgid "Press any key:" -msgstr "" +msgstr "Vajuta suvalist klahvi:" msgid "" "Current text was modified without a file save.\n" "Continue discards these changes" msgstr "" +"Tekstis on salvestamata muudatusi.\n" +"Jätkamine kustutab need muudatused" msgid "In se&lection" -msgstr "" +msgstr "&Valikus" msgid "&Find all" -msgstr "" +msgstr "&Otsi kõikjalt" msgid "Enter replacement string:" -msgstr "" +msgstr "Sisesta asendus string:" msgid "Replace with:" -msgstr "" +msgstr "Asenda:" msgid "&Replace" -msgstr "" +msgstr "&Asenda" msgid "A&ll" -msgstr "" +msgstr "&Kõik" msgid "&Skip" -msgstr "" +msgstr "&Jäta vahele" msgid "Confirm replace" -msgstr "" +msgstr "Kinnita asendamine" msgid "Cancel" -msgstr "" +msgstr "Tühista" msgid "" "Current text was modified without a file save.\n" "Continue discards these changes." msgstr "" +"Teksti on muudetud faili salvestamata.\n" +"Jätkamine viskab muudatused ära." msgid "NoName" -msgstr "" +msgstr "Nimetu" msgid "&Open file..." -msgstr "" +msgstr "&Ava fail..." msgid "&New" -msgstr "" +msgstr "&Uus" msgid "&Close" -msgstr "" +msgstr "&Sulge" msgid "Save &as..." -msgstr "" +msgstr "Salvesta &kui..." msgid "&Insert file..." -msgstr "" +msgstr "&Sisesta fail..." msgid "Cop&y to file..." -msgstr "" +msgstr "K&opeeri faili..." msgid "&User menu..." -msgstr "" +msgstr "&Kasutaja menüü..." msgid "A&bout..." -msgstr "" +msgstr "&Programmist..." msgid "&Quit" -msgstr "" +msgstr "&Välju" msgid "&Undo" -msgstr "" +msgstr "&Võta tagasi" msgid "&Redo" -msgstr "" +msgstr "&Tee uuesti" msgid "&Toggle ins/overw" -msgstr "" +msgstr "&Lülita lisa/ülek" msgid "To&ggle mark" -msgstr "" +msgstr "Lül&ita märkimine" msgid "&Mark columns" -msgstr "" +msgstr "&Märgi veerud" msgid "Mark &all" -msgstr "" +msgstr "Märgi &kõik" msgid "Unmar&k" -msgstr "" +msgstr "&Tühista märkimine" msgid "Cop&y" -msgstr "" +msgstr "&Kopeeri" msgid "Mo&ve" -msgstr "" +msgstr "&Teisalda" msgid "&Delete" -msgstr "" +msgstr "K&ustuta" msgid "Co&py to clipfile" -msgstr "" +msgstr "Kopeeri &faili" msgid "&Cut to clipfile" -msgstr "" +msgstr "Lõika f&aili" msgid "Pa&ste from clipfile" -msgstr "" +msgstr "A&seta failist" msgid "&Beginning" -msgstr "" +msgstr "&Algusesse" msgid "&End" -msgstr "" +msgstr "&Lõppu" msgid "&Search..." -msgstr "" +msgstr "&Otsi..." msgid "Search &again" -msgstr "" +msgstr "Otsi &uuesti" msgid "&Replace..." -msgstr "" +msgstr "&Asenda" msgid "&Toggle bookmark" -msgstr "" +msgstr "&Lülita järjehoidja" msgid "&Next bookmark" -msgstr "" +msgstr "&Järgmine järjehoidja" msgid "&Prev bookmark" -msgstr "" +msgstr "&Eelmine järjehoidja" msgid "&Flush bookmarks" -msgstr "" +msgstr "&Tühjenda kohaviidad" msgid "&Go to line..." -msgstr "" +msgstr "&Mine reale..." msgid "&Toggle line state" -msgstr "" +msgstr "Lülita &rea olek" msgid "Go to matching &bracket" -msgstr "" +msgstr "Mine vastavale &nurksulule" msgid "Toggle s&yntax highlighting" -msgstr "" +msgstr "Lülita &süntaksi esiletõst" msgid "&Find declaration" -msgstr "" +msgstr "&Leia deklaratsioon" msgid "Back from &declaration" -msgstr "" +msgstr "&Deklaratsioonist tagasi" msgid "For&ward to declaration" -msgstr "" +msgstr "D&eklaratsioonile edasi" msgid "Encod&ing..." -msgstr "" +msgstr "&Kodeering..." msgid "&Refresh screen" -msgstr "" +msgstr "&Värskenda kuva" msgid "&Start/Stop record macro" -msgstr "" +msgstr "&Alusta/lõpeta makro salvestamine" msgid "Delete macr&o..." -msgstr "" +msgstr "Kustuta makr&o..." msgid "Record/Repeat &actions" -msgstr "" +msgstr "Salvesta/korda &tegevusi" msgid "S&pell check" -msgstr "" +msgstr "Õ&igekirja kontroll" msgid "C&heck word" -msgstr "" +msgstr "Kontrolli &sõna" msgid "Change spelling &language..." -msgstr "" +msgstr "Õigekirja kontrolli &keele vahetamine..." msgid "&Mail..." -msgstr "" +msgstr "&E-post..." msgid "Insert &literal..." -msgstr "" +msgstr "Lisa täht-täheline..." msgid "Insert &date/time" -msgstr "" +msgstr "Sisesta &kuupäev/kellaaeg" msgid "&Format paragraph" -msgstr "" +msgstr "&Vorminda lõik" msgid "&Sort..." -msgstr "" +msgstr "&Sordi..." msgid "&Paste output of..." -msgstr "" +msgstr "&Aseta väljund..." msgid "&External formatter" -msgstr "" +msgstr "&Väline vormindaja" msgid "&Move" -msgstr "" +msgstr "&Teisalda" msgid "&Resize" -msgstr "" +msgstr "Suu&ruse muutmine" msgid "&Toggle fullscreen" -msgstr "" +msgstr "&Lülita täisekraan" msgid "&Next" -msgstr "" +msgstr "&Järgmine" msgid "&Previous" -msgstr "" +msgstr "&Eelmine" msgid "&List..." -msgstr "" +msgstr "&Näita..." msgid "&General..." -msgstr "" +msgstr "&Üldine..." msgid "Save &mode..." -msgstr "" +msgstr "&Salvestusrežiim..." msgid "Learn &keys..." -msgstr "" +msgstr "&Klahvide õppimine..." msgid "Syntax &highlighting..." -msgstr "" +msgstr "Süntaksi &esiletõstmine..." msgid "S&yntax file" -msgstr "" +msgstr "Sü&ntaksi fail" msgid "&Menu file" -msgstr "" +msgstr "&Menüü fail" msgid "&Save setup" -msgstr "" +msgstr "&Salvesta seaded" msgid "&File" -msgstr "" +msgstr "&Fail" msgid "&Edit" -msgstr "" +msgstr "&Muuda" msgid "&Search" -msgstr "" +msgstr "&Otsi" msgid "&Command" -msgstr "" +msgstr "&Käsud" msgid "For&mat" -msgstr "" +msgstr "&Vorminda" msgid "&Window" -msgstr "" +msgstr "&Aken" msgid "&Options" -msgstr "" +msgstr "&Seaded" msgid "&None" -msgstr "" +msgstr "&Puudub" msgid "&Dynamic paragraphing" -msgstr "" +msgstr "&Dünaamiline lõiguloome" msgid "Type &writer wrap" -msgstr "" +msgstr "&Staatiline rea murdmine" msgid "Wrap mode" -msgstr "" +msgstr "Rea murdmine" msgid "Tabulation" -msgstr "" +msgstr "Tabulatsioon" msgid "&Fake half tabs" -msgstr "" +msgstr "&Võltsid pooltabulaatorid" msgid "&Backspace through tabs" -msgstr "" +msgstr "&Tagasisamm läbi tabulaatorite" msgid "Fill tabs with &spaces" -msgstr "" +msgstr "&Asenda tabulaatorid tühikutega" msgid "Tab spacing:" -msgstr "" +msgstr "Tabulaatori pikkus:" msgid "Other options" -msgstr "" +msgstr "Muud seaded" msgid "&Return does autoindent" -msgstr "" +msgstr "&Return trepib automaatselt" msgid "Confir&m before saving" -msgstr "" +msgstr "&Enne salvestamist küsi kinnitust" msgid "Save file &position" -msgstr "" +msgstr "Salvesta &asukoht failis" msgid "&Visible trailing spaces" -msgstr "" +msgstr "&Nähtavad lõputühikud" msgid "Visible &tabs" -msgstr "" +msgstr "Nähtavad &tabulaatorid" msgid "Synta&x highlighting" -msgstr "" +msgstr "Süntaksi &esiletõstmine" msgid "C&ursor after inserted block" -msgstr "" +msgstr "Ku&rsor lisatud ploki lõppu" msgid "Pers&istent selection" -msgstr "" +msgstr "Püs&iv valik" msgid "Cursor be&yond end of line" -msgstr "" +msgstr "Kursor üle &faili lõpu" msgid "&Group undo" -msgstr "" +msgstr "&Grupi tagasivõtt" msgid "Word wrap line length:" -msgstr "" +msgstr "Sõna täpsusega reavahetuse rea pikkus:" msgid "Editor options" -msgstr "" +msgstr "Redaktori seaded" msgid "" "A user friendly text editor\n" "written for the Midnight Commander." msgstr "" +"Kasutajasõbralik tekstitoimeti, mis\n" +"on loodud Midnight Commanderile." msgid "Copyright (C) 1996-2013 the Free Software Foundation" -msgstr "" +msgstr "Kopeerimisõigus (C) 1996-2013 Free Software Foundation" msgid "About" -msgstr "" +msgstr "Programmist" msgid "Open files" -msgstr "" +msgstr "Ava fail" msgid "Edit: " -msgstr "" +msgstr "Muuda:" msgid "ButtonBar|Mark" -msgstr "" +msgstr "ButtonBar|Märgi" msgid "ButtonBar|Replac" -msgstr "" +msgstr "ButtonBar|Asenda" msgid "ButtonBar|Copy" -msgstr "" +msgstr "ButtonBar|Koopia" msgid "ButtonBar|Move" -msgstr "" +msgstr "ButtonBar|Teisal" msgid "ButtonBar|Delete" -msgstr "" +msgstr "ButtonBar|Kustuta" msgid "ButtonBar|PullDn" -msgstr "" +msgstr "ButtonBar|Menüü" msgid "&Add word" -msgstr "" +msgstr "&Lisa sõna" msgid "Language" -msgstr "" +msgstr "Keel" msgid "Misspelled" -msgstr "" +msgstr "Vigane" msgid "Check word" -msgstr "" +msgstr "Kontrolli sõna" msgid "Suggest" -msgstr "" +msgstr "Soovita" msgid "Select language" -msgstr "" +msgstr "Vali keel" msgid "Load syntax file" -msgstr "" +msgstr "Lae süntaksi fail" #, c-format msgid "" "Cannot open file %s\n" "%s" msgstr "" +"Faili %s avamine nurjus\n" +" %s" #, c-format msgid "Error in file %s on line %d" -msgstr "" +msgstr "Viga failis %s real %d" msgid "" "The Commander can't change to the directory that\n" @@ -1505,203 +1582,210 @@ "deleted your working directory, or given yourself\n" "extra access permissions with the \"su\" command?" msgstr "" +"Commander ei saa minna kataloogi, milles alamkest\n" +"väidab su olevat. Võib-olla oled kustutanud töökataloogi,\n" +"või oled andnud endale täiendavad õigused käsuga \"su\"?" #, c-format msgid "Cannot fetch a local copy of %s" -msgstr "" +msgstr "Kohaliku koopia hankimine %s'st nurjus" msgid "The shell is already running a command" -msgstr "" +msgstr "Kest on hõivatud käsu täitmisega" #, c-format msgid "Type 'exit' to return to the Midnight Commander" -msgstr "" +msgstr "Midnight Commanderisse tagasipöördumiseks sisesta 'exit'" msgid "Set &all" -msgstr "" +msgstr "Määra &kõik" msgid "S&kip" -msgstr "" +msgstr "&Jäta vahele" msgid "&Set" -msgstr "" +msgstr "&Määra" msgid "owner" -msgstr "" +msgstr "omanik" msgid "group" -msgstr "" +msgstr "grupp" msgid "other" -msgstr "" +msgstr "teised" msgid "Flag" -msgstr "" +msgstr "Lipp" msgid "Chown advanced command" -msgstr "" +msgstr "Keerukas omanikuvahetus" #, c-format msgid "" "Cannot chmod \"%s\"\n" "%s" msgstr "" +"\"%s\" õiguste muutmine nurjus\n" +"%s" #, c-format msgid "" "Cannot chown \"%s\"\n" "%s" msgstr "" +"\"%s\" omaniku vahetus nurjus:\n" +"%s" msgid "Other 8 bit" -msgstr "" +msgstr "Muu 8-bitine" msgid "Running" -msgstr "" +msgstr "Töötab" msgid "Stopped" -msgstr "" +msgstr "Peatatud" msgid "&Never" -msgstr "" +msgstr "&Mitte kunagi" msgid "On dum&b terminals" -msgstr "" +msgstr "&Rumalal terminalil" msgid "Alwa&ys" -msgstr "" +msgstr "&Alati" msgid "File operations" -msgstr "" +msgstr "Tegevused failiga" msgid "&Verbose operation" -msgstr "" +msgstr "&Selgitav tegutsemine" msgid "Compute tota&ls" -msgstr "" +msgstr "Arvuta kogu&summad" msgid "Classic pro&gressbar" -msgstr "" +msgstr "Klassikaline &edenemisriba" msgid "Mkdi&r autoname" -msgstr "" +msgstr "&Automaatne kataloogi nimi" msgid "&Preallocate space" -msgstr "" +msgstr "&Ruumi eelhankimine" msgid "Esc key mode" -msgstr "" +msgstr "Klahvi Esc režiim" msgid "S&ingle press" -msgstr "" +msgstr "Ü&ks vajutus" msgid "Timeout:" -msgstr "" +msgstr "Ajapiirang:" msgid "Pause after run" -msgstr "" +msgstr "Paus pärast käsku" msgid "Use internal edi&t" -msgstr "" +msgstr "Kasuta sisemist &toimetit" msgid "Use internal vie&w" -msgstr "" +msgstr "Kasuta sisemist k&uvajat" msgid "A&sk new file name" -msgstr "" +msgstr "Küsi &uue faili nime" msgid "Auto m&enus" -msgstr "" +msgstr "Automaatsed m&enüüd" msgid "&Drop down menus" -msgstr "" +msgstr "&Rippmenüüd" msgid "S&hell patterns" -msgstr "" +msgstr "K&esta mustrid" msgid "Co&mplete: show all" -msgstr "" +msgstr "&Lõpetamine: kuva kõik" msgid "Rotating d&ash" -msgstr "" +msgstr "Pöörlev kriip&s" msgid "Cd follows lin&ks" -msgstr "" +msgstr "&Järgi kataloogide nimeviitu" msgid "Sa&fe delete" -msgstr "" +msgstr "&Kindel kustutamine" msgid "A&uto save setup" -msgstr "" +msgstr "Seadete a&utomaatsalvestus" msgid "Configure options" -msgstr "" +msgstr "Valikute seadistamine" msgid "Case &insensitive" -msgstr "" +msgstr "&Tõstutundetu" msgid "Use panel sort mo&de" -msgstr "" +msgstr "Kasuta &paneeli sortimist" msgid "Show mi&ni-status" -msgstr "" +msgstr "Kuva mi&ni-olek" msgid "Use SI si&ze units" -msgstr "" +msgstr "Kasuta SI ü&hikuid" msgid "Mi&x all files" -msgstr "" +msgstr "Se&ga kõik failid" msgid "Show &backup files" -msgstr "" +msgstr "Kuva &varukoopia failid" msgid "Show &hidden files" -msgstr "" +msgstr "Kuva &peidetud failid" msgid "&Fast dir reload" -msgstr "" +msgstr "&Kiire kataloogide taaslaadimine" msgid "Ma&rk moves down" -msgstr "" +msgstr "Mä&rkimine liigutab alla" msgid "Re&verse files only" -msgstr "" +msgstr "&Tagurpidi ainult failid" msgid "Simple s&wap" -msgstr "" +msgstr "&Lihtne vahetus" msgid "A&uto save panels setup" -msgstr "" +msgstr "Paneelide seadete a&utomaatsalvestus" msgid "Navigation" -msgstr "" +msgstr "Navigeerimine" msgid "L&ynx-like motion" -msgstr "" +msgstr "L&ynxilik liikumine" msgid "Pa&ge scrolling" -msgstr "" +msgstr "&Lehekülje kerimine" msgid "&Mouse page scrolling" -msgstr "" +msgstr "&Hiirega lehekülje kerimine" msgid "File highlight" -msgstr "" +msgstr "Failide esiletõst" msgid "File &types" -msgstr "" +msgstr "Faili &tüübid" msgid "&Permissions" -msgstr "" +msgstr "Õ&igused" msgid "Quick search" -msgstr "" +msgstr "Kiirotsing" msgid "Panel options" -msgstr "" +msgstr "Paneeli seaded" msgid "Information" -msgstr "" +msgstr "Informatsioon" msgid "" "Using the fast reload option may not reflect the exact\n" @@ -1709,427 +1793,440 @@ "manual reload of the directory. See the man page for\n" "the details." msgstr "" +"Kiirlaadimine ei pruugi kajastada kataloogi täpset sisu.\n" +"Sellisel juhul pead kataloogi sisu käsitsi uuendama.\n" +"Lisainfor leiad manuaalist." msgid "&Full file list" -msgstr "" +msgstr "&Täielik failide loend" msgid "&Brief file list" -msgstr "" +msgstr "&Lühike failide loend" msgid "&Long file list" -msgstr "" +msgstr "&Pikk failide loend" msgid "&User defined:" -msgstr "" +msgstr "&Kasutaja määratud:" msgid "User &mini status" -msgstr "" +msgstr "Kasutaja &mini info" msgid "Listing mode" -msgstr "" +msgstr "Loendi režiim" msgid "Executable &first" -msgstr "" +msgstr "Käivitatavad &esimestena" msgid "&Reverse" -msgstr "" +msgstr "&Tagurpidi" msgid "Sort order" -msgstr "" +msgstr "Sortimise järjekord" #. TRANSLATORS: no need to translate 'Confirmation', it's just a context prefix msgid "Confirmation|&Delete" -msgstr "" +msgstr "Confirmation|&Kustuta" msgid "Confirmation|O&verwrite" -msgstr "" +msgstr "Confirmation|Ü&lekirjutamine" msgid "Confirmation|&Execute" -msgstr "" +msgstr "Confirmation|&Käivitamine" msgid "Confirmation|E&xit" -msgstr "" +msgstr "Confirmation|&Väljumine" msgid "Confirmation|Di&rectory hotlist delete" -msgstr "" +msgstr "Confirmation|K&ataloogi kiirvaliku kustutamine" msgid "Confirmation|&History cleanup" -msgstr "" +msgstr "Confirmation|&Ajalugu" msgid "Confirmation" -msgstr "" +msgstr "Kinnitus" msgid "&UTF-8 output" -msgstr "" +msgstr "&UTF-8 väljund" msgid "&Full 8 bits output" -msgstr "" +msgstr "&Täis 8-bitine väljund" msgid "&ISO 8859-1" -msgstr "" +msgstr "&ISO 8859-1" msgid "7 &bits" -msgstr "" +msgstr "7 &bitti" msgid "F&ull 8 bits input" -msgstr "" +msgstr "&Täis 8-bitine sisend" msgid "Display bits" -msgstr "" +msgstr "Kuva bitlisus" msgid "Input / display codepage:" -msgstr "" +msgstr "Sisend/kuva kooditabel:" msgid "&Select" -msgstr "" +msgstr "&Vali" msgid "Directory tree" -msgstr "" +msgstr "Kataloogipuu" msgid "Timeout for freeing VFSs (sec):" -msgstr "" +msgstr "VFSde vabastamise aegumine (sek):" msgid "FTP anonymous password:" -msgstr "" +msgstr "FTP anonüümne salasõna:" msgid "FTP directory cache timeout (sec):" -msgstr "" +msgstr "FTP Kataloogi puhvri aegumine (sek):" msgid "&Always use ftp proxy:" -msgstr "" +msgstr "Kasuta &alati FTP puhvrit:" msgid "&Use ~/.netrc" -msgstr "" +msgstr "~/.netrc &kasutamine" msgid "Use &passive mode" -msgstr "" +msgstr "Kasuta &passiivset režiimi" msgid "Use passive mode over pro&xy" -msgstr "" +msgstr "Kasuta p&roksiga passiivset režiimi" msgid "Virtual File System Setting" -msgstr "" +msgstr "Virtuaalsete failisüsteemide seaded" msgid "cd" -msgstr "" +msgstr "cd" msgid "Quick cd" -msgstr "" +msgstr "Kiire cd" msgid "Existing filename (filename symlink will point to):" -msgstr "" +msgstr "Fail, millele nimeviit viitab:" msgid "Symbolic link filename:" -msgstr "" +msgstr "Nimeviida nimi:" msgid "Symbolic link" -msgstr "" +msgstr "Nimeviit" msgid "&Stop" -msgstr "" +msgstr "&Peata" msgid "&Resume" -msgstr "" +msgstr "&Jätka" msgid "&Kill" -msgstr "" +msgstr "&Tapa" msgid "Background jobs" -msgstr "" +msgstr "Tööd taustal" #, c-format msgid "Password for \\\\%s\\%s" -msgstr "" +msgstr "Salasõna teenusele \\\\%s\\%s" msgid "Domain:" -msgstr "" +msgstr "Domeen:" msgid "Username:" -msgstr "" +msgstr "Kasutaja:" msgid "SMB authentication" -msgstr "" +msgstr "SMB autentimine" msgid "set &user ID on execution" -msgstr "" +msgstr "kas&utaja ID käivitamisel" msgid "set &group ID on execution" -msgstr "" +msgstr "&grupi ID käivitamisel" msgid "stick&y bit" -msgstr "" +msgstr "kleepuv &bitt" msgid "&read by owner" -msgstr "" +msgstr "omanik võib &lugeda" msgid "&write by owner" -msgstr "" +msgstr "omanik võib &kirjutada" msgid "e&xecute/search by owner" -msgstr "" +msgstr "omanik võib kä&ivitada/otsida" msgid "rea&d by group" -msgstr "" +msgstr "grupp võib l&ugeda" msgid "write by grou&p" -msgstr "" +msgstr "grupp võib k&irjutada" msgid "execu&te/search by group" -msgstr "" +msgstr "grupp võib käi&vitada/otsida" msgid "read &by others" -msgstr "" +msgstr "teised võivad lu&geda" msgid "wr&ite by others" -msgstr "" +msgstr "teised võivad ki&rjutada" msgid "execute/searc&h by others" -msgstr "" +msgstr "teised võivad käivi&tada/otsida" msgid "Name:" -msgstr "" +msgstr "Nimi:" msgid "Permissions (octal):" -msgstr "" +msgstr "Õigused (8nd süsteemis):" msgid "Owner name:" -msgstr "" +msgstr "Omaniku nimi:" msgid "Group name:" -msgstr "" +msgstr "Grupi nimi:" msgid "&Marked all" -msgstr "" +msgstr "&Vali kõik" msgid "S&et marked" -msgstr "" +msgstr "&Määra valik" msgid "C&lear marked" -msgstr "" +msgstr "Tü&hista valik" msgid "Chmod command" -msgstr "" +msgstr "Õiguste muutmise käsk" msgid "Permission" -msgstr "" +msgstr "Õigused" msgid "File" -msgstr "" +msgstr "Fail" msgid "Set &groups" -msgstr "" +msgstr "Määra &grupid" msgid "Set &users" -msgstr "" +msgstr "Määra &kasutajad" msgid "Name" -msgstr "" +msgstr "Nimi" msgid "Owner name" -msgstr "" +msgstr "Omaniku nimi" msgid "Group name" -msgstr "" +msgstr "Grupi nimi" msgid "Size" -msgstr "" +msgstr "Suurus" msgid "Chown command" -msgstr "" +msgstr "Omaniku vahetus" msgid "User name" -msgstr "" +msgstr "Kasutaja nimi" msgid "" -msgstr "" +msgstr "" msgid "" -msgstr "" +msgstr "" msgid "Enter machine name (F1 for details):" -msgstr "" +msgstr "Sisesta masina nimi (F1 - lisainfo):" msgid "Files tagged, want to cd?" -msgstr "" +msgstr "Failid märgitud, soovid kataloogi vahetada?" msgid "Cannot change directory" -msgstr "" +msgstr "Kataloogi vahetamine nurjus" msgid "Filter" -msgstr "" +msgstr "Filter" msgid "Set expression for filtering filenames" -msgstr "" +msgstr "Määra failinimede filtri väljend" msgid "&Files only" -msgstr "" +msgstr "&Ainult failid" msgid "&Using shell patterns" -msgstr "" +msgstr "&Kasutades kesta mustreid" msgid "&Case sensitive" -msgstr "" +msgstr "&Tõstutundlik" #, c-format msgid "Link %s to:" -msgstr "" +msgstr "Loo link %s:" msgid "Link" -msgstr "" +msgstr "Link" #, c-format msgid "link: %s" -msgstr "" +msgstr "link: %s" #, c-format msgid "symlink: %s" -msgstr "" +msgstr "nimeviit: %s" #, c-format msgid "Cannot chdir to \"%s\"" -msgstr "" +msgstr "Kataloogi \"%s\" sisenemine nurjus" msgid "View file" -msgstr "" +msgstr "Vaata faili" msgid "Filename:" -msgstr "" +msgstr "Faili nimi:" msgid "Filtered view" -msgstr "" +msgstr "Filtreeritud vaade" msgid "Filter command and arguments:" -msgstr "" +msgstr "Filtreerimiskäsk ja parameetrid:" msgid "Edit file" -msgstr "" +msgstr "Muuda faili" msgid "Create a new Directory" -msgstr "" +msgstr "Loo uus kataloog" msgid "Enter directory name:" -msgstr "" +msgstr "Sisesta kataloogi nimi:" msgid "Select" -msgstr "" +msgstr "Vali" msgid "Unselect" -msgstr "" +msgstr "Tühista valik" msgid "Extension file edit" -msgstr "" +msgstr "Laiendite faili muutmine" msgid "Which extension file you want to edit?" -msgstr "" +msgstr "Millist laiendite faili soovid muuta?" msgid "&System Wide" -msgstr "" +msgstr "&Süsteemne" msgid "Highlighting groups file edit" -msgstr "" +msgstr "Esiletõstu gruppide faili muutmine" msgid "Which highlighting file you want to edit?" -msgstr "" +msgstr "Millist esiletõstu faili soovid muuta?" msgid "Compare directories" -msgstr "" +msgstr "Kataloogide võrdlemine" msgid "Select compare method:" -msgstr "" +msgstr "Vali võrdlusmeetod:" msgid "&Quick" -msgstr "" +msgstr "&Kiire" msgid "&Size only" -msgstr "" +msgstr "&Ainult suurus" msgid "&Thorough" -msgstr "" +msgstr "&Põhjalik" msgid "" "Both panels should be in the listing mode\n" "to use this command" msgstr "" +"Selle käsu kasutamiseks peaksid mõlemad\n" +"paneelid kuvama failide loendit" msgid "" "Not an xterm or Linux console;\n" "the panels cannot be toggled." msgstr "" +"Sa ei kasuta xtermi või Linuxi konsooli;\n" +"paneele ei saa kuvada/peita." #, c-format msgid "Symlink '%s' points to:" -msgstr "" +msgstr "Nimeviit \"%s\" viitab:" msgid "Edit symlink" -msgstr "" +msgstr "Muuda nimeviita" #, c-format msgid "edit symlink, unable to remove %s: %s" -msgstr "" +msgstr "nimeviida muutmine: %s eemaldamine ebaõnnestus: %s" #, c-format msgid "edit symlink: %s" -msgstr "" +msgstr "nimeviida muutmine: %s" #, c-format msgid "'%s' is not a symbolic link" -msgstr "" +msgstr "\"%s\" ei ole nimeviit" msgid "FTP to machine" -msgstr "" +msgstr "FTP ühendus masinaga" msgid "SFTP to machine" -msgstr "" +msgstr "SFTP masinasse" msgid "Shell link to machine" -msgstr "" +msgstr "Kesta ühendus masinaga" msgid "SMB link to machine" -msgstr "" +msgstr "SMB ühendus masinaga" msgid "Undelete files on an ext2 file system" -msgstr "" +msgstr "Failide taastamine ext2 failisüsteemis" msgid "" "Enter device (without /dev/) to undelete\n" "files on: (F1 for details)" msgstr "" +"Sisesta seade (ilma /dev/'ta) millelt\n" +"faile taastada (F1 lisainfo):" msgid "Setup" -msgstr "" +msgstr "Seadistamine" #, c-format msgid "Setup saved to %s" -msgstr "" +msgstr "Seaded salvestati faili %s" #, c-format msgid "Unable to save setup to %s" -msgstr "" +msgstr "Seadete salvestamine faili %s ebaõnnestus" msgid "Cannot execute commands on non-local filesystems" -msgstr "" +msgstr "Käske ei saa käivitada kaugfailisüsteemidel" #, c-format msgid "" "Cannot chdir to \"%s\"\n" "%s" msgstr "" +"Kataloogi \"%s\" sisenemine nurjus\n" +"%s" msgid "Cannot read directory contents" -msgstr "" +msgstr "Kataloogi sisu lugemine nurjus" msgid "Parameter" -msgstr "" +msgstr "Parameeter" #, c-format msgid "" "Cannot create temporary command file\n" "%s" msgstr "" +"Ajutise käsufaili loomine nurjus\n" +"%s" #, c-format msgid " %s%s file error" -msgstr "" +msgstr "%s%s faili viga" #, c-format msgid "" @@ -2137,104 +2234,117 @@ "the installation failed. Please fetch a fresh copy from the Midnight " "Commander package." msgstr "" +"Versiooniga 3.0 muutus faili %smc.ext vormindus. Tundub, et paigaldus ei " +"õnnestunud. Palun hangi uus koopia Midnight Commanderi paketist." #, c-format msgid "%s file error" -msgstr "" +msgstr "%s faili viga" #, c-format msgid "" "The format of the %s file has changed with version 3.0. You may either want " "to copy it from %smc.ext or use that file as an example of how to write it." msgstr "" +"Faili %s vormindus muutus versioonis 3.0. Sa võiksid kas kopeerida faili " +"%smc.ext või kasutada seda faili tooriku näidisena." msgid "DialogTitle|Copy" -msgstr "" +msgstr "DialogTitle|Kopeerimine" msgid "DialogTitle|Move" -msgstr "" +msgstr "DialogTitle|Teisaldamine" msgid "DialogTitle|Delete" -msgstr "" +msgstr "DialogTitle|Kustutamine" msgid "FileOperation|Copy" -msgstr "" +msgstr "FileOperation|Kopeerimine" msgid "FileOperation|Move" -msgstr "" +msgstr "FileOperation|Teisaldamine" msgid "FileOperation|Delete" -msgstr "" +msgstr "FileOperation|Kustutamine" #, no-c-format msgid "%o %f \"%s\"%m" -msgstr "" +msgstr "%o %f \"%s\"%m" #, no-c-format msgid "%o %d %f%m" -msgstr "" +msgstr "%o %d %f%m" msgid "file" -msgstr "" +msgstr "fail" msgid "files" -msgstr "" +msgstr "failid" msgid "directory" -msgstr "" +msgstr "kataloog" msgid "directories" -msgstr "" +msgstr "kataloogid" msgid "files/directories" -msgstr "" +msgstr "failid/kataloogid" #. TRANSLATORS: keep leading space here to split words in Copy/Move dialog msgid " with source mask:" -msgstr "" +msgstr "lähtemaskiga:" msgid "to:" -msgstr "" +msgstr "asukohta:" #, c-format msgid "%s?" -msgstr "" +msgstr "%s?" msgid "Cannot make the hardlink" -msgstr "" +msgstr "Jäikviida loomine nurjus" #, c-format msgid "" "Cannot read source link \"%s\"\n" "%s" msgstr "" +"Lähteviida \"%s\" lugemine nurjus\n" +"%s" msgid "" "Cannot make stable symlinks acrossnon-local filesystems:\n" "\n" "Option Stable Symlinks will be disabled" msgstr "" +"Stabiilseid nimeviitu saab luua ainult kohalikel failisüsteemidel:\n" +"\n" +"Valik stabiilsed nimeviidad keelatakse" #, c-format msgid "" "Cannot create target symlink \"%s\"\n" "%s" msgstr "" +"Siht nimeviida \"%s\" loomine nurjus\n" +"%s" msgid "&Abort" -msgstr "" +msgstr "&Katkesta" msgid "Ski&p all" -msgstr "" +msgstr "Jäta &kõik vahele" msgid "&Retry" -msgstr "" +msgstr "&Proovi uuesti" #, c-format msgid "" "Directory \"%s\" not empty.\n" "Delete it recursively?" msgstr "" +"Kataloog \"%s\" ei ole tühi.\n" +"Kas kustutada see rekursiivselt?" #, c-format msgid "" @@ -2242,15 +2352,20 @@ "Directory \"%s\" not empty.\n" "Delete it recursively?" msgstr "" +"Taustaprotsess:\n" +"Kataloog \"%s\" ei ole tühi.\n" +"Kas see kustutada rekursiivselt?" msgid "Non&e" -msgstr "" +msgstr "&Mitte ükski" #, c-format msgid "" "Cannot stat file \"%s\"\n" "%s" msgstr "" +"Faili \"%s\" info päring nurjus\n" +"%s" #, c-format msgid "" @@ -2259,166 +2374,218 @@ "\"%s\"\n" "are the same file" msgstr "" +"\"%s\"\n" +"ja\n" +"\"%s\"\n" +"on üks ja see sama fail" #, c-format msgid "Cannot overwrite directory \"%s\"" -msgstr "" +msgstr "Kataloogi \"%s\" ülekirjutamine nurjus" #, c-format msgid "" "Cannot move file \"%s\" to \"%s\"\n" "%s" msgstr "" +"Faili \"%s\" teisaldamine kataloogi \"%s\" nurjus\n" +"%s" #, c-format msgid "" "Cannot remove file \"%s\"\n" "%s" msgstr "" +"Faili \"%s\" eemaldamine nurjus\n" +"%s" #, c-format msgid "" "Cannot delete file \"%s\"\n" "%s" msgstr "" +"Faili \"%s\" kustutamine nurjus\n" +"%s" #, c-format msgid "" "Cannot remove directory \"%s\"\n" "%s" msgstr "" +"Kataloogi \"%s\" eemaldamine nurjus\n" +"%s" #, c-format msgid "" "Cannot overwrite directory \"%s\"\n" "%s" msgstr "" +"Kataloogi \"%s\" ülekirjutamine nurjus\n" +"%s" #, c-format msgid "" "Cannot stat source file \"%s\"\n" "%s" msgstr "" +"Lähtefaili \"%s\" info päring nurjus\n" +"%s" #, c-format msgid "" "Cannot create special file \"%s\"\n" "%s" msgstr "" +"Erifaili \"%s\" loomine nurjus\n" +"%s" #, c-format msgid "" "Cannot chown target file \"%s\"\n" "%s" msgstr "" +"Sihtfaili \"%s\" omaniku määramine nurjus\n" +"%s" #, c-format msgid "" "Cannot chmod target file \"%s\"\n" "%s" msgstr "" +"Sihtfaili \"%s\" õiguste määramine nurjus\n" +"%s" #, c-format msgid "" "Cannot open source file \"%s\"\n" "%s" msgstr "" +"Lähtefaili \"%s\" avamine nurjus\n" +"%s" msgid "Reget failed, about to overwrite file" -msgstr "" +msgstr "Kordushankimine ebaõnnestus, fail kirjutatakse üle" #, c-format msgid "" "Cannot fstat source file \"%s\"\n" "%s" msgstr "" +"Lähtefaili \"%s\" info päring nurjus\n" +"%s" #, c-format msgid "" "Cannot create target file \"%s\"\n" "%s" msgstr "" +"Sihtfaili \"%s\" loomine nurjus\n" +"%s" #, c-format msgid "" "Cannot fstat target file \"%s\"\n" "%s" msgstr "" +"Sihtfaili \"%s\" info päring nurjus\n" +"%s" #, c-format msgid "" "Cannot preallocate space for target file \"%s\"\n" "%s" msgstr "" +"Ruumi eelhankimine sihtfailile \"%s\" nurjus\n" +"%s" #, c-format msgid "" "Cannot read source file\"%s\"\n" "%s" msgstr "" +"Lähtefaili \"%s\" lugemine nurjus\n" +"%s" #, c-format msgid "" "Cannot write target file \"%s\"\n" "%s" msgstr "" +"Sihtfaili \"%s\" kirjutamine nurjus\n" +"%s" msgid "(stalled)" -msgstr "" +msgstr "(seiskunud)" #, c-format msgid "" "Cannot close source file \"%s\"\n" "%s" msgstr "" +"Lähtefaili \"%s\" sulgemine nurjus\n" +"%s" #, c-format msgid "" "Cannot close target file \"%s\"\n" "%s" msgstr "" +"Sihtfaili \"%s\" silgemine nurjus\n" +"%s" msgid "Incomplete file was retrieved. Keep it?" -msgstr "" +msgstr "Saadi lõpetamata fail. Kas hoida see alles?" msgid "&Keep" -msgstr "" +msgstr "&Hoia" #, c-format msgid "" "Cannot stat source directory \"%s\"\n" "%s" msgstr "" +"Lähtekataloogi \"%s\" info päring nurjus\n" +"%s" #, c-format msgid "" "Source \"%s\" is not a directory\n" "%s" msgstr "" +"Lähe \"%s\" ei ole kataloog\n" +"%s" #, c-format msgid "" "Cannot copy cyclic symbolic link\n" "\"%s\"" msgstr "" +"Tsüklilise nimeviida kopeerimine nurjus\n" +"\"%s\"" #, c-format msgid "" "Destination \"%s\" must be a directory\n" "%s" msgstr "" +"Sihtkoht \"%s\" peab olema kataloog\n" +"%s" #, c-format msgid "" "Cannot create target directory \"%s\"\n" "%s" msgstr "" +"Sihtkataloogi \"%s\" loomine nurjus\n" +"%s" #, c-format msgid "" "Cannot chown target directory \"%s\"\n" "%s" msgstr "" +"Kataloogi \"%s\" omaniku muutmine nurjus\n" +"%s" #, c-format msgid "" @@ -2427,939 +2594,963 @@ "\"%s\"\n" "are the same directory" msgstr "" +"\"%s\"\n" +"ja\n" +"\"%s\"\n" +"on üks ja see sama kataloog" #, c-format msgid "" "Cannot overwrite file \"%s\"\n" "%s" msgstr "" +"Faili \"%s\" ülekirjutamine nurjus\n" +"%s" #, c-format msgid "" "Cannot move directory \"%s\" to \"%s\"\n" "%s" msgstr "" +"Kataloogi \"%s\" teisaldamine kataloogi \"%s\" nurjus\n" +"%s" msgid "Directory scanning" -msgstr "" +msgstr "Kataloogi skannimine" #, c-format msgid "" "%s\n" "Directories: %zd, total size: %s" msgstr "" +"%s\n" +"Kataloogid: %zd, kogusuurus: %s" msgid "Cannot operate on \"..\"!" -msgstr "" +msgstr "Kataloogi \"..\" kasutamine on keelatud!" msgid "Sorry, I could not put the job in background" -msgstr "" +msgstr "Vabandust, töö saatmine taustale ebaõnnestus" msgid "S&uspend" -msgstr "" +msgstr "Se&iska" msgid "Con&tinue" -msgstr "" +msgstr "&Jätka" #, c-format msgid "%d:%02d.%02d" -msgstr "" +msgstr "%d:%02d.%02d" #, c-format msgid "ETA %s" -msgstr "" +msgstr "Aega jäänud %s" #, c-format msgid "%.2f MB/s" -msgstr "" +msgstr "%.2f MB/s" #, c-format msgid "%.2f KB/s" -msgstr "" +msgstr "%.2f KB/s" #, c-format msgid "%ld B/s" -msgstr "" +msgstr "%ld B/s" msgid "Target file already exists!" -msgstr "" +msgstr "Sihtfail on juba olemas!" #, c-format msgid "New : %s, size %s" -msgstr "" +msgstr "Uus %s, suurus %s" #, c-format msgid "Existing: %s, size %s" -msgstr "" +msgstr "Olemasolev: %s, suurus %s" msgid "Overwrite this target?" -msgstr "" +msgstr "Kas kirjutada see siht üle?" msgid "A&ppend" -msgstr "" +msgstr "&Lisa" msgid "&Reget" -msgstr "" +msgstr "&Uuesti" msgid "Overwrite all targets?" -msgstr "" +msgstr "Kas kirjutada kõik siht üle?" msgid "&Update" -msgstr "" +msgstr "&Uuenda" msgid "If &size differs" -msgstr "" +msgstr "Kui &suurus erineb" msgid "File exists" -msgstr "" +msgstr "Fail on olemas" msgid "Background process: File exists" -msgstr "" +msgstr "Taustaprotsess: Fail on olemas" #, c-format msgid "Files processed: %zu/%zu" -msgstr "" +msgstr "Faile töödeldud: %zu/%zu" #, c-format msgid "Files processed: %zu" -msgstr "" +msgstr "Faile töödeldud: %zu" #, c-format msgid "Time: %s %s" -msgstr "" +msgstr "Aeg: %s %s" #, c-format msgid "Time: %s %s (%s)" -msgstr "" +msgstr "Aeg: %s %s (%s)" #, c-format msgid "Time: %s" -msgstr "" +msgstr "Aeg: %s" #, c-format msgid "Time: %s (%s)" -msgstr "" +msgstr "Aeg: %s (%s)" #, c-format msgid " Total: %s " -msgstr "" +msgstr "Kokku: %s" #, c-format msgid " Total: %s/%s " -msgstr "" +msgstr "Kokku: %s/%s" msgid "Source" -msgstr "" +msgstr "Lähe" msgid "Target" -msgstr "" +msgstr "Siht" msgid "Follow &links" -msgstr "" +msgstr "&Viitade järgimine" msgid "Preserve &attributes" -msgstr "" +msgstr "Säilita &atribuudid" msgid "Di&ve into subdir if exists" -msgstr "" +msgstr "&Sisene alamkataloogi, kui on olemas" msgid "&Stable symlinks" -msgstr "" +msgstr "&Stabiilsed nimeviidad" msgid "&Background" -msgstr "" +msgstr "&Taustale" #, c-format msgid "Invalid source pattern '%s'" -msgstr "" +msgstr "Vigane lähtemuster \"%s\"" msgid "&Chdir" -msgstr "" +msgstr "&Chdir" msgid "&Again" -msgstr "" +msgstr "&Uuesti" msgid "Pane&lize" -msgstr "" +msgstr "Panee&lile" msgid "&View - F3" -msgstr "" +msgstr "&Vaata - F3" msgid "&Edit - F4" -msgstr "" +msgstr "&Muuda - F4" #, c-format msgid "Found: %ld" -msgstr "" +msgstr "Leiti: %ld" msgid "Malformed regular expression" -msgstr "" +msgstr "Vigane regulaaravaldis" msgid "File name:" -msgstr "" +msgstr "Faili nimi:" msgid "&Find recursively" -msgstr "" +msgstr "&Otsi rekursiivselt" msgid "S&kip hidden" -msgstr "" +msgstr "&Eira peidetud" msgid "Content:" -msgstr "" +msgstr "Sisu:" msgid "Sea&rch for content" -msgstr "" +msgstr "Otsi &sisu" msgid "Case sens&itive" -msgstr "" +msgstr "Tõstutundl&ik" msgid "A&ll charsets" -msgstr "" +msgstr "&Kõik märgistikud" msgid "Fir&st hit" -msgstr "" +msgstr "E&simene sobiv" msgid "&Tree" -msgstr "" +msgstr "&Puu" msgid "Find File" -msgstr "" +msgstr "Failide otsimine" msgid "Start at:" -msgstr "" +msgstr "Alusta:" msgid "Ena&ble ignore directories:" -msgstr "" +msgstr "Lu&ba eiratavad kataloogid:" #, c-format msgid "Grepping in %s" -msgstr "" +msgstr "Otsitakse failis %s" msgid "Finished" -msgstr "" +msgstr "Lõpetatud" #, c-format msgid "Finished (ignored %zd directory)" msgid_plural "Finished (ignored %zd directories)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Lõpetatud (%zd kataloog jäeti vahele)" +msgstr[1] "Lõpetatud (%zd kataloogi jäeti vahele)" #, c-format msgid "Searching %s" -msgstr "" +msgstr "Otsitakse %s" msgid "Searching" -msgstr "" +msgstr "Otsimine" msgid "Change &to" -msgstr "" +msgstr "&Nimeta ümber" msgid "&Free VFSs now" -msgstr "" +msgstr "&Vabasta VFSid nüüd" msgid "&Refresh" -msgstr "" +msgstr "&Värskenda" msgid "&Add current" -msgstr "" +msgstr "&Lisa valitu" msgid "&Up" -msgstr "" +msgstr "Ü&les" msgid "New &group" -msgstr "" +msgstr "Uus &grupp" msgid "New &entry" -msgstr "" +msgstr "Uus &Kirje" msgid "&Insert" -msgstr "" +msgstr "&Sisesta" msgid "&Remove" -msgstr "" +msgstr "&Kustuta" msgid "Subgroup - press ENTER to see list" -msgstr "" +msgstr "Alamgrupp - loendi nägemiseks vajuta ENTER" msgid "Active VFS directories" -msgstr "" +msgstr "Aktiivsed VFS kataloogid" msgid "Directory hotlist" -msgstr "" +msgstr "Kataloogide kiirvalik" msgid "Top level group" -msgstr "" +msgstr "Ülemtaseme grupp" msgid "Directory path" -msgstr "" +msgstr "Kataloogi asukoht" #, c-format msgid "Moving %s" -msgstr "" +msgstr "Teisaldatakse %s" msgid "Directory label" -msgstr "" +msgstr "Kataloogi märgend" msgid "&Append" -msgstr "" +msgstr "&Lisa" msgid "New hotlist entry" -msgstr "" +msgstr "Uus kiirvaliku kirje" msgid "Directory label:" -msgstr "" +msgstr "Kataloogi märgend:" msgid "Directory path:" -msgstr "" +msgstr "Kataloogi asukoht:" msgid "New hotlist group" -msgstr "" +msgstr "Uus kiirvaliku grupp" msgid "Name of new group:" -msgstr "" +msgstr "Uue grupi nimi:" #, c-format msgid "Are you sure you want to remove entry \"%s\"?" -msgstr "" +msgstr "Kas sa oled kindel, et soovid eemaldada kirje \"%s\"?" #, c-format msgid "" "Group \"%s\" is not empty.\n" "Remove it?" msgstr "" +"Grupp \"%s\" ei ole tühi.\n" +"Kas eemaldada?" msgid "Hotlist Load" -msgstr "" +msgstr "Kiirvaliku laadimine" #, c-format msgid "" "MC was unable to write %s file,\n" "your old hotlist entries were not deleted" msgstr "" +"MC ei suutnud kirjutada faili %s,\n" +"su vanu kiirvalikuid ei kustutatud" #, c-format msgid "Label for \"%s\":" -msgstr "" +msgstr "Märgend %s'le:" msgid "Add to hotlist" -msgstr "" +msgstr "Lisa kiirvalikusse" #, c-format msgid "Midnight Commander %s" -msgstr "" +msgstr "Midnight Commander %s" #, c-format msgid "File: %s" -msgstr "" +msgstr "Fail: %s" msgid "No node information" -msgstr "" +msgstr "Puudub kirje informatsioon" msgid "Free nodes:" -msgstr "" +msgstr "Vabad kirjed:" msgid "No space information" -msgstr "" +msgstr "Puudub mahu informatsioon" #, c-format msgid "Free space: %s/%s (%d%%)" -msgstr "" +msgstr "Vaba ruum: %s/%s (%d%%)" #, c-format msgid "Type: %s" -msgstr "" +msgstr "Tüüp: %s" msgid "non-local vfs" -msgstr "" +msgstr "kaug VFS" #, c-format msgid "Device: %s" -msgstr "" +msgstr "Seade: %s" #, c-format msgid "Filesystem: %s" -msgstr "" +msgstr "Failisüsteem: %s" #, c-format msgid "Accessed: %s" -msgstr "" +msgstr "Kasutatud: %s" #, c-format msgid "Modified: %s" -msgstr "" +msgstr "Muudetud: %s" #. TRANSLATORS: Time of last status change as in stat(2) man. #, c-format msgid "Changed: %s" -msgstr "" +msgstr "Muudeti: %s" #, c-format msgid "Dev. type: major %lu, minor %lu" -msgstr "" +msgstr "Seadme tüüp: %lu, %lu" #, c-format msgid "Size: %s" -msgstr "" +msgstr "Suurus: %s" #, c-format msgid " (%ld block)" msgid_plural " (%ld blocks)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "(%ld plokk)" +msgstr[1] "(%ld plokki)" #, c-format msgid "Owner: %s/%s" -msgstr "" +msgstr "Omanik: %s/%s" #, c-format msgid "Links: %d" -msgstr "" +msgstr "Viidad: %d" #, c-format msgid "Mode: %s (%04o)" -msgstr "" +msgstr "Režiim: %s (%04o)" #, c-format msgid "Location: %Xh:%Xh" -msgstr "" +msgstr "Asukoht: %Xh:%Xh" msgid "&Equal split" -msgstr "" +msgstr "&Võrdne poolitus" msgid "&Menubar visible" -msgstr "" +msgstr "&Menüüriba nähtav" msgid "Command &prompt" -msgstr "" +msgstr "Käsuvii&p" msgid "&Keybar visible" -msgstr "" +msgstr "&Klahviriba nähtav" msgid "H&intbar visible" -msgstr "" +msgstr "V&ihjeid kuvatakse" msgid "&XTerm window title" -msgstr "" +msgstr "&XTermi akna tiitel" msgid "&Show free space" -msgstr "" +msgstr "Kuva &vaba ruum" msgid "Panel split" -msgstr "" +msgstr "Paneeli poolitamine" msgid "Console output" -msgstr "" +msgstr "Konsooli väljund" msgid "&Vertical" -msgstr "" +msgstr "&Vertikaalne" msgid "&Horizontal" -msgstr "" +msgstr "&Horisontaalne" msgid "Output lines:" -msgstr "" +msgstr "Väljundi ridu:" msgid "Layout" -msgstr "" +msgstr "Kujundus" msgid "File listin&g" -msgstr "" +msgstr "Failide &loend" msgid "&Quick view" -msgstr "" +msgstr "&Kiirvaade" msgid "&Info" -msgstr "" +msgstr "&Info" msgid "&Listing mode..." -msgstr "" +msgstr "&Loendi režiim..." msgid "&Sort order..." -msgstr "" +msgstr "&Sortimine..." msgid "&Filter..." -msgstr "" +msgstr "&Filtreerimine..." msgid "&Encoding..." -msgstr "" +msgstr "&Kodeerimine..." msgid "FT&P link..." -msgstr "" +msgstr "F&TP ühendus..." msgid "S&hell link..." -msgstr "" +msgstr "&Kesta ühendus..." msgid "S&FTP link..." -msgstr "" +msgstr "S&FTP ühendus..." msgid "SM&B link..." -msgstr "" +msgstr "SM&B ühendus..." msgid "Paneli&ze" -msgstr "" +msgstr "&Paneelile" msgid "&Rescan" -msgstr "" +msgstr "&Kordusskannimine" msgid "&View" -msgstr "" +msgstr "&Vaata" msgid "Vie&w file..." -msgstr "" +msgstr "&Kuva faili..." msgid "&Filtered view" -msgstr "" +msgstr "&Filtreeritud vaade" msgid "&Copy" -msgstr "" +msgstr "&Kopeeri" msgid "C&hmod" -msgstr "" +msgstr "Õiguste muutmine" msgid "&Link" -msgstr "" +msgstr "&Jäikviit" msgid "&Symlink" -msgstr "" +msgstr "Ab&soluutne nimeviit" msgid "Relative symlin&k" -msgstr "" +msgstr "Suhteline nime&viit" msgid "Edit s&ymlink" -msgstr "" +msgstr "Muuda &nimeviita" msgid "Ch&own" -msgstr "" +msgstr "Muuda &omanik" msgid "&Advanced chown" -msgstr "" +msgstr "&Täpsem omaniku muutmine" msgid "&Rename/Move" -msgstr "" +msgstr "&Teisalda/nimeta" msgid "&Mkdir" -msgstr "" +msgstr "&Loo kataloog" msgid "&Quick cd" -msgstr "" +msgstr "&Kiire kataloogi vahetus" msgid "Select &group" -msgstr "" +msgstr "Vali &grupp" msgid "U&nselect group" -msgstr "" +msgstr "Tühista &grupi valik" msgid "&Invert selection" -msgstr "" +msgstr "&Vaheta valik" msgid "E&xit" -msgstr "" +msgstr "&Välju" msgid "&User menu" -msgstr "" +msgstr "&Kasutaja menüü" msgid "&Directory tree" -msgstr "" +msgstr "&Kataloogipuu" msgid "&Find file" -msgstr "" +msgstr "&Failide otsimine" msgid "S&wap panels" -msgstr "" +msgstr "&Vaheta paneelid" msgid "Switch &panels on/off" -msgstr "" +msgstr "Kuva/peida &paneelid" msgid "&Compare directories" -msgstr "" +msgstr "Kataloogide &võrdlemine" msgid "C&ompare files" -msgstr "" +msgstr "Võ&rdle faile" msgid "E&xternal panelize" -msgstr "" +msgstr "Väliskäsk paneelile" msgid "Show directory s&izes" -msgstr "" +msgstr "Kuva kataloogide &suurused" msgid "Command &history" -msgstr "" +msgstr "Käskude &ajalugu" msgid "Di&rectory hotlist" -msgstr "" +msgstr "&Kataloogide kiirvalik" msgid "&Active VFS list" -msgstr "" +msgstr "&Aktiivsete VFSde loend" msgid "&Background jobs" -msgstr "" +msgstr "&Tööd taustal" msgid "Screen lis&t" -msgstr "" +msgstr "Ekraanide loend" msgid "&Undelete files (ext2fs only)" -msgstr "" +msgstr "&Failide taastamine (ainult ext2fs)" msgid "&Listing format edit" -msgstr "" +msgstr "&Loend vorminduse muutmine" msgid "Edit &extension file" -msgstr "" +msgstr "Muuda &laiendite faili" msgid "Edit &menu file" -msgstr "" +msgstr "Muuda &menüü faili" msgid "Edit hi&ghlighting group file" -msgstr "" +msgstr "Muuda &esiletõstu grupi faili" msgid "&Configuration..." -msgstr "" +msgstr "&Seadistus..." msgid "&Layout..." -msgstr "" +msgstr "&Kujundus..." msgid "&Panel options..." -msgstr "" +msgstr "P&aneeli seaded..." msgid "C&onfirmation..." -msgstr "" +msgstr "&Kinnituste küsimine..." msgid "&Display bits..." -msgstr "" +msgstr "&Kuva bitid" msgid "&Virtual FS..." -msgstr "" +msgstr "&Virtuaalne FS..." msgid "Panels:" -msgstr "" +msgstr "Paneelid:" #, c-format msgid "You have %zd opened screen. Quit anyway?" msgid_plural "You have %zd opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Oled avanud %zd ekraani. Kas lõpetada ikkagi?" +msgstr[1] "Oled avanud %zd ekraani. Kas lõpetada ikkagi?" msgid "The Midnight Commander" -msgstr "" +msgstr "Midnight Commander" msgid "Do you really want to quit the Midnight Commander?" -msgstr "" +msgstr "Kas sa soovid tõesti Midnight Commanderist väljuda?" msgid "&Above" -msgstr "" +msgstr "Ü&lal" msgid "&Left" -msgstr "" +msgstr "&Vasak" msgid "&Below" -msgstr "" +msgstr "&All" msgid "&Right" -msgstr "" +msgstr "&Parem" msgid "ButtonBar|Menu" -msgstr "" +msgstr "ButtonBar|Menüü" msgid "ButtonBar|View" -msgstr "" +msgstr "ButtonBar|Vaata" msgid "ButtonBar|RenMov" -msgstr "" +msgstr "ButtonBar|NimTeisalda" msgid "ButtonBar|Mkdir" -msgstr "" +msgstr "ButtonBar|LooKataloog" msgid "Memory exhausted!" -msgstr "" +msgstr "Mälu otsas!" #. TRANSLATORS: one single character to represent 'unsorted' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix msgid "sort|u" -msgstr "" +msgstr "sort|m" msgid "&Unsorted" -msgstr "" +msgstr "Sorteeri&mata" #. TRANSLATORS: one single character to represent 'name' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix msgid "sort|n" -msgstr "" +msgstr "sort|n" msgid "&Name" -msgstr "" +msgstr "&Nimi" #. TRANSLATORS: one single character to represent 'version' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix msgid "sort|v" -msgstr "" +msgstr "sort|v" msgid "&Version" -msgstr "" +msgstr "&Versioon" #. TRANSLATORS: one single character to represent 'extension' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix msgid "sort|e" -msgstr "" +msgstr "sort|l" msgid "E&xtension" -msgstr "" +msgstr "&Laiend" #. TRANSLATORS: one single character to represent 'size' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix msgid "sort|s" -msgstr "" +msgstr "sort|s" msgid "&Size" -msgstr "" +msgstr "&Suurus" msgid "Block Size" -msgstr "" +msgstr "Ploki suurus" #. TRANSLATORS: one single character to represent 'Modify time' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix msgid "sort|m" -msgstr "" +msgstr "sort|t" msgid "&Modify time" -msgstr "" +msgstr "&Muutmise aeg" #. TRANSLATORS: one single character to represent 'Access time' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix msgid "sort|a" -msgstr "" +msgstr "sort|k" msgid "&Access time" -msgstr "" +msgstr "&Kasutamise aeg" #. TRANSLATORS: one single character to represent 'Change time' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix msgid "sort|h" -msgstr "" +msgstr "sort|u" msgid "C&hange time" -msgstr "" +msgstr "&Uuendamise aeg" msgid "Perm" -msgstr "" +msgstr "Õigus" msgid "Nl" -msgstr "" +msgstr "Nl" #. TRANSLATORS: one single character to represent 'inode' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix msgid "sort|i" -msgstr "" +msgstr "sort|i" msgid "&Inode" -msgstr "" +msgstr "&I-kirje" msgid "UID" -msgstr "" +msgstr "UID" msgid "GID" -msgstr "" +msgstr "GID" msgid "Owner" -msgstr "" +msgstr "Omanik" msgid "Group" -msgstr "" +msgstr "Grupp" msgid "[dev]" -msgstr "" +msgstr "[seade]" msgid "UP--DIR" -msgstr "" +msgstr "Ülemkataloog" msgid "SYMLINK" -msgstr "" +msgstr "Nimeviit" msgid "SUB-DIR" -msgstr "" +msgstr "Alamkataloog" msgid "" -msgstr "" +msgstr "" #, c-format msgid "%s byte" msgid_plural "%s bytes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s bait" +msgstr[1] "%s baiti" #, c-format msgid "%s in %d file" msgid_plural "%s in %d files" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s %d failis" +msgstr[1] "%s %d failis" msgid "Panelize" -msgstr "" +msgstr "Paneel" msgid "Unknown tag on display format:" -msgstr "" +msgstr "Tundmatu silt kuva vorminduses:" msgid "Do you really want to execute?" -msgstr "" +msgstr "Kas sa soovid tõesti käivitada?" msgid "User supplied format looks invalid, reverting to default." -msgstr "" +msgstr "Kasutaja antud vormindus tundub vigane; kasutatakse vaikeväärtust." msgid "&Add new" -msgstr "" +msgstr "&Lisa uus" msgid "External panelize" -msgstr "" +msgstr "Väliskäsk paneelile" msgid "Other command" -msgstr "" +msgstr "Muu käsk" msgid "Command" -msgstr "" +msgstr "Käsk" msgid "Add to external panelize" -msgstr "" +msgstr "Lisa väliskäsk paneelile" msgid "Enter command label:" -msgstr "" +msgstr "Sisesta käsu silt:" msgid "Cannot invoke command." -msgstr "" +msgstr "Käsu käivitamine nurjus." msgid "Pipe close failed" -msgstr "" +msgstr "Toru sulgemine ebaõnnestus" msgid "Cannot run external panelize in a non-local directory" -msgstr "" +msgstr "Väliskäsu paneelile saatmine töötab ainult kohalike kataloogidega" msgid "Modified git files" -msgstr "" +msgstr "Muudetud giti failid" msgid "Find rejects after patching" -msgstr "" +msgstr "Otsi paikamise järgseid hüljatud muudatusi" msgid "Find *.orig after patching" -msgstr "" +msgstr "Otsi paigamise järgselt *.orig faile" msgid "Find SUID and SGID programs" -msgstr "" +msgstr "Otsi SUID ja SGID programme" #, c-format msgid "" "Cannot open the %s file for writing:\n" "%s\n" msgstr "" +"Faili %s avamine kirjutamiseks nurjus:\n" +"%s\n" #, c-format msgid "Copy \"%s\" directory to:" -msgstr "" +msgstr "Kopeeri kataloog \"%s\":" #, c-format msgid "Move \"%s\" directory to:" -msgstr "" +msgstr "Teisalda kataloog \"%s\":" #, c-format msgid "" "Cannot stat the destination\n" "%s" msgstr "" +"Sihtkoha info päring nurjus\n" +"%s" #, c-format msgid "Delete %s?" -msgstr "" +msgstr "Kas kustutada %s?" msgid "ButtonBar|Static" -msgstr "" +msgstr "ButtonBar|Staatiline" msgid "ButtonBar|Dynamc" -msgstr "" +msgstr "ButtonBar|Dünaamiline" msgid "ButtonBar|Rescan" -msgstr "" +msgstr "ButtonBar|Kordusskan" msgid "ButtonBar|Forget" -msgstr "" +msgstr "ButtonBar|Unusta" msgid "ButtonBar|Rmdir" -msgstr "" +msgstr "ButtonBar|KatKst" #, c-format msgid "" "Cannot write to the %s file:\n" "%s\n" msgstr "" +"Faili %s kirjutamine nurjus:\n" +"%s\n" msgid "Debug" -msgstr "" +msgstr "Silumine" msgid "ERROR:" -msgstr "" +msgstr "Viga:" msgid "True:" -msgstr "" +msgstr "Tõene:" msgid "False:" -msgstr "" +msgstr "Väär:" msgid "Error calling program" -msgstr "" +msgstr "Viga programmi kutsel" msgid "Warning -- ignoring file" -msgstr "" +msgstr "Hoiatus -- eiratakse faili" #, c-format msgid "" "File %s is not owned by root or you or is world writable.\n" "Using it may compromise your security" msgstr "" +"Faili %s omanik ei ole root või sina, või see on kõigile kirjutatav.\n" +"Selle kasutamine võib ohustada su turvalisust" msgid "Format error on file Extensions File" -msgstr "" +msgstr "Laiendite failis on vorminduse viga" #, c-format msgid "The %%var macro has no default" -msgstr "" +msgstr "Makrol %%var puudub vaikeväärtus" #, c-format msgid "The %%var macro has no variable" -msgstr "" +msgstr "Makrol %%var puudub muutuja" #, c-format msgid "" "Cannot open file%s\n" "%s" msgstr "" +"Faili %s avamine nurjus\n" +"%s" #, c-format msgid "No suitable entries found in %s" -msgstr "" +msgstr "Failist %s ei leitud sobivaid kirjeid" msgid "User menu" -msgstr "" +msgstr "Kasutaja menüü" msgid "Help file format error\n" -msgstr "" +msgstr "Abi failivorminduse viga\n" msgid "Internal bug: Double start of link area" -msgstr "" +msgstr "Sisemine viga: viida ala on topeltalgus" #, c-format msgid "Cannot find node %s in help file" -msgstr "" +msgstr "Abi failist ei leitud sõlme %s" msgid "Help" -msgstr "" +msgstr "Abi" msgid "ButtonBar|Index" -msgstr "" +msgstr "ButtonBar|Indeks" msgid "ButtonBar|Prev" -msgstr "" +msgstr "ButtonBar|Eelmine" msgid "Learn keys" -msgstr "" +msgstr "Klahvide õppimine" msgid "Teach me a key" -msgstr "" +msgstr "Õpeta mulle klahv" #, c-format msgid "" @@ -3372,45 +3563,62 @@ "If you want to escape, press a single Escape key\n" "and wait as well." msgstr "" +"Palun vajuta %s\n" +"ja oota kuni see sõnum kaob.\n" +"\n" +"Järgmisena vajuta seda jälle, et näha,\n" +"kas OK ilmub nupu kõrvale.\n" +"\n" +"Kui soovid loobuda, siis vajuta üks kord\n" +"klahvi Esc ja oota samuti." msgid "Cannot accept this key" -msgstr "" +msgstr "Selle klahvi vastuvõtt nurjus" #, c-format msgid "You have entered \"%s\"" -msgstr "" +msgstr "Oled sisestanud \"%s\"" #. TRANSLATORS: This label appears near learned keys. Keep it short. msgid "OK" -msgstr "" +msgstr "OK" msgid "" "It seems that all your keys already\n" "work fine. That's great." msgstr "" +"Tundub, et kõik klahvid töötavad\n" +"probleemideta. See on väga hea." msgid "&Discard" -msgstr "" +msgstr "&Unusta" msgid "" "Great! You have a complete terminal database!\n" "All your keys work well." msgstr "" +"Suurepärane! Sul on täielik terminalide andmebaas!\n" +"Su kõik klahvid töötavad hästi." msgid "" "Press all the keys mentioned here. After you have done it, check\n" "which keys are not marked with OK. Press space on the missing\n" "key, or click with the mouse to define it. Move around with Tab." msgstr "" +"Vajuta kõiki siintoodud klahve. Kui oled valmis, siis kontrolli\n" +"milliseid ei ole märgitud OK-ga. Vajuta puuduva klahvi kohal tühikut\n" +"või kliki defineerimiseks hiirega. Liikumiseks kasuta tabulaatorit." #, c-format msgid "" "Failed to run:\n" "%s\n" msgstr "" +"Käivitamine ebaõnnestus:\n" +"%s\n" msgid "Home directory path is not absolute" -msgstr "" +msgstr "Kodukataloog ei ole absoluutne" #, c-format msgid "" @@ -3418,125 +3626,137 @@ "Failed while close:\n" "%s\n" msgstr "" +"\n" +"Sulgemine ebaõnnestus:\n" +"%s\n" msgid "Choose codepage" -msgstr "" +msgstr "Vali kooditabel" msgid "- < No translation >" -msgstr "" +msgstr "- < tõlkimata >" msgid "%b %e %Y" -msgstr "" +msgstr "%b %e %Y" msgid "%b %e %H:%M" -msgstr "" +msgstr "%b %e %H:%M" #, c-format msgid "" "Cannot save file %s:\n" "%s" msgstr "" +"Faili %s salvestamine nurjus:\n" +"%s" msgid "" "GNU Midnight Commander is already\n" "running on this terminal.\n" "Subshell support will be disabled." msgstr "" +"GNU Midnight Commander juba\n" +"töötab sellel terminalil.\n" +"Alamkesta tugi keelatakse." #, c-format msgid "Cannot open named pipe %s\n" -msgstr "" +msgstr "Nimega toru %s avamine nurjus\n" msgid "The shell is still active. Quit anyway?" -msgstr "" +msgstr "Shell on veel aktiivne. Kas soovid ikkagi lõpetada?" #, c-format msgid "Warning: Cannot change to %s.\n" -msgstr "" +msgstr "Hoiatus: sisenemine kataloogi %s nurjus.\n" msgid "Using the S-Lang library with terminfo database\n" -msgstr "" +msgstr "Kasutatakse S-Lang teeki terminfo andmebaasiga\n" msgid "Using the ncurses library\n" -msgstr "" +msgstr "Kasutatakse teeki ncurses\n" msgid "Using the ncursesw library\n" -msgstr "" +msgstr "Kasutatakse teeki ncursesw\n" msgid "With builtin Editor\n" -msgstr "" +msgstr "Sisseehitatud toimetiga\n" msgid "With optional subshell support\n" -msgstr "" +msgstr "Valikulise alamkesta toega\n" msgid "With subshell support as default\n" -msgstr "" +msgstr "Alamkesta tugi vaikeväärtusena\n" msgid "With support for background operations\n" -msgstr "" +msgstr "Taustategevuste toega\n" msgid "With mouse support on xterm and Linux console\n" -msgstr "" +msgstr "Hiire toega xtermis ja Linuxi konsoolil\n" msgid "With mouse support on xterm\n" -msgstr "" +msgstr "Hiire toega xtermis\n" msgid "With support for X11 events\n" -msgstr "" +msgstr "X11 sündmuste toega\n" msgid "With internationalization support\n" -msgstr "" +msgstr "Internatsionaliseerimise toega\n" msgid "With multiple codepages support\n" -msgstr "" +msgstr "Mitme kooditabeli toega\n" #, c-format msgid "Built with GLib %d.%d.%d\n" -msgstr "" +msgstr "Ehitatud GLib teegiga %d.%d.%d\n" #, c-format msgid "Virtual File Systems:" -msgstr "" +msgstr "Virtuaalsed failisüsteemid:" #, c-format msgid "Data types:" -msgstr "" +msgstr "Andmetüübid:" msgid "Root directory:" -msgstr "" +msgstr "Juurkataloog:" msgid "System data" -msgstr "" +msgstr "Süsteemi andmed" msgid "Config directory:" -msgstr "" +msgstr "Seadistuste kataloog:" msgid "Data directory:" -msgstr "" +msgstr "Andmete kataloog:" msgid "File extension handlers:" -msgstr "" +msgstr "Faililaiendite käsitlejad:" msgid "VFS plugins and scripts:" -msgstr "" +msgstr "VFS pluginad ja skriptid:" msgid "User data" -msgstr "" +msgstr "Kasutaja andmed" msgid "Cache directory:" -msgstr "" +msgstr "Vahemälu kataloog:" #, c-format msgid "" "Cannot open cpio archive\n" "%s" msgstr "" +"Cpio arhiivi avamine nurjus\n" +" %s" #, c-format msgid "" "Premature end of cpio archive\n" "%s" msgstr "" +"Enneaegne cpio arhiivi lõpp\n" +" %s" #, c-format msgid "" @@ -3545,447 +3765,473 @@ "in cpio archive\n" "%s" msgstr "" +"Cpio arhiivis on vasturääkivad lingid \n" +" %s\n" +"ja\n" +" %s" #, c-format msgid "%s contains duplicate entries! Skipping!" -msgstr "" +msgstr "%s sisaldab korduvkirjeid! Jäetakse vahele!" #, c-format msgid "" "Corrupted cpio header encountered in\n" "%s" msgstr "" +"Leiti vigane cpio päis failis\n" +" %s" #, c-format msgid "" "Unexpected end of file\n" "%s" msgstr "" +"Ootamatu faili lõpp\n" +" %s" #, c-format msgid "" "Cannot open %s archive\n" "%s" msgstr "" +"%s arhiivi avamine nurjus\n" +" %s" msgid "Inconsistent extfs archive" -msgstr "" +msgstr "Vasturääkiv extfs arhiiv" #, c-format msgid "Warning: cannot open %s directory\n" -msgstr "" +msgstr "Hoiatus: kataloogi %s avamine nurjus\n" #, c-format msgid "fish: Disconnecting from %s" -msgstr "" +msgstr "fish: katkestatakse ühendus serveriga %s" msgid "fish: Waiting for initial line..." -msgstr "" +msgstr "fish: oodatakse serveri vastust..." msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" +msgstr "Vabandust, parooliga autenditud ühendused ei ole hetkel võimalikud." #, c-format msgid "fish: Password is required for %s" -msgstr "" +msgstr "fish: Server %s küsib parooli" msgid "fish: Sending password..." -msgstr "" +msgstr "fish: saadetakse parooli..." msgid "fish: Sending initial line..." -msgstr "" +msgstr "fish: lähtestamine..." msgid "fish: Handshaking version..." -msgstr "" +msgstr "fish: Versiooni kokku leppimine..." msgid "fish: Getting host info..." -msgstr "" +msgstr "fish: Hangitakse hosti infot..." #, c-format msgid "fish: Reading directory %s..." -msgstr "" +msgstr "fish: Loetakse kataloogi %s..." #, c-format msgid "%s: done." -msgstr "" +msgstr "%s: valmis." #, c-format msgid "%s: failure" -msgstr "" +msgstr "%s: ebaõnnestus" #, c-format msgid "fish: store %s: sending command..." -msgstr "" +msgstr "fish: salvesta %s: saadetakse käsku..." msgid "fish: Local read failed, sending zeros" -msgstr "" +msgstr "fish: kohalik lugemine ebaõnnestus, saadetakse nullid" msgid "fish: storing file" -msgstr "" +msgstr "fish: salvestatakse fail" msgid "Aborting transfer..." -msgstr "" +msgstr "Saatmine katkestatakse..." msgid "Error reported after abort." -msgstr "" +msgstr "Pärast katkestamist raporteeriti viga." msgid "Aborted transfer would be successful." -msgstr "" +msgstr "Katkestatud ülekanne oleks edukas." #, c-format msgid "ftpfs: Disconnecting from %s" -msgstr "" +msgstr "ftpfs: Katkestatakse ühendus serveriga %s" #, c-format msgid "FTP: Password required for %s" -msgstr "" +msgstr "FTP: Server %s küsib parooli" msgid "ftpfs: sending login name" -msgstr "" +msgstr "ftpfs: saadetakse kasutaja nime" msgid "ftpfs: sending user password" -msgstr "" +msgstr "ftpfs: saadetakse kasutaja parool" #, c-format msgid "FTP: Account required for user %s" -msgstr "" +msgstr "FTP: Kasutajale %s on vaja kontot" msgid "Account:" -msgstr "" +msgstr "Konto:" msgid "ftpfs: sending user account" -msgstr "" +msgstr "ftpfs: saadetakse kasutaja kontot" msgid "ftpfs: logged in" -msgstr "" +msgstr "ftpfs: logiti sisse" #, c-format msgid "ftpfs: Login incorrect for user %s " -msgstr "" +msgstr "ftpfs: Kasutaja %s logimine vigane" msgid "ftpfs: Invalid host name." -msgstr "" +msgstr "ftpfs: Vigane hosti nimi." #, c-format msgid "ftpfs: %s" -msgstr "" +msgstr "ftpfs: %s" #, c-format msgid "ftpfs: making connection to %s" -msgstr "" +msgstr "ftpfs: luuakse ühendus masinaga %s" msgid "ftpfs: connection interrupted by user" -msgstr "" +msgstr "ftpfs: kasutaja katkestas ühenduse" #, c-format msgid "ftpfs: connection to server failed: %s" -msgstr "" +msgstr "ftpfs: ühendus serveriga ebaõnnestus: %s" #, c-format msgid "Waiting to retry... %d (Control-G to cancel)" -msgstr "" +msgstr "Oodatakse kordamist... %d (Ctrl-G tühistab)" msgid "ftpfs: invalid address family" -msgstr "" +msgstr "ftpfs: vigane aadressi perekond" #, c-format msgid "ftpfs: could not create socket: %s" -msgstr "" +msgstr "ftpfs: sokli loomine ebaõnnestus: %s" msgid "ftpfs: could not setup passive mode" -msgstr "" +msgstr "ftpfs: passiivse režiimi häälestamine ebaõnnestus" msgid "ftpfs: aborting transfer." -msgstr "" +msgstr "ftpfs: ülekanne katkestatud." #, c-format msgid "ftpfs: abort error: %s" -msgstr "" +msgstr "ftpfs: katkestamise viga: %s" msgid "ftpfs: abort failed" -msgstr "" +msgstr "ftpfs: katkestamine ebaõnnestus" msgid "ftpfs: CWD failed." -msgstr "" +msgstr "ftpfs: CWD ebaõnnestus" msgid "ftpfs: couldn't resolve symlink" -msgstr "" +msgstr "ftpfs: nimeviida lahendamine ebaõnnestus" msgid "Resolving symlink..." -msgstr "" +msgstr "Lahendatakse nimeviita..." #, c-format msgid "ftpfs: Reading FTP directory %s... %s%s" -msgstr "" +msgstr "ftpfs: Loetakse FTP kataloogi %s... %s%s" msgid "(strict rfc959)" -msgstr "" +msgstr "(range RFC959)" msgid "(chdir first)" -msgstr "" +msgstr "(esmalt chdir)" msgid "ftpfs: failed; nowhere to fallback to" -msgstr "" +msgstr "ftpfs: ebaõnnestus; täiendavaid alternatiive ei ole" msgid "ftpfs: storing file" -msgstr "" +msgstr "ftpfs: salvestatakse faili" msgid "" "~/.netrc file has incorrect mode\n" "Remove password or correct mode" msgstr "" +"~/.netrc on teistele loetav\n" +"Kustuta failist salasõna või muuda õigused" #, c-format msgid "%s: Warning: file %s not found\n" -msgstr "" +msgstr "%s: hoiatus: faili %s ei leitud\n" #, c-format msgid "" "Warning: Invalid line in %s:\n" "%s\n" msgstr "" +"Hoiatus: vigane rida failis %s:\n" +"%s\n" #, c-format msgid "" "Warning: Invalid flag %c in %s:\n" "%s\n" msgstr "" +"Hoiatus: vigane parameeter %c failis %s:\n" +"%s\n" #, c-format msgid "sftp: an error occurred while reading %s: %s" -msgstr "" +msgstr "sftp: viga faili %s lugemisel: %s" msgid "sftp: Unable to get current user name." -msgstr "" +msgstr "sftp: aktiivse kasutaja nime hankimine nurjus." msgid "sftp: Invalid host name." -msgstr "" +msgstr "sftp: vigane hosti nimi." msgid "sftp: Invalid port value." -msgstr "" +msgstr "sftp: vigane pordi väärtus." #, c-format msgid "sftp: %s" -msgstr "" +msgstr "sftp: %s" #, c-format msgid "sftp: making connection to %s" -msgstr "" +msgstr "sftp: ühenduse loomine masinaga %s" msgid "sftp: connection interrupted by user" -msgstr "" +msgstr "sftp: kasutaja katkestas ühenduse" #, c-format msgid "sftp: connection to server failed: %s" -msgstr "" +msgstr "sftp: ühenduse loomine masinaga nurjus: %s" #, c-format msgid "sftp: Enter passphrase for %s " -msgstr "" +msgstr "sftp: sisesta paroolifraas masinale %s" msgid "sftp: Passphrase is empty." -msgstr "" +msgstr "sftp: paroolifraas on tühi." #, c-format msgid "sftp: Enter password for %s " -msgstr "" +msgstr "sftp: sisesta parool masinale %s" msgid "sftp: Password is empty." -msgstr "" +msgstr "sftp: parool on tühi." #, c-format msgid "sftp: Failure establishing SSH session: (%d)" -msgstr "" +msgstr "sftp: SSH ühenduse loomine nurjus: (%d)" msgid "sftp: No file handler data present for reading file" -msgstr "" +msgstr "sftp: faili lugemiseks puuduvad faili käsitleja andmed" #, c-format msgid "sftp: (Ctrl-G break) Listing... %s" -msgstr "" +msgstr "sftp: (Ctrl+G katkestab) Loendamine... %s" msgid "sftp: Listing done." -msgstr "" +msgstr "sftp: Loendamine lõpetatud." #, c-format msgid "reconnect to %s failed" -msgstr "" +msgstr "Ühenduse taastamine serveriga %s ebaõnnestus" msgid "Authentication failed" -msgstr "" +msgstr "Autentimine ebaõnnestus" #, c-format msgid "Error %s creating directory %s" -msgstr "" +msgstr "Viga %s kataloogi %s loomisel" #, c-format msgid "Error %s removing directory %s" -msgstr "" +msgstr "Viga %s kataloogi %s kustutamisel" #, c-format msgid "%s opening remote file %s" -msgstr "" +msgstr "%s avatakse kaugfaili %s" #, c-format msgid "%s removing remote file %s" -msgstr "" +msgstr "%s kustutatakse kaugfaili %s" #, c-format msgid "%s renaming files\n" -msgstr "" +msgstr "%s failide ümbernimetamine\n" #, c-format msgid "" "Cannot open tar archive\n" "%s" msgstr "" +"Tar arhiivi avamine nurjus\n" +"%s" msgid "Inconsistent tar archive" -msgstr "" +msgstr "Tar arhiiv sisaldab vasturääkivusi" msgid "Unexpected EOF on archive file" -msgstr "" +msgstr "Ootamatu arhiivi faili lõpp" #, c-format msgid "" "%s\n" "doesn't look like a tar archive." msgstr "" +"%s\n" +"ei meenuta tar arhiivi." msgid "undelfs: error" -msgstr "" +msgstr "undelfs: viga" msgid "not enough memory" -msgstr "" +msgstr "ei ole piisavalt mälu" msgid "while allocating block buffer" -msgstr "" +msgstr "ploki puhvri allokeerimisel" #, c-format msgid "open_inode_scan: %d" -msgstr "" +msgstr "open_inode_scan: %d" #, c-format msgid "while starting inode scan %d" -msgstr "" +msgstr "alustades i-kirje %d skannimist" #, c-format msgid "undelfs: loading deleted files information %d inodes" -msgstr "" +msgstr "undelfs: laetakse kustutatud failide informatsiooni %d i-kirjest" #, c-format msgid "while calling ext2_block_iterate %d" -msgstr "" +msgstr "ext2_block_iterate %d väljakutsel" msgid "no more memory while reallocating array" -msgstr "" +msgstr "puudub mälu massiivi suuruse muutmiseks" #, c-format msgid "while doing inode scan %d" -msgstr "" +msgstr "i-kirje %d skannimisel" #, c-format msgid "Cannot open file %s" -msgstr "" +msgstr "Faili %s avamine nurjus" msgid "undelfs: reading inode bitmap..." -msgstr "" +msgstr "undelfs: loetakse i-kirje andmeid..." #, c-format msgid "" "Cannot load inode bitmap from:\n" "%s" msgstr "" +"I-kirjete andmete laadimine nurjus:\n" +"%s" msgid "undelfs: reading block bitmap..." -msgstr "" +msgstr "undelfs: loetakse plokkide andmeid..." #, c-format msgid "" "Cannot load block bitmap from:\n" "%s" msgstr "" +"Plokkide andmete laadimine nurjus:\n" +"%s" msgid "vfs_info is not fs!" -msgstr "" +msgstr "vfs_info ei viita failisüsteemile!" msgid "You have to chdir to extract files first" -msgstr "" +msgstr "Enne failide lahtipakkimist pead vahetama kataloogi" msgid "while iterating over blocks" -msgstr "" +msgstr "itereerides üle plokkide" #, c-format msgid "Cannot open file \"%s\"" -msgstr "" +msgstr "Faili \"%s\" avamine nurjus" msgid "Ext2lib error" -msgstr "" +msgstr "Ext2lib viga" msgid "Invalid value" -msgstr "" +msgstr "Vigane väärtus" msgid "File was modified. Save with exit?" -msgstr "" +msgstr "Faili on muudetud. Kas väljumisel salvestada?" msgid "&Cancel quit" -msgstr "" +msgstr "&Tühista väljumine" msgid "" "Midnight Commander is being shut down.\n" "Save modified file?" msgstr "" +"Midnight Commander on sulgumas.\n" +"Kas salvestada muudetud fail?" msgid "Cannot spawn child process" -msgstr "" +msgstr "Alamprotsessi loomine nurjus" msgid "Empty output from child filter" -msgstr "" +msgstr "Alamprotsessi filter ei väljastanud mitte midagi" msgid "&Line number (decimal)" -msgstr "" +msgstr "&Rea number (kümnendarv)" msgid "Pe&rcents" -msgstr "" +msgstr "P&rotsendid" msgid "&Decimal offset" -msgstr "" +msgstr "&Kümnendarvu nihe" msgid "He&xadecimal offset" -msgstr "" +msgstr "16nd&arvu nihe" msgid "Goto" -msgstr "" +msgstr "Mine" msgid "ButtonBar|Ascii" -msgstr "" +msgstr "ButtonBar|Ascii" msgid "ButtonBar|HxSrch" -msgstr "" +msgstr "ButtonBar|16otsing" msgid "ButtonBar|UnWrap" -msgstr "" +msgstr "ButtonBar|EiMurra" msgid "ButtonBar|Wrap" -msgstr "" +msgstr "ButtonBar|Murra" msgid "ButtonBar|Hex" -msgstr "" +msgstr "ButtonBar|16nd" msgid "ButtonBar|Goto" -msgstr "" +msgstr "ButtonBar|Mine" msgid "ButtonBar|Raw" -msgstr "" +msgstr "ButtonBar|Toores" msgid "ButtonBar|Parse" -msgstr "" +msgstr "ButtonBar|Parsi" msgid "ButtonBar|Unform" -msgstr "" +msgstr "ButtonBar|Vormita" msgid "ButtonBar|Format" -msgstr "" +msgstr "ButtonBar|Vormiga" #, c-format msgid "" @@ -3993,39 +4239,48 @@ "%s\n" "Data may have been written or not" msgstr "" +"Viga faili sulgemisel:\n" +"%s\n" +"Andmed võidi salvestada või ka mitte" #, c-format msgid "" "Cannot save file:\n" "%s" msgstr "" +"Faili salvestamine nurjus:\n" +"%s" msgid "View: " -msgstr "" +msgstr "Vaade:" #, c-format msgid "" "Cannot open \"%s\"\n" "%s" msgstr "" +"\"%s\" avamine nurjus\n" +"%s" msgid "Cannot view: not a regular file" -msgstr "" +msgstr "Vaataamine ei ole võimalik: tegemist ei ole hariliku failiga" #, c-format msgid "" "Cannot open \"%s\" in parse mode\n" "%s" msgstr "" +"Faili \"%s\" avamine parsimisrežiimis nurjus\n" +"%s" msgid "Seeking to search result" -msgstr "" +msgstr "Liigutakse otsingu tulemuseni" msgid "Search done" -msgstr "" +msgstr "Otsing lõpetatud" msgid "Continue from beginning?" -msgstr "" +msgstr "Kas jätkata algusest?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" -msgstr "" +msgstr "Kohaliku koopia hankimine failist /ftp://some.host/editme.txt nurjus" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/eu.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/eu.gmo differ diff -Nru mc-4.8.10/po/eu.po mc-4.8.11/po/eu.po --- mc-4.8.10/po/eu.po 2013-08-02 19:06:22.000000000 +0000 +++ mc-4.8.11/po/eu.po 2013-11-29 18:47:00.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Basque (http://www.transifex.com/projects/p/mc/language/eu/)\n" "Language: eu\n" @@ -4249,6 +4249,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Ezabatzen" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/fa.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/fa.gmo differ diff -Nru mc-4.8.10/po/fa.po mc-4.8.11/po/fa.po --- mc-4.8.10/po/fa.po 2013-08-02 19:06:22.000000000 +0000 +++ mc-4.8.11/po/fa.po 2013-11-29 18:47:00.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Persian (http://www.transifex.com/projects/p/mc/language/" "fa/)\n" @@ -4029,6 +4029,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "در حال حذف کردن" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/fi.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/fi.gmo differ diff -Nru mc-4.8.10/po/fi.po mc-4.8.11/po/fi.po --- mc-4.8.10/po/fi.po 2013-08-02 19:06:22.000000000 +0000 +++ mc-4.8.11/po/fi.po 2013-11-29 18:47:00.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Finnish (http://www.transifex.com/projects/p/mc/language/" "fi/)\n" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/fr.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/fr.gmo differ diff -Nru mc-4.8.10/po/fr.po mc-4.8.11/po/fr.po --- mc-4.8.10/po/fr.po 2013-08-02 19:06:22.000000000 +0000 +++ mc-4.8.11/po/fr.po 2013-11-29 18:47:00.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: French (http://www.transifex.com/projects/p/mc/language/fr/)\n" "Language: fr\n" @@ -4205,6 +4205,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Effacement" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/gl.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/gl.gmo differ diff -Nru mc-4.8.10/po/gl.po mc-4.8.11/po/gl.po --- mc-4.8.10/po/gl.po 2013-08-02 19:06:22.000000000 +0000 +++ mc-4.8.11/po/gl.po 2013-11-29 18:47:00.000000000 +0000 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Galician (http://www.transifex.com/projects/p/mc/language/" "gl/)\n" @@ -931,6 +931,8 @@ "File \"%s\" is too large.\n" "Open it anyway?" msgstr "" +"O ficheiro «%s» é grande de máis.\n" +"Abrir aínda así?" #, c-format msgid "Error reading from pipe: %s" @@ -1518,7 +1520,7 @@ "escrito para o Midnight Commander." msgid "Copyright (C) 1996-2013 the Free Software Foundation" -msgstr "" +msgstr "Copyright (C) 1996-2013 a Free Software Foundation" msgid "About" msgstr "Sobre" @@ -4281,6 +4283,8 @@ "Cannot open \"%s\" in parse mode\n" "%s" msgstr "" +"Non é posíbel abrir «%s» en modo de análise\n" +"%s" msgid "Seeking to search result" msgstr "Avanzando ao resultado da busca" @@ -4293,6 +4297,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Non é posíbel obter unha copia local de /ftp://some.host/editme.txt" - -#~ msgid "Deleting" -#~ msgstr "Eliminando" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/hr.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/hr.gmo differ diff -Nru mc-4.8.10/po/hr.po mc-4.8.11/po/hr.po --- mc-4.8.10/po/hr.po 2013-08-02 19:06:22.000000000 +0000 +++ mc-4.8.11/po/hr.po 2013-11-29 18:47:00.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Croatian (http://www.transifex.com/projects/p/mc/language/" "hr/)\n" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/hu.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/hu.gmo differ diff -Nru mc-4.8.10/po/hu.po mc-4.8.11/po/hu.po --- mc-4.8.10/po/hu.po 2013-08-02 19:06:22.000000000 +0000 +++ mc-4.8.11/po/hu.po 2013-11-29 18:47:00.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/mc/language/" "hu/)\n" @@ -932,6 +932,8 @@ "File \"%s\" is too large.\n" "Open it anyway?" msgstr "" +" \"%s\" fájl túl nagy.\n" +"Mindenképp megnyitja?" #, c-format msgid "Error reading from pipe: %s" @@ -4294,6 +4296,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Nem sikerült behozni /ftp://some.host/editme.txt helyi másolatát" - -#~ msgid "Deleting" -#~ msgstr "Törlés" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/ia.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/ia.gmo differ diff -Nru mc-4.8.10/po/ia.po mc-4.8.11/po/ia.po --- mc-4.8.10/po/ia.po 2013-08-02 19:06:22.000000000 +0000 +++ mc-4.8.11/po/ia.po 2013-11-29 18:47:00.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/mc/language/" "ia/)\n" @@ -4080,6 +4080,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Deletion..." Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/id.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/id.gmo differ diff -Nru mc-4.8.10/po/id.po mc-4.8.11/po/id.po --- mc-4.8.10/po/id.po 2013-08-02 19:06:22.000000000 +0000 +++ mc-4.8.11/po/id.po 2013-11-29 18:47:00.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/mc/language/" "id/)\n" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/it.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/it.gmo differ diff -Nru mc-4.8.10/po/it.po mc-4.8.11/po/it.po --- mc-4.8.10/po/it.po 2013-08-02 19:06:22.000000000 +0000 +++ mc-4.8.11/po/it.po 2013-11-29 18:47:00.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-05-03 00:01+0200\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-08-04 10:16+0200\n" "Last-Translator: Marco Ciampa \n" "Language-Team: Italian (http://www.transifex.com/projects/p/mc/language/" "it/)\n" @@ -699,7 +699,6 @@ msgid "Set initial line number for the internal editor" msgstr "Imposta numero di riga iniziale per l'editor interno" -#, fuzzy msgid "" "\n" "Please send any bug reports (including the output of 'mc -V')\n" @@ -925,11 +924,13 @@ msgid "\"%s\" is not a regular file" msgstr "\"%s\" non è un file normale" -#, fuzzy, c-format +#, c-format msgid "" "File \"%s\" is too large.\n" "Open it anyway?" -msgstr "Il file \"%s\" è troppo grande" +msgstr "" +"Il file \"%s\" è troppo grande.\n" +"Aprirlo comunque?" #, c-format msgid "Error reading from pipe: %s" @@ -1516,9 +1517,8 @@ "Un semplice editor di testi\n" "scritto per il Midnight Commander." -#, fuzzy msgid "Copyright (C) 1996-2013 the Free Software Foundation" -msgstr "Copyright (C) 1996-2012 the Free Software Foundation" +msgstr "Copyright (C) 1996-2013 the Free Software Foundation" msgid "About" msgstr "Informazioni" @@ -1598,9 +1598,9 @@ msgid "The shell is already running a command" msgstr "La shell sta già eseguendo un comando" -#, fuzzy, c-format +#, c-format msgid "Type 'exit' to return to the Midnight Commander" -msgstr "Premi `exit' per tornare a Midnight Commander" +msgstr "Battere 'exit' per tornare al Midnight Commander" msgid "Set &all" msgstr "Im. &tut." @@ -2154,9 +2154,9 @@ "Non è né un xterm né una console; \n" "i pannelli non possono essere nascosti." -#, fuzzy, c-format +#, c-format msgid "Symlink '%s' points to:" -msgstr "Il colleg. simb. \"%s\" punta a:" +msgstr "Il coll. simb. \"%s\" punta a:" msgid "Edit symlink" msgstr "Modifica coll. simb." @@ -2169,9 +2169,9 @@ msgid "edit symlink: %s" msgstr "modifica del collegamento simb.: %s" -#, fuzzy, c-format +#, c-format msgid "'%s' is not a symbolic link" -msgstr "\"%s\" non è un collegamento simbolico" +msgstr "\"%s\" non è un coll. simbolico" msgid "FTP to machine" msgstr "Connessione FTP" @@ -2754,7 +2754,7 @@ msgid "&Background" msgstr "&Background" -#, fuzzy, c-format +#, c-format msgid "Invalid source pattern '%s'" msgstr "Modello sorgente non valido \"%s\"" @@ -4273,12 +4273,12 @@ msgid "Cannot view: not a regular file" msgstr "Visualizzazione impossibile: non è un semplice file" -#, fuzzy, c-format +#, c-format msgid "" "Cannot open \"%s\" in parse mode\n" "%s" msgstr "" -"Impossibile aprire il file \"%s\"\n" +"Impossibile aprire \"%s\" in modalità analisi\n" "%s" msgid "Seeking to search result" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/ja.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/ja.gmo differ diff -Nru mc-4.8.10/po/ja.po mc-4.8.11/po/ja.po --- mc-4.8.10/po/ja.po 2013-08-02 19:06:22.000000000 +0000 +++ mc-4.8.11/po/ja.po 2013-11-29 18:47:00.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/mc/language/" "ja/)\n" @@ -4081,6 +4081,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "削除" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/ka.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/ka.gmo differ diff -Nru mc-4.8.10/po/ka.po mc-4.8.11/po/ka.po --- mc-4.8.10/po/ka.po 2013-08-02 19:06:22.000000000 +0000 +++ mc-4.8.11/po/ka.po 2013-11-29 18:47:00.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/mc/language/" "ka/)\n" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/kk.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/kk.gmo differ diff -Nru mc-4.8.10/po/kk.po mc-4.8.11/po/kk.po --- mc-4.8.10/po/kk.po 2013-08-02 19:06:22.000000000 +0000 +++ mc-4.8.11/po/kk.po 2013-11-29 18:47:00.000000000 +0000 @@ -7,9 +7,9 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-21 08:27+0000\n" -"Last-Translator: aborodin \n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" +"Last-Translator: Piotr Drąg \n" "Language-Team: Kazakh (http://www.transifex.com/projects/p/mc/language/kk/)\n" "Language: kk\n" "MIME-Version: 1.0\n" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/ko.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/ko.gmo differ diff -Nru mc-4.8.10/po/ko.po mc-4.8.11/po/ko.po --- mc-4.8.10/po/ko.po 2013-08-02 19:06:22.000000000 +0000 +++ mc-4.8.11/po/ko.po 2013-11-29 18:47:00.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Korean (http://www.transifex.com/projects/p/mc/language/ko/)\n" "Language: ko\n" @@ -4071,6 +4071,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "지우기" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/lt.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/lt.gmo differ diff -Nru mc-4.8.10/po/lt.po mc-4.8.11/po/lt.po --- mc-4.8.10/po/lt.po 2013-08-02 19:06:22.000000000 +0000 +++ mc-4.8.11/po/lt.po 2013-11-29 18:47:00.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/mc/language/" "lt/)\n" @@ -4089,6 +4089,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Trinama" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/lv.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/lv.gmo differ diff -Nru mc-4.8.10/po/lv.po mc-4.8.11/po/lv.po --- mc-4.8.10/po/lv.po 2013-08-02 19:06:22.000000000 +0000 +++ mc-4.8.11/po/lv.po 2013-11-29 18:47:00.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Latvian (http://www.transifex.com/projects/p/mc/language/" "lv/)\n" @@ -4078,6 +4078,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Dzēšana" diff -Nru mc-4.8.10/po/mc.pot mc-4.8.11/po/mc.pot --- mc-4.8.10/po/mc.pot 2013-08-02 19:06:08.000000000 +0000 +++ mc-4.8.11/po/mc.pot 2013-11-29 18:46:54.000000000 +0000 @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: mc 4.8.10\n" +"Project-Id-Version: mc 4.8.11\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -106,26 +106,26 @@ "to %s\n" msgstr "" -#: lib/search/lib.c:43 src/diffviewer/search.c:230 src/editor/editcmd.c:798 +#: lib/search/lib.c:44 src/diffviewer/search.c:232 src/editor/editcmd.c:798 #: src/editor/editcmd.c:819 src/editor/editcmd.c:861 src/editor/editcmd.c:950 -#: src/editor/editcmd.c:2653 src/viewer/search.c:107 +#: src/editor/editcmd.c:2658 src/viewer/search.c:107 msgid "Search string not found" msgstr "" -#: lib/search/lib.c:44 +#: lib/search/lib.c:45 msgid "Not implemented yet" msgstr "" -#: lib/search/lib.c:46 +#: lib/search/lib.c:47 msgid "Num of replace tokens not equal to num of found tokens" msgstr "" -#: lib/search/lib.c:47 +#: lib/search/lib.c:48 #, c-format msgid "Invalid token number %d" msgstr "" -#: lib/search/regex.c:269 lib/search/regex.c:736 src/filemanager/ext.c:739 +#: lib/search/regex.c:267 lib/search/regex.c:736 src/filemanager/ext.c:737 msgid "Regular expression error" msgstr "" @@ -167,427 +167,427 @@ "Default skin has been loaded" msgstr "" -#: lib/tty/key.c:102 +#: lib/tty/key.c:105 msgid "Function key 1" msgstr "" -#: lib/tty/key.c:103 +#: lib/tty/key.c:106 msgid "Function key 2" msgstr "" -#: lib/tty/key.c:104 +#: lib/tty/key.c:107 msgid "Function key 3" msgstr "" -#: lib/tty/key.c:105 +#: lib/tty/key.c:108 msgid "Function key 4" msgstr "" -#: lib/tty/key.c:106 +#: lib/tty/key.c:109 msgid "Function key 5" msgstr "" -#: lib/tty/key.c:107 +#: lib/tty/key.c:110 msgid "Function key 6" msgstr "" -#: lib/tty/key.c:108 +#: lib/tty/key.c:111 msgid "Function key 7" msgstr "" -#: lib/tty/key.c:109 +#: lib/tty/key.c:112 msgid "Function key 8" msgstr "" -#: lib/tty/key.c:110 +#: lib/tty/key.c:113 msgid "Function key 9" msgstr "" -#: lib/tty/key.c:111 +#: lib/tty/key.c:114 msgid "Function key 10" msgstr "" -#: lib/tty/key.c:112 +#: lib/tty/key.c:115 msgid "Function key 11" msgstr "" -#: lib/tty/key.c:113 +#: lib/tty/key.c:116 msgid "Function key 12" msgstr "" -#: lib/tty/key.c:114 +#: lib/tty/key.c:117 msgid "Function key 13" msgstr "" -#: lib/tty/key.c:115 +#: lib/tty/key.c:118 msgid "Function key 14" msgstr "" -#: lib/tty/key.c:116 +#: lib/tty/key.c:119 msgid "Function key 15" msgstr "" -#: lib/tty/key.c:117 +#: lib/tty/key.c:120 msgid "Function key 16" msgstr "" -#: lib/tty/key.c:118 +#: lib/tty/key.c:121 msgid "Function key 17" msgstr "" -#: lib/tty/key.c:119 +#: lib/tty/key.c:122 msgid "Function key 18" msgstr "" -#: lib/tty/key.c:120 +#: lib/tty/key.c:123 msgid "Function key 19" msgstr "" -#: lib/tty/key.c:121 +#: lib/tty/key.c:124 msgid "Function key 20" msgstr "" -#: lib/tty/key.c:122 lib/tty/key.c:162 +#: lib/tty/key.c:125 lib/tty/key.c:165 msgid "Backspace key" msgstr "" -#: lib/tty/key.c:123 +#: lib/tty/key.c:126 msgid "End key" msgstr "" -#: lib/tty/key.c:124 +#: lib/tty/key.c:127 msgid "Up arrow key" msgstr "" -#: lib/tty/key.c:125 +#: lib/tty/key.c:128 msgid "Down arrow key" msgstr "" -#: lib/tty/key.c:126 +#: lib/tty/key.c:129 msgid "Left arrow key" msgstr "" -#: lib/tty/key.c:127 +#: lib/tty/key.c:130 msgid "Right arrow key" msgstr "" -#: lib/tty/key.c:128 +#: lib/tty/key.c:131 msgid "Home key" msgstr "" -#: lib/tty/key.c:129 +#: lib/tty/key.c:132 msgid "Page Down key" msgstr "" -#: lib/tty/key.c:130 +#: lib/tty/key.c:133 msgid "Page Up key" msgstr "" -#: lib/tty/key.c:131 lib/tty/key.c:163 +#: lib/tty/key.c:134 lib/tty/key.c:166 msgid "Insert key" msgstr "" -#: lib/tty/key.c:132 lib/tty/key.c:164 +#: lib/tty/key.c:135 lib/tty/key.c:167 msgid "Delete key" msgstr "" -#: lib/tty/key.c:133 +#: lib/tty/key.c:136 msgid "Completion/M-tab" msgstr "" -#: lib/tty/key.c:134 +#: lib/tty/key.c:137 msgid "Back Tabulation S-tab" msgstr "" -#: lib/tty/key.c:135 +#: lib/tty/key.c:138 msgid "+ on keypad" msgstr "" -#: lib/tty/key.c:136 +#: lib/tty/key.c:139 msgid "- on keypad" msgstr "" -#: lib/tty/key.c:137 +#: lib/tty/key.c:140 msgid "Slash on keypad" msgstr "" -#: lib/tty/key.c:138 +#: lib/tty/key.c:141 msgid "* on keypad" msgstr "" -#: lib/tty/key.c:141 lib/tty/key.c:161 +#: lib/tty/key.c:144 lib/tty/key.c:164 msgid "Escape key" msgstr "" -#: lib/tty/key.c:142 +#: lib/tty/key.c:145 msgid "Left arrow keypad" msgstr "" -#: lib/tty/key.c:143 +#: lib/tty/key.c:146 msgid "Right arrow keypad" msgstr "" -#: lib/tty/key.c:144 +#: lib/tty/key.c:147 msgid "Up arrow keypad" msgstr "" -#: lib/tty/key.c:145 +#: lib/tty/key.c:148 msgid "Down arrow keypad" msgstr "" -#: lib/tty/key.c:146 +#: lib/tty/key.c:149 msgid "Home on keypad" msgstr "" -#: lib/tty/key.c:147 +#: lib/tty/key.c:150 msgid "End on keypad" msgstr "" -#: lib/tty/key.c:148 +#: lib/tty/key.c:151 msgid "Page Down keypad" msgstr "" -#: lib/tty/key.c:149 +#: lib/tty/key.c:152 msgid "Page Up keypad" msgstr "" -#: lib/tty/key.c:150 +#: lib/tty/key.c:153 msgid "Insert on keypad" msgstr "" -#: lib/tty/key.c:151 +#: lib/tty/key.c:154 msgid "Delete on keypad" msgstr "" -#: lib/tty/key.c:152 +#: lib/tty/key.c:155 msgid "Enter on keypad" msgstr "" -#: lib/tty/key.c:153 +#: lib/tty/key.c:156 msgid "Function key 21" msgstr "" -#: lib/tty/key.c:154 +#: lib/tty/key.c:157 msgid "Function key 22" msgstr "" -#: lib/tty/key.c:155 +#: lib/tty/key.c:158 msgid "Function key 23" msgstr "" -#: lib/tty/key.c:156 +#: lib/tty/key.c:159 msgid "Function key 24" msgstr "" -#: lib/tty/key.c:157 +#: lib/tty/key.c:160 msgid "A1 key" msgstr "" -#: lib/tty/key.c:158 +#: lib/tty/key.c:161 msgid "C1 key" msgstr "" -#: lib/tty/key.c:165 +#: lib/tty/key.c:168 msgid "Plus" msgstr "" -#: lib/tty/key.c:166 +#: lib/tty/key.c:169 msgid "Minus" msgstr "" -#: lib/tty/key.c:167 +#: lib/tty/key.c:170 msgid "Asterisk" msgstr "" -#: lib/tty/key.c:168 +#: lib/tty/key.c:171 msgid "Dot" msgstr "" -#: lib/tty/key.c:169 +#: lib/tty/key.c:172 msgid "Less than" msgstr "" -#: lib/tty/key.c:170 +#: lib/tty/key.c:173 msgid "Great than" msgstr "" -#: lib/tty/key.c:171 +#: lib/tty/key.c:174 msgid "Equal" msgstr "" -#: lib/tty/key.c:172 +#: lib/tty/key.c:175 msgid "Comma" msgstr "" -#: lib/tty/key.c:173 +#: lib/tty/key.c:176 msgid "Apostrophe" msgstr "" -#: lib/tty/key.c:174 +#: lib/tty/key.c:177 msgid "Colon" msgstr "" -#: lib/tty/key.c:175 +#: lib/tty/key.c:178 msgid "Exclamation mark" msgstr "" -#: lib/tty/key.c:176 +#: lib/tty/key.c:179 msgid "Question mark" msgstr "" -#: lib/tty/key.c:177 +#: lib/tty/key.c:180 msgid "Ampersand" msgstr "" -#: lib/tty/key.c:178 +#: lib/tty/key.c:181 msgid "Dollar sign" msgstr "" -#: lib/tty/key.c:179 +#: lib/tty/key.c:182 msgid "Quotation mark" msgstr "" -#: lib/tty/key.c:180 +#: lib/tty/key.c:183 msgid "Percent sign" msgstr "" -#: lib/tty/key.c:181 +#: lib/tty/key.c:184 msgid "Caret" msgstr "" -#: lib/tty/key.c:182 +#: lib/tty/key.c:185 msgid "Tilda" msgstr "" -#: lib/tty/key.c:183 +#: lib/tty/key.c:186 msgid "Prime" msgstr "" -#: lib/tty/key.c:184 +#: lib/tty/key.c:187 msgid "Underline" msgstr "" -#: lib/tty/key.c:185 +#: lib/tty/key.c:188 msgid "Understrike" msgstr "" -#: lib/tty/key.c:186 +#: lib/tty/key.c:189 msgid "Pipe" msgstr "" -#: lib/tty/key.c:187 +#: lib/tty/key.c:190 msgid "Left parenthesis" msgstr "" -#: lib/tty/key.c:188 +#: lib/tty/key.c:191 msgid "Right parenthesis" msgstr "" -#: lib/tty/key.c:189 +#: lib/tty/key.c:192 msgid "Left bracket" msgstr "" -#: lib/tty/key.c:190 +#: lib/tty/key.c:193 msgid "Right bracket" msgstr "" -#: lib/tty/key.c:191 +#: lib/tty/key.c:194 msgid "Left brace" msgstr "" -#: lib/tty/key.c:192 +#: lib/tty/key.c:195 msgid "Right brace" msgstr "" -#: lib/tty/key.c:193 +#: lib/tty/key.c:196 msgid "Enter" msgstr "" -#: lib/tty/key.c:194 +#: lib/tty/key.c:197 msgid "Tab key" msgstr "" -#: lib/tty/key.c:195 +#: lib/tty/key.c:198 msgid "Space key" msgstr "" -#: lib/tty/key.c:196 +#: lib/tty/key.c:199 msgid "Slash key" msgstr "" -#: lib/tty/key.c:197 +#: lib/tty/key.c:200 msgid "Backslash key" msgstr "" -#: lib/tty/key.c:198 lib/tty/key.c:199 +#: lib/tty/key.c:201 lib/tty/key.c:202 msgid "Number sign #" msgstr "" #. TRANSLATORS: Please translate as in "at sign" (@). -#: lib/tty/key.c:201 +#: lib/tty/key.c:204 msgid "At sign" msgstr "" -#: lib/tty/key.c:204 lib/tty/key.c:205 +#: lib/tty/key.c:207 lib/tty/key.c:208 msgid "Ctrl" msgstr "" -#: lib/tty/key.c:206 lib/tty/key.c:207 lib/tty/key.c:208 +#: lib/tty/key.c:209 lib/tty/key.c:210 lib/tty/key.c:211 msgid "Alt" msgstr "" -#: lib/tty/key.c:209 +#: lib/tty/key.c:212 msgid "Shift" msgstr "" -#: lib/tty/tty.c:98 +#: lib/tty/tty.c:99 msgid "The TERM environment variable is unset!\n" msgstr "" -#: lib/tty/tty-slang.c:284 +#: lib/tty/tty-slang.c:281 #, c-format msgid "" "Screen size %dx%d is not supported.\n" "Check the TERM environment variable.\n" msgstr "" -#: lib/utilunix.c:514 lib/utilunix.c:519 lib/utilunix.c:574 +#: lib/utilunix.c:517 lib/utilunix.c:522 lib/utilunix.c:577 #: src/editor/edit.c:319 src/editor/editcmd.c:206 src/editor/editcmd.c:229 -#: src/editor/editcmd.c:400 src/editor/editcmd.c:562 src/editor/editcmd.c:1671 -#: src/editor/editcmd.c:3372 src/editor/editcmd.c:3401 -#: src/editor/editcmd_dialogs.c:471 src/execute.c:133 -#: src/filemanager/file.c:1645 src/filemanager/panel.c:4249 src/help.c:362 -#: src/main.c:359 src/main.c:389 src/subshell.c:389 src/subshell.c:1058 +#: src/editor/editcmd.c:400 src/editor/editcmd.c:562 src/editor/editcmd.c:1675 +#: src/editor/editcmd.c:3375 src/editor/editcmd.c:3404 +#: src/editor/editcmd_dialogs.c:478 src/execute.c:135 +#: src/filemanager/file.c:1660 src/filemanager/panel.c:4245 src/help.c:363 +#: src/main.c:358 src/main.c:392 src/subshell.c:391 src/subshell.c:1062 #: src/viewer/actions_cmd.c:420 msgid "Warning" msgstr "" -#: lib/utilunix.c:514 src/filemanager/ext.c:721 +#: lib/utilunix.c:517 src/filemanager/ext.c:719 msgid "Pipe failed" msgstr "" -#: lib/utilunix.c:519 +#: lib/utilunix.c:522 msgid "Dup failed" msgstr "" -#: lib/utilunix.c:582 +#: lib/utilunix.c:585 msgid "Error dup'ing old error pipe" msgstr "" -#: lib/vfs/direntry.c:278 +#: lib/vfs/direntry.c:277 #, c-format msgid "Directory cache expired for %s" msgstr "" -#: lib/vfs/direntry.c:708 lib/vfs/direntry.c:711 +#: lib/vfs/direntry.c:707 lib/vfs/direntry.c:710 msgid "bytes transferred" msgstr "" -#: lib/vfs/direntry.c:1298 +#: lib/vfs/direntry.c:1297 msgid "Starting linear transfer..." msgstr "" -#: lib/vfs/direntry.c:1379 +#: lib/vfs/direntry.c:1378 msgid "Getting file" msgstr "" @@ -625,24 +625,24 @@ msgid "Temporary files will not be created\n" msgstr "" -#: lib/vfs/interface.c:904 src/execute.c:329 +#: lib/vfs/interface.c:904 src/execute.c:332 #, c-format msgid "Press any key to continue..." msgstr "" -#: lib/vfs/parse_ls_vga.c:864 +#: lib/vfs/parse_ls_vga.c:869 msgid "Cannot parse:" msgstr "" -#: lib/vfs/parse_ls_vga.c:867 +#: lib/vfs/parse_ls_vga.c:872 msgid "More parsing errors will be ignored." msgstr "" -#: lib/vfs/utilvfs.c:343 +#: lib/vfs/utilvfs.c:356 msgid "Internal error:" msgstr "" -#: lib/vfs/utilvfs.c:352 src/filemanager/boxes.c:1189 +#: lib/vfs/utilvfs.c:365 src/filemanager/boxes.c:1192 msgid "Password:" msgstr "" @@ -650,7 +650,7 @@ msgid "Screens" msgstr "" -#: lib/widget/history.c:302 lib/widget/history.c:324 +#: lib/widget/history.c:302 lib/widget/history.c:325 msgid "History" msgstr "" @@ -664,48 +664,48 @@ msgstr "" #: lib/widget/listbox.c:285 src/diffviewer/ydiff.c:3099 src/editor/edit.c:319 -#: src/editor/editcmd.c:208 src/editor/editcmd.c:231 src/editor/editcmd.c:2777 -#: src/editor/editcmd.c:2783 src/filemanager/cmd.c:143 -#: src/filemanager/file.c:689 src/filemanager/file.c:2754 +#: src/editor/editcmd.c:208 src/editor/editcmd.c:231 src/editor/editcmd.c:2781 +#: src/editor/editcmd.c:2787 src/filemanager/cmd.c:143 +#: src/filemanager/file.c:690 src/filemanager/file.c:2761 #: src/filemanager/filegui.c:439 src/filemanager/hotlist.c:1122 #: src/filemanager/hotlist.c:1139 src/filemanager/midnight.c:1036 #: src/filemanager/midnight.c:1044 src/filemanager/panel.c:2597 -#: src/filemanager/tree.c:881 src/subshell.c:1060 src/viewer/actions_cmd.c:617 +#: src/filemanager/tree.c:881 src/subshell.c:1064 src/viewer/actions_cmd.c:617 #: src/viewer/actions_cmd.c:623 src/viewer/search.c:323 msgid "&Yes" msgstr "" #: lib/widget/listbox.c:285 src/diffviewer/ydiff.c:3099 src/editor/edit.c:319 -#: src/editor/editcmd.c:208 src/editor/editcmd.c:2777 -#: src/editor/editcmd.c:2783 src/filemanager/cmd.c:143 -#: src/filemanager/file.c:689 src/filemanager/file.c:2754 +#: src/editor/editcmd.c:208 src/editor/editcmd.c:2781 +#: src/editor/editcmd.c:2787 src/filemanager/cmd.c:143 +#: src/filemanager/file.c:690 src/filemanager/file.c:2761 #: src/filemanager/filegui.c:441 src/filemanager/hotlist.c:1122 #: src/filemanager/hotlist.c:1139 src/filemanager/midnight.c:1036 #: src/filemanager/midnight.c:1044 src/filemanager/panel.c:2597 -#: src/filemanager/tree.c:881 src/subshell.c:1060 src/viewer/actions_cmd.c:617 +#: src/filemanager/tree.c:881 src/subshell.c:1064 src/viewer/actions_cmd.c:617 #: src/viewer/actions_cmd.c:623 src/viewer/search.c:324 msgid "&No" msgstr "" -#: lib/widget/quick.h:215 src/editor/editcmd.c:2653 +#: lib/widget/quick.h:215 src/editor/editcmd.c:2658 #: src/editor/editcmd_dialogs.c:121 src/editor/editwidget.c:150 -#: src/filemanager/boxes.c:1111 src/filemanager/filegui.c:1231 -#: src/filemanager/find.c:526 src/filemanager/layout.c:451 src/subshell.c:392 +#: src/filemanager/boxes.c:1114 src/filemanager/filegui.c:1244 +#: src/filemanager/find.c:526 src/filemanager/layout.c:461 src/subshell.c:394 msgid "&OK" msgstr "" #: lib/widget/quick.h:216 src/editor/editcmd.c:208 src/editor/editcmd.c:231 -#: src/editor/editcmd.c:402 src/editor/editcmd.c:565 src/editor/editcmd.c:1672 -#: src/editor/editcmd.c:2026 src/editor/editcmd.c:2777 -#: src/editor/editcmd.c:3375 src/editor/editcmd.c:3404 -#: src/editor/editcmd_dialogs.c:123 src/editor/editcmd_dialogs.c:278 -#: src/editor/editcmd_dialogs.c:473 src/editor/spell_dialogs.c:99 +#: src/editor/editcmd.c:402 src/editor/editcmd.c:565 src/editor/editcmd.c:1676 +#: src/editor/editcmd.c:2024 src/editor/editcmd.c:2781 +#: src/editor/editcmd.c:3378 src/editor/editcmd.c:3407 +#: src/editor/editcmd_dialogs.c:123 src/editor/editcmd_dialogs.c:284 +#: src/editor/editcmd_dialogs.c:480 src/editor/spell_dialogs.c:99 #: src/filemanager/achown.c:97 src/filemanager/chmod.c:126 -#: src/filemanager/chown.c:92 src/filemanager/cmd.c:1279 -#: src/filemanager/filegui.c:1235 src/filemanager/find.c:526 +#: src/filemanager/chown.c:92 src/filemanager/cmd.c:1289 +#: src/filemanager/filegui.c:1248 src/filemanager/find.c:526 #: src/filemanager/hotlist.c:192 src/filemanager/hotlist.c:978 -#: src/filemanager/hotlist.c:1040 src/filemanager/layout.c:452 -#: src/filemanager/panelize.c:144 src/learn.c:258 src/viewer/hex.c:389 +#: src/filemanager/hotlist.c:1040 src/filemanager/layout.c:462 +#: src/filemanager/panelize.c:144 src/learn.c:258 src/viewer/hex.c:408 msgid "&Cancel" msgstr "" @@ -713,10 +713,10 @@ msgid "Background process:" msgstr "" -#: lib/widget/wtools.c:287 lib/widget/wtools.c:412 src/editor/edit.c:164 -#: src/editor/edit.c:177 src/editor/edit.c:332 src/editor/edit.c:1921 -#: src/editor/edit.c:1931 src/editor/editcmd.c:293 src/editor/editcmd.c:303 -#: src/editor/editcmd.c:344 src/editor/editcmd.c:2878 src/editor/spell.c:318 +#: lib/widget/wtools.c:285 lib/widget/wtools.c:412 src/editor/edit.c:164 +#: src/editor/edit.c:175 src/editor/edit.c:332 src/editor/edit.c:1925 +#: src/editor/edit.c:1935 src/editor/editcmd.c:293 src/editor/editcmd.c:303 +#: src/editor/editcmd.c:344 src/editor/editcmd.c:2881 src/editor/spell.c:318 #: src/editor/spell.c:555 src/editor/spell.c:563 #: tests/src/execute__common.c:145 #: tests/src/execute__execute_with_vfs_arg.c:154 @@ -889,7 +889,7 @@ msgid "GNU Midnight Commander %s\n" msgstr "" -#: src/args.c:597 src/filemanager/boxes.c:537 +#: src/args.c:597 src/filemanager/boxes.c:536 msgid "Main options" msgstr "" @@ -909,8 +909,8 @@ msgid "Two files are required to evoke the diffviewer." msgstr "" -#: src/background.c:213 src/background.c:287 src/filemanager/file.c:601 -#: src/filemanager/file.c:643 +#: src/background.c:213 src/background.c:287 src/filemanager/file.c:602 +#: src/filemanager/file.c:644 msgid "Background process error" msgstr "" @@ -943,47 +943,47 @@ msgstr "" #: src/diffviewer/search.c:85 src/editor/editcmd_dialogs.c:104 -#: src/editor/editcmd_dialogs.c:195 src/viewer/dialogs.c:90 +#: src/editor/editcmd_dialogs.c:201 src/viewer/dialogs.c:90 msgid "Enter search string:" msgstr "" #: src/diffviewer/search.c:92 src/editor/editcmd_dialogs.c:112 -#: src/editor/editcmd_dialogs.c:205 src/filemanager/boxes.c:524 -#: src/filemanager/boxes.c:729 src/filemanager/find.c:512 +#: src/editor/editcmd_dialogs.c:211 src/filemanager/boxes.c:529 +#: src/filemanager/boxes.c:728 src/filemanager/find.c:512 #: src/viewer/dialogs.c:98 msgid "Cas&e sensitive" msgstr "" #: src/diffviewer/search.c:93 src/editor/editcmd_dialogs.c:113 -#: src/editor/editcmd_dialogs.c:206 src/viewer/dialogs.c:99 +#: src/editor/editcmd_dialogs.c:212 src/viewer/dialogs.c:99 msgid "&Backwards" msgstr "" #: src/diffviewer/search.c:94 src/editor/editcmd_dialogs.c:115 -#: src/editor/editcmd_dialogs.c:208 src/filemanager/find.c:523 +#: src/editor/editcmd_dialogs.c:214 src/filemanager/find.c:523 #: src/viewer/dialogs.c:100 msgid "&Whole words" msgstr "" #: src/diffviewer/search.c:96 src/editor/editcmd_dialogs.c:117 -#: src/editor/editcmd_dialogs.c:210 src/filemanager/find.c:510 +#: src/editor/editcmd_dialogs.c:216 src/filemanager/find.c:510 #: src/viewer/dialogs.c:102 msgid "&All charsets" msgstr "" -#: src/diffviewer/search.c:106 src/diffviewer/search.c:230 -#: src/diffviewer/search.c:243 src/diffviewer/search.c:270 -#: src/editor/editcmd.c:950 src/editor/editcmd.c:980 src/editor/editcmd.c:2547 +#: src/diffviewer/search.c:106 src/diffviewer/search.c:232 +#: src/diffviewer/search.c:245 src/diffviewer/search.c:278 +#: src/editor/editcmd.c:950 src/editor/editcmd.c:980 src/editor/editcmd.c:2552 #: src/editor/editcmd_dialogs.c:130 src/viewer/dialogs.c:112 #: src/viewer/search.c:142 src/viewer/search.c:244 src/viewer/search.c:347 msgid "Search" msgstr "" -#: src/diffviewer/search.c:243 src/diffviewer/search.c:270 +#: src/diffviewer/search.c:245 src/diffviewer/search.c:278 msgid "Search is disabled" msgstr "" -#: src/diffviewer/ydiff.c:172 +#: src/diffviewer/ydiff.c:174 #, c-format msgid "" "Cannot create temporary diff file\n" @@ -1061,7 +1061,7 @@ msgid "Goto line (right)" msgstr "" -#: src/diffviewer/ydiff.c:2912 src/editor/editcmd.c:2959 +#: src/diffviewer/ydiff.c:2912 src/editor/editcmd.c:2962 msgid "Enter line:" msgstr "" @@ -1100,7 +1100,7 @@ msgid "ButtonBar|Quit" msgstr "" -#: src/diffviewer/ydiff.c:3096 src/editor/editcmd.c:2783 +#: src/diffviewer/ydiff.c:3096 src/editor/editcmd.c:2787 #: src/viewer/actions_cmd.c:615 src/viewer/actions_cmd.c:621 msgid "Quit" msgstr "" @@ -1126,7 +1126,7 @@ msgstr "" #: src/diffviewer/ydiff.c:3577 src/diffviewer/ydiff.c:3594 -#: src/filemanager/file.c:2656 src/viewer/mcviewer.c:336 +#: src/filemanager/file.c:2663 src/viewer/mcviewer.c:336 #, c-format msgid "" "Cannot stat \"%s\"\n" @@ -1158,7 +1158,7 @@ msgid "Cannot open %s for reading" msgstr "" -#: src/editor/edit.c:176 +#: src/editor/edit.c:174 #, c-format msgid "Error reading %s" msgstr "" @@ -1180,12 +1180,12 @@ "Open it anyway?" msgstr "" -#: src/editor/edit.c:1920 +#: src/editor/edit.c:1924 #, c-format msgid "Error reading from pipe: %s" msgstr "" -#: src/editor/edit.c:1930 +#: src/editor/edit.c:1934 #, c-format msgid "Cannot open pipe for reading: %s" msgstr "" @@ -1217,8 +1217,8 @@ msgid "The file you are saving is not finished with a newline" msgstr "" -#: src/editor/editcmd.c:402 src/editor/editcmd.c:565 src/editor/editcmd.c:3374 -#: src/editor/editcmd.c:3403 src/editor/editcmd_dialogs.c:473 +#: src/editor/editcmd.c:402 src/editor/editcmd.c:565 src/editor/editcmd.c:3377 +#: src/editor/editcmd.c:3406 src/editor/editcmd_dialogs.c:480 msgid "C&ontinue" msgstr "" @@ -1238,9 +1238,9 @@ msgid "&Macintosh format (CR)" msgstr "" -#: src/editor/editcmd.c:423 src/editor/editcmd.c:2047 -#: src/editor/editcmd.c:3002 src/editor/editcmd.c:3034 -#: src/filemanager/cmd.c:860 +#: src/editor/editcmd.c:423 src/editor/editcmd.c:2045 +#: src/editor/editcmd.c:3005 src/editor/editcmd.c:3037 +#: src/filemanager/cmd.c:868 msgid "Enter file name:" msgstr "" @@ -1256,266 +1256,266 @@ msgid "Block is large, you may not be able to undo this action" msgstr "" -#: src/editor/editcmd.c:1568 +#: src/editor/editcmd.c:1572 msgid "&Quick save" msgstr "" -#: src/editor/editcmd.c:1569 +#: src/editor/editcmd.c:1573 msgid "&Safe save" msgstr "" -#: src/editor/editcmd.c:1570 +#: src/editor/editcmd.c:1574 msgid "&Do backups with following extension:" msgstr "" -#: src/editor/editcmd.c:1591 +#: src/editor/editcmd.c:1595 msgid "Check &POSIX new line" msgstr "" -#: src/editor/editcmd.c:1599 +#: src/editor/editcmd.c:1603 msgid "Edit Save Mode" msgstr "" -#: src/editor/editcmd.c:1656 src/editor/editcmd.c:1726 +#: src/editor/editcmd.c:1660 src/editor/editcmd.c:1730 msgid "Save as" msgstr "" -#: src/editor/editcmd.c:1658 +#: src/editor/editcmd.c:1662 msgid "Cannot save: destination is not a regular file" msgstr "" -#: src/editor/editcmd.c:1672 +#: src/editor/editcmd.c:1676 msgid "A file already exists with this name" msgstr "" -#: src/editor/editcmd.c:1672 +#: src/editor/editcmd.c:1676 msgid "&Overwrite" msgstr "" -#: src/editor/editcmd.c:1726 src/editor/editcmd.c:3012 +#: src/editor/editcmd.c:1730 src/editor/editcmd.c:3015 msgid "Cannot save file" msgstr "" -#: src/editor/editcmd.c:1751 src/editor/editcmd.c:1754 +#: src/editor/editcmd.c:1755 src/editor/editcmd.c:1758 msgid "Delete macro" msgstr "" -#: src/editor/editcmd.c:1751 +#: src/editor/editcmd.c:1755 msgid "Press macro hotkey:" msgstr "" -#: src/editor/editcmd.c:1754 +#: src/editor/editcmd.c:1758 msgid "Macro not deleted" msgstr "" -#: src/editor/editcmd.c:1809 +#: src/editor/editcmd.c:1813 msgid "Save macro" msgstr "" -#: src/editor/editcmd.c:1809 +#: src/editor/editcmd.c:1813 msgid "Press the macro's new hotkey:" msgstr "" -#: src/editor/editcmd.c:1883 +#: src/editor/editcmd.c:1887 msgid "Repeat last commands" msgstr "" -#: src/editor/editcmd.c:1883 +#: src/editor/editcmd.c:1887 msgid "Repeat times:" msgstr "" -#: src/editor/editcmd.c:2024 +#: src/editor/editcmd.c:2022 #, c-format msgid "Confirm save file: \"%s\"" msgstr "" -#: src/editor/editcmd.c:2026 src/viewer/hex.c:377 src/viewer/hex.c:389 +#: src/editor/editcmd.c:2024 src/viewer/hex.c:396 src/viewer/hex.c:408 msgid "Save file" msgstr "" -#: src/editor/editcmd.c:2026 src/editor/editmenu.c:77 src/learn.c:196 +#: src/editor/editcmd.c:2024 src/editor/editmenu.c:77 src/learn.c:196 #: src/learn.c:257 msgid "&Save" msgstr "" -#: src/editor/editcmd.c:2047 +#: src/editor/editcmd.c:2045 msgid "Load" msgstr "" -#: src/editor/editcmd.c:2080 +#: src/editor/editcmd.c:2078 msgid "Syntax file edit" msgstr "" -#: src/editor/editcmd.c:2081 +#: src/editor/editcmd.c:2079 msgid "Which syntax file you want to edit?" msgstr "" -#: src/editor/editcmd.c:2082 src/editor/editcmd.c:2127 -#: src/filemanager/cmd.c:1099 src/filemanager/cmd.c:1135 -#: src/filemanager/cmd.c:1193 +#: src/editor/editcmd.c:2080 src/editor/editcmd.c:2125 +#: src/filemanager/cmd.c:1106 src/filemanager/cmd.c:1144 +#: src/filemanager/cmd.c:1201 msgid "&User" msgstr "" -#: src/editor/editcmd.c:2082 src/editor/editcmd.c:2127 +#: src/editor/editcmd.c:2080 src/editor/editcmd.c:2125 msgid "&System wide" msgstr "" -#: src/editor/editcmd.c:2125 src/filemanager/cmd.c:1133 +#: src/editor/editcmd.c:2123 src/filemanager/cmd.c:1142 msgid "Menu edit" msgstr "" -#: src/editor/editcmd.c:2126 src/filemanager/cmd.c:1134 +#: src/editor/editcmd.c:2124 src/filemanager/cmd.c:1143 msgid "Which menu file do you want to edit?" msgstr "" -#: src/editor/editcmd.c:2127 src/filemanager/cmd.c:1135 +#: src/editor/editcmd.c:2125 src/filemanager/cmd.c:1144 msgid "&Local" msgstr "" -#: src/editor/editcmd.c:2612 src/editor/editcmd.c:2653 -#: src/editor/editcmd.c:2664 src/editor/editcmd_dialogs.c:220 +#: src/editor/editcmd.c:2617 src/editor/editcmd.c:2658 +#: src/editor/editcmd.c:2669 src/editor/editcmd_dialogs.c:226 msgid "Replace" msgstr "" -#: src/editor/editcmd.c:2664 +#: src/editor/editcmd.c:2669 #, c-format msgid "%ld replacements made" msgstr "" -#: src/editor/editcmd.c:2749 src/editor/editwidget.c:394 +#: src/editor/editcmd.c:2759 src/editor/editwidget.c:394 msgid "[NoName]" msgstr "" -#: src/editor/editcmd.c:2776 +#: src/editor/editcmd.c:2780 #, c-format msgid "" "File %s was modified.\n" "Save before close?" msgstr "" -#: src/editor/editcmd.c:2777 +#: src/editor/editcmd.c:2781 msgid "Close file" msgstr "" -#: src/editor/editcmd.c:2781 +#: src/editor/editcmd.c:2785 #, c-format msgid "" "Midnight Commander is being shut down.\n" "Save modified file %s?" msgstr "" -#: src/editor/editcmd.c:2878 +#: src/editor/editcmd.c:2881 msgid "This function is not implemented" msgstr "" -#: src/editor/editcmd.c:2893 +#: src/editor/editcmd.c:2896 msgid "Copy to clipboard" msgstr "" -#: src/editor/editcmd.c:2893 src/editor/editcmd.c:2914 +#: src/editor/editcmd.c:2896 src/editor/editcmd.c:2917 msgid "Unable to save to file" msgstr "" -#: src/editor/editcmd.c:2914 +#: src/editor/editcmd.c:2917 msgid "Cut to clipboard" msgstr "" -#: src/editor/editcmd.c:2959 +#: src/editor/editcmd.c:2962 msgid "Goto line" msgstr "" -#: src/editor/editcmd.c:3002 src/editor/editcmd.c:3012 +#: src/editor/editcmd.c:3005 src/editor/editcmd.c:3015 msgid "Save block" msgstr "" -#: src/editor/editcmd.c:3034 src/editor/editcmd.c:3049 +#: src/editor/editcmd.c:3037 src/editor/editcmd.c:3052 msgid "Insert file" msgstr "" -#: src/editor/editcmd.c:3049 +#: src/editor/editcmd.c:3052 msgid "Cannot insert file" msgstr "" -#: src/editor/editcmd.c:3071 +#: src/editor/editcmd.c:3074 msgid "Sort block" msgstr "" -#: src/editor/editcmd.c:3071 +#: src/editor/editcmd.c:3074 msgid "You must first highlight a block of text" msgstr "" -#: src/editor/editcmd.c:3079 +#: src/editor/editcmd.c:3082 msgid "Run sort" msgstr "" -#: src/editor/editcmd.c:3080 +#: src/editor/editcmd.c:3083 msgid "Enter sort options (see manpage) separated by whitespace:" msgstr "" -#: src/editor/editcmd.c:3101 src/editor/editcmd.c:3108 +#: src/editor/editcmd.c:3104 src/editor/editcmd.c:3111 msgid "Sort" msgstr "" -#: src/editor/editcmd.c:3101 +#: src/editor/editcmd.c:3104 msgid "Cannot execute sort command" msgstr "" -#: src/editor/editcmd.c:3107 +#: src/editor/editcmd.c:3110 #, c-format msgid "Sort returned non-zero: %s" msgstr "" -#: src/editor/editcmd.c:3142 +#: src/editor/editcmd.c:3145 msgid "Paste output of external command" msgstr "" -#: src/editor/editcmd.c:3143 +#: src/editor/editcmd.c:3146 msgid "Enter shell command(s):" msgstr "" -#: src/editor/editcmd.c:3160 +#: src/editor/editcmd.c:3163 msgid "External command" msgstr "" -#: src/editor/editcmd.c:3160 +#: src/editor/editcmd.c:3163 msgid "Cannot execute command" msgstr "" -#: src/editor/editcmd.c:3211 +#: src/editor/editcmd.c:3214 msgid "mail -s -c " msgstr "" -#: src/editor/editcmd.c:3212 +#: src/editor/editcmd.c:3215 msgid "To" msgstr "" -#: src/editor/editcmd.c:3215 +#: src/editor/editcmd.c:3218 msgid "Subject" msgstr "" -#: src/editor/editcmd.c:3218 +#: src/editor/editcmd.c:3221 msgid "Copies to" msgstr "" -#: src/editor/editcmd.c:3228 +#: src/editor/editcmd.c:3231 msgid "Mail" msgstr "" -#: src/editor/editcmd.c:3335 +#: src/editor/editcmd.c:3338 msgid "Insert literal" msgstr "" -#: src/editor/editcmd.c:3336 +#: src/editor/editcmd.c:3339 msgid "Press any key:" msgstr "" -#: src/editor/editcmd.c:3373 src/editor/editcmd.c:3402 +#: src/editor/editcmd.c:3376 src/editor/editcmd.c:3405 msgid "" "Current text was modified without a file save.\n" "Continue discards these changes" msgstr "" -#: src/editor/editcmd_dialogs.c:114 src/editor/editcmd_dialogs.c:207 +#: src/editor/editcmd_dialogs.c:114 src/editor/editcmd_dialogs.c:213 msgid "In se&lection" msgstr "" @@ -1523,38 +1523,38 @@ msgid "&Find all" msgstr "" -#: src/editor/editcmd_dialogs.c:198 +#: src/editor/editcmd_dialogs.c:204 msgid "Enter replacement string:" msgstr "" -#: src/editor/editcmd_dialogs.c:272 +#: src/editor/editcmd_dialogs.c:278 msgid "Replace with:" msgstr "" -#: src/editor/editcmd_dialogs.c:275 src/editor/spell_dialogs.c:95 +#: src/editor/editcmd_dialogs.c:281 src/editor/spell_dialogs.c:95 msgid "&Replace" msgstr "" -#: src/editor/editcmd_dialogs.c:276 src/filemanager/file.c:689 +#: src/editor/editcmd_dialogs.c:282 src/filemanager/file.c:690 #: src/filemanager/filegui.c:449 msgid "A&ll" msgstr "" -#: src/editor/editcmd_dialogs.c:277 src/editor/spell_dialogs.c:97 -#: src/filemanager/file.c:604 src/filemanager/file.c:645 -#: src/filemanager/file.c:2465 src/filemanager/filegui.c:258 +#: src/editor/editcmd_dialogs.c:283 src/editor/spell_dialogs.c:97 +#: src/filemanager/file.c:605 src/filemanager/file.c:646 +#: src/filemanager/file.c:2473 src/filemanager/filegui.c:258 msgid "&Skip" msgstr "" -#: src/editor/editcmd_dialogs.c:285 +#: src/editor/editcmd_dialogs.c:291 msgid "Confirm replace" msgstr "" -#: src/editor/editcmd_dialogs.c:326 +#: src/editor/editcmd_dialogs.c:332 msgid "Cancel" msgstr "" -#: src/editor/editcmd_dialogs.c:472 +#: src/editor/editcmd_dialogs.c:479 msgid "" "Current text was modified without a file save.\n" "Continue discards these changes." @@ -1596,7 +1596,7 @@ msgid "A&bout..." msgstr "" -#: src/editor/editmenu.c:87 src/filemanager/find.c:192 src/subshell.c:392 +#: src/editor/editmenu.c:87 src/filemanager/find.c:192 src/subshell.c:394 msgid "&Quit" msgstr "" @@ -1636,7 +1636,7 @@ msgid "Mo&ve" msgstr "" -#: src/editor/editmenu.c:112 src/filemanager/file.c:1928 +#: src/editor/editmenu.c:112 src/filemanager/file.c:1943 #: src/filemanager/midnight.c:257 msgid "&Delete" msgstr "" @@ -1894,7 +1894,7 @@ msgstr "" #: src/editor/editoptions.c:164 src/filemanager/boxes.c:466 -#: src/filemanager/layout.c:444 +#: src/filemanager/layout.c:454 msgid "Other options" msgstr "" @@ -2017,23 +2017,23 @@ msgid "Select language" msgstr "" -#: src/editor/syntax.c:1501 src/editor/syntax.c:1507 +#: src/editor/syntax.c:1503 src/editor/syntax.c:1509 msgid "Load syntax file" msgstr "" -#: src/editor/syntax.c:1502 src/filemanager/usermenu.c:941 src/help.c:1087 +#: src/editor/syntax.c:1504 src/filemanager/usermenu.c:948 src/help.c:1087 #, c-format msgid "" "Cannot open file %s\n" "%s" msgstr "" -#: src/editor/syntax.c:1508 +#: src/editor/syntax.c:1510 #, c-format msgid "Error in file %s on line %d" msgstr "" -#: src/execute.c:134 +#: src/execute.c:136 msgid "" "The Commander can't change to the directory that\n" "the subshell claims you are in. Perhaps you have\n" @@ -2041,16 +2041,16 @@ "extra access permissions with the \"su\" command?" msgstr "" -#: src/execute.c:193 src/filemanager/ext.c:654 +#: src/execute.c:196 src/filemanager/ext.c:652 #, c-format msgid "Cannot fetch a local copy of %s" msgstr "" -#: src/execute.c:428 src/filemanager/command.c:285 +#: src/execute.c:431 src/filemanager/command.c:285 msgid "The shell is already running a command" msgstr "" -#: src/execute.c:487 +#: src/execute.c:492 #, c-format msgid "Type 'exit' to return to the Midnight Commander" msgstr "" @@ -2069,30 +2069,30 @@ msgid "&Set" msgstr "" -#: src/filemanager/achown.c:332 src/filemanager/achown.c:434 -#: src/filemanager/achown.c:441 +#: src/filemanager/achown.c:333 src/filemanager/achown.c:435 +#: src/filemanager/achown.c:442 msgid "owner" msgstr "" -#: src/filemanager/achown.c:332 src/filemanager/achown.c:436 -#: src/filemanager/achown.c:443 +#: src/filemanager/achown.c:333 src/filemanager/achown.c:437 +#: src/filemanager/achown.c:444 msgid "group" msgstr "" -#: src/filemanager/achown.c:438 +#: src/filemanager/achown.c:439 msgid "other" msgstr "" -#: src/filemanager/achown.c:446 +#: src/filemanager/achown.c:447 msgid "Flag" msgstr "" -#: src/filemanager/achown.c:665 +#: src/filemanager/achown.c:666 msgid "Chown advanced command" msgstr "" -#: src/filemanager/achown.c:778 src/filemanager/achown.c:802 -#: src/filemanager/achown.c:871 src/filemanager/chmod.c:412 +#: src/filemanager/achown.c:779 src/filemanager/achown.c:803 +#: src/filemanager/achown.c:872 src/filemanager/chmod.c:412 #: src/filemanager/chmod.c:498 #, c-format msgid "" @@ -2100,8 +2100,8 @@ "%s" msgstr "" -#: src/filemanager/achown.c:783 src/filemanager/achown.c:807 -#: src/filemanager/achown.c:877 src/filemanager/chown.c:302 +#: src/filemanager/achown.c:784 src/filemanager/achown.c:808 +#: src/filemanager/achown.c:878 src/filemanager/chown.c:302 #: src/filemanager/chown.c:432 #, c-format msgid "" @@ -2109,7 +2109,7 @@ "%s" msgstr "" -#: src/filemanager/boxes.c:281 src/filemanager/boxes.c:847 +#: src/filemanager/boxes.c:281 src/filemanager/boxes.c:846 #: src/selcodepage.c:101 msgid "Other 8 bit" msgstr "" @@ -2118,7 +2118,7 @@ msgid "Running" msgstr "" -#: src/filemanager/boxes.c:364 src/filemanager/find.c:1516 +#: src/filemanager/boxes.c:364 src/filemanager/find.c:1515 msgid "Stopped" msgstr "" @@ -2222,95 +2222,95 @@ msgid "Configure options" msgstr "" -#: src/filemanager/boxes.c:523 +#: src/filemanager/boxes.c:528 msgid "Case &insensitive" msgstr "" -#: src/filemanager/boxes.c:525 +#: src/filemanager/boxes.c:530 msgid "Use panel sort mo&de" msgstr "" -#: src/filemanager/boxes.c:538 +#: src/filemanager/boxes.c:537 msgid "Show mi&ni-status" msgstr "" -#: src/filemanager/boxes.c:539 +#: src/filemanager/boxes.c:538 msgid "Use SI si&ze units" msgstr "" -#: src/filemanager/boxes.c:540 +#: src/filemanager/boxes.c:539 msgid "Mi&x all files" msgstr "" -#: src/filemanager/boxes.c:541 +#: src/filemanager/boxes.c:540 msgid "Show &backup files" msgstr "" -#: src/filemanager/boxes.c:542 +#: src/filemanager/boxes.c:541 msgid "Show &hidden files" msgstr "" -#: src/filemanager/boxes.c:543 +#: src/filemanager/boxes.c:542 msgid "&Fast dir reload" msgstr "" -#: src/filemanager/boxes.c:544 +#: src/filemanager/boxes.c:543 msgid "Ma&rk moves down" msgstr "" -#: src/filemanager/boxes.c:545 +#: src/filemanager/boxes.c:544 msgid "Re&verse files only" msgstr "" -#: src/filemanager/boxes.c:547 +#: src/filemanager/boxes.c:546 msgid "Simple s&wap" msgstr "" -#: src/filemanager/boxes.c:548 +#: src/filemanager/boxes.c:547 msgid "A&uto save panels setup" msgstr "" -#: src/filemanager/boxes.c:554 +#: src/filemanager/boxes.c:553 msgid "Navigation" msgstr "" -#: src/filemanager/boxes.c:555 +#: src/filemanager/boxes.c:554 msgid "L&ynx-like motion" msgstr "" -#: src/filemanager/boxes.c:557 +#: src/filemanager/boxes.c:556 msgid "Pa&ge scrolling" msgstr "" -#: src/filemanager/boxes.c:558 +#: src/filemanager/boxes.c:557 msgid "&Mouse page scrolling" msgstr "" -#: src/filemanager/boxes.c:561 +#: src/filemanager/boxes.c:560 msgid "File highlight" msgstr "" -#: src/filemanager/boxes.c:562 +#: src/filemanager/boxes.c:561 msgid "File &types" msgstr "" -#: src/filemanager/boxes.c:563 +#: src/filemanager/boxes.c:562 msgid "&Permissions" msgstr "" -#: src/filemanager/boxes.c:565 +#: src/filemanager/boxes.c:564 msgid "Quick search" msgstr "" -#: src/filemanager/boxes.c:577 +#: src/filemanager/boxes.c:576 msgid "Panel options" msgstr "" -#: src/filemanager/boxes.c:590 src/filemanager/info.c:84 +#: src/filemanager/boxes.c:589 src/filemanager/info.c:84 msgid "Information" msgstr "" -#: src/filemanager/boxes.c:591 +#: src/filemanager/boxes.c:590 msgid "" "Using the fast reload option may not reflect the exact\n" "directory contents. In this case you'll need to do a\n" @@ -2318,189 +2318,189 @@ "the details." msgstr "" -#: src/filemanager/boxes.c:639 +#: src/filemanager/boxes.c:638 msgid "&Full file list" msgstr "" -#: src/filemanager/boxes.c:640 +#: src/filemanager/boxes.c:639 msgid "&Brief file list" msgstr "" -#: src/filemanager/boxes.c:641 +#: src/filemanager/boxes.c:640 msgid "&Long file list" msgstr "" -#: src/filemanager/boxes.c:642 +#: src/filemanager/boxes.c:641 msgid "&User defined:" msgstr "" -#: src/filemanager/boxes.c:651 +#: src/filemanager/boxes.c:650 msgid "User &mini status" msgstr "" -#: src/filemanager/boxes.c:661 +#: src/filemanager/boxes.c:660 msgid "Listing mode" msgstr "" -#: src/filemanager/boxes.c:728 +#: src/filemanager/boxes.c:727 msgid "Executable &first" msgstr "" -#: src/filemanager/boxes.c:730 +#: src/filemanager/boxes.c:729 msgid "&Reverse" msgstr "" -#: src/filemanager/boxes.c:739 +#: src/filemanager/boxes.c:738 msgid "Sort order" msgstr "" #. TRANSLATORS: no need to translate 'Confirmation', it's just a context prefix -#: src/filemanager/boxes.c:763 +#: src/filemanager/boxes.c:762 msgid "Confirmation|&Delete" msgstr "" -#: src/filemanager/boxes.c:764 +#: src/filemanager/boxes.c:763 msgid "Confirmation|O&verwrite" msgstr "" -#: src/filemanager/boxes.c:765 +#: src/filemanager/boxes.c:764 msgid "Confirmation|&Execute" msgstr "" -#: src/filemanager/boxes.c:766 +#: src/filemanager/boxes.c:765 msgid "Confirmation|E&xit" msgstr "" -#: src/filemanager/boxes.c:767 +#: src/filemanager/boxes.c:766 msgid "Confirmation|Di&rectory hotlist delete" msgstr "" -#: src/filemanager/boxes.c:769 +#: src/filemanager/boxes.c:768 msgid "Confirmation|&History cleanup" msgstr "" -#: src/filemanager/boxes.c:778 src/filemanager/cmd.c:142 +#: src/filemanager/boxes.c:777 src/filemanager/cmd.c:142 msgid "Confirmation" msgstr "" -#: src/filemanager/boxes.c:795 +#: src/filemanager/boxes.c:794 msgid "&UTF-8 output" msgstr "" -#: src/filemanager/boxes.c:796 +#: src/filemanager/boxes.c:795 msgid "&Full 8 bits output" msgstr "" -#: src/filemanager/boxes.c:797 +#: src/filemanager/boxes.c:796 msgid "&ISO 8859-1" msgstr "" -#: src/filemanager/boxes.c:798 +#: src/filemanager/boxes.c:797 msgid "7 &bits" msgstr "" -#: src/filemanager/boxes.c:805 src/filemanager/boxes.c:867 +#: src/filemanager/boxes.c:804 src/filemanager/boxes.c:866 msgid "F&ull 8 bits input" msgstr "" -#: src/filemanager/boxes.c:813 src/filemanager/boxes.c:875 +#: src/filemanager/boxes.c:812 src/filemanager/boxes.c:874 msgid "Display bits" msgstr "" -#: src/filemanager/boxes.c:858 +#: src/filemanager/boxes.c:857 msgid "Input / display codepage:" msgstr "" -#: src/filemanager/boxes.c:864 +#: src/filemanager/boxes.c:863 msgid "&Select" msgstr "" -#: src/filemanager/boxes.c:924 src/filemanager/tree.c:1172 +#: src/filemanager/boxes.c:923 src/filemanager/tree.c:1172 msgid "Directory tree" msgstr "" -#: src/filemanager/boxes.c:972 +#: src/filemanager/boxes.c:971 msgid "Timeout for freeing VFSs (sec):" msgstr "" -#: src/filemanager/boxes.c:977 +#: src/filemanager/boxes.c:976 msgid "FTP anonymous password:" msgstr "" -#: src/filemanager/boxes.c:980 +#: src/filemanager/boxes.c:979 msgid "FTP directory cache timeout (sec):" msgstr "" -#: src/filemanager/boxes.c:983 +#: src/filemanager/boxes.c:982 msgid "&Always use ftp proxy:" msgstr "" -#: src/filemanager/boxes.c:987 +#: src/filemanager/boxes.c:986 msgid "&Use ~/.netrc" msgstr "" -#: src/filemanager/boxes.c:988 +#: src/filemanager/boxes.c:987 msgid "Use &passive mode" msgstr "" -#: src/filemanager/boxes.c:989 +#: src/filemanager/boxes.c:988 msgid "Use passive mode over pro&xy" msgstr "" -#: src/filemanager/boxes.c:999 +#: src/filemanager/boxes.c:998 msgid "Virtual File System Setting" msgstr "" -#: src/filemanager/boxes.c:1044 +#: src/filemanager/boxes.c:1047 msgid "cd" msgstr "" -#: src/filemanager/boxes.c:1051 +#: src/filemanager/boxes.c:1054 msgid "Quick cd" msgstr "" -#: src/filemanager/boxes.c:1066 +#: src/filemanager/boxes.c:1069 msgid "Existing filename (filename symlink will point to):" msgstr "" -#: src/filemanager/boxes.c:1070 +#: src/filemanager/boxes.c:1073 msgid "Symbolic link filename:" msgstr "" -#: src/filemanager/boxes.c:1080 +#: src/filemanager/boxes.c:1083 msgid "Symbolic link" msgstr "" -#: src/filemanager/boxes.c:1108 +#: src/filemanager/boxes.c:1111 msgid "&Stop" msgstr "" -#: src/filemanager/boxes.c:1109 +#: src/filemanager/boxes.c:1112 msgid "&Resume" msgstr "" -#: src/filemanager/boxes.c:1110 +#: src/filemanager/boxes.c:1113 msgid "&Kill" msgstr "" -#: src/filemanager/boxes.c:1139 +#: src/filemanager/boxes.c:1142 msgid "Background jobs" msgstr "" -#: src/filemanager/boxes.c:1175 +#: src/filemanager/boxes.c:1178 #, c-format msgid "Password for \\\\%s\\%s" msgstr "" -#: src/filemanager/boxes.c:1185 +#: src/filemanager/boxes.c:1188 msgid "Domain:" msgstr "" -#: src/filemanager/boxes.c:1187 +#: src/filemanager/boxes.c:1190 msgid "Username:" msgstr "" -#: src/filemanager/boxes.c:1204 +#: src/filemanager/boxes.c:1207 msgid "SMB authentication" msgstr "" @@ -2641,7 +2641,7 @@ msgid "Files tagged, want to cd?" msgstr "" -#: src/filemanager/cmd.c:150 src/filemanager/cmd.c:1262 +#: src/filemanager/cmd.c:150 src/filemanager/cmd.c:1272 #: src/filemanager/panel.c:2572 src/filemanager/panel.c:3156 msgid "Cannot change directory" msgstr "" @@ -2658,7 +2658,7 @@ msgid "&Files only" msgstr "" -#: src/filemanager/cmd.c:239 src/filemanager/filegui.c:1218 +#: src/filemanager/cmd.c:239 src/filemanager/filegui.c:1231 #: src/filemanager/find.c:508 msgid "&Using shell patterns" msgstr "" @@ -2667,184 +2667,184 @@ msgid "&Case sensitive" msgstr "" -#: src/filemanager/cmd.c:438 +#: src/filemanager/cmd.c:443 #, c-format msgid "Link %s to:" msgstr "" -#: src/filemanager/cmd.c:440 +#: src/filemanager/cmd.c:445 msgid "Link" msgstr "" -#: src/filemanager/cmd.c:446 +#: src/filemanager/cmd.c:451 #, c-format msgid "link: %s" msgstr "" -#: src/filemanager/cmd.c:483 +#: src/filemanager/cmd.c:488 #, c-format msgid "symlink: %s" msgstr "" -#: src/filemanager/cmd.c:540 src/filemanager/panel.c:4541 +#: src/filemanager/cmd.c:545 src/filemanager/panel.c:4535 #, c-format msgid "Cannot chdir to \"%s\"" msgstr "" -#: src/filemanager/cmd.c:735 +#: src/filemanager/cmd.c:742 msgid "View file" msgstr "" -#: src/filemanager/cmd.c:735 +#: src/filemanager/cmd.c:742 msgid "Filename:" msgstr "" -#: src/filemanager/cmd.c:769 +#: src/filemanager/cmd.c:776 msgid "Filtered view" msgstr "" -#: src/filemanager/cmd.c:770 +#: src/filemanager/cmd.c:777 msgid "Filter command and arguments:" msgstr "" -#: src/filemanager/cmd.c:860 +#: src/filemanager/cmd.c:868 msgid "Edit file" msgstr "" -#: src/filemanager/cmd.c:948 +#: src/filemanager/cmd.c:956 msgid "Create a new Directory" msgstr "" -#: src/filemanager/cmd.c:949 +#: src/filemanager/cmd.c:957 msgid "Enter directory name:" msgstr "" -#: src/filemanager/cmd.c:1074 +#: src/filemanager/cmd.c:1082 msgid "Select" msgstr "" -#: src/filemanager/cmd.c:1082 +#: src/filemanager/cmd.c:1090 msgid "Unselect" msgstr "" -#: src/filemanager/cmd.c:1097 +#: src/filemanager/cmd.c:1104 msgid "Extension file edit" msgstr "" -#: src/filemanager/cmd.c:1098 +#: src/filemanager/cmd.c:1105 msgid "Which extension file you want to edit?" msgstr "" -#: src/filemanager/cmd.c:1099 src/filemanager/cmd.c:1135 -#: src/filemanager/cmd.c:1193 +#: src/filemanager/cmd.c:1106 src/filemanager/cmd.c:1144 +#: src/filemanager/cmd.c:1201 msgid "&System Wide" msgstr "" -#: src/filemanager/cmd.c:1191 +#: src/filemanager/cmd.c:1199 msgid "Highlighting groups file edit" msgstr "" -#: src/filemanager/cmd.c:1192 +#: src/filemanager/cmd.c:1200 msgid "Which highlighting file you want to edit?" msgstr "" -#: src/filemanager/cmd.c:1277 +#: src/filemanager/cmd.c:1287 msgid "Compare directories" msgstr "" -#: src/filemanager/cmd.c:1278 +#: src/filemanager/cmd.c:1288 msgid "Select compare method:" msgstr "" -#: src/filemanager/cmd.c:1279 +#: src/filemanager/cmd.c:1289 msgid "&Quick" msgstr "" -#: src/filemanager/cmd.c:1279 +#: src/filemanager/cmd.c:1289 msgid "&Size only" msgstr "" -#: src/filemanager/cmd.c:1279 +#: src/filemanager/cmd.c:1289 msgid "&Thorough" msgstr "" -#: src/filemanager/cmd.c:1294 +#: src/filemanager/cmd.c:1304 msgid "" "Both panels should be in the listing mode\n" "to use this command" msgstr "" -#: src/filemanager/cmd.c:1342 +#: src/filemanager/cmd.c:1352 msgid "" "Not an xterm or Linux console;\n" "the panels cannot be toggled." msgstr "" -#: src/filemanager/cmd.c:1378 +#: src/filemanager/cmd.c:1388 #, c-format msgid "Symlink '%s' points to:" msgstr "" -#: src/filemanager/cmd.c:1385 +#: src/filemanager/cmd.c:1397 msgid "Edit symlink" msgstr "" -#: src/filemanager/cmd.c:1394 +#: src/filemanager/cmd.c:1406 #, c-format msgid "edit symlink, unable to remove %s: %s" msgstr "" -#: src/filemanager/cmd.c:1403 +#: src/filemanager/cmd.c:1415 #, c-format msgid "edit symlink: %s" msgstr "" -#: src/filemanager/cmd.c:1418 +#: src/filemanager/cmd.c:1430 #, c-format msgid "'%s' is not a symbolic link" msgstr "" -#: src/filemanager/cmd.c:1523 +#: src/filemanager/cmd.c:1535 msgid "FTP to machine" msgstr "" -#: src/filemanager/cmd.c:1534 +#: src/filemanager/cmd.c:1546 msgid "SFTP to machine" msgstr "" -#: src/filemanager/cmd.c:1546 +#: src/filemanager/cmd.c:1558 msgid "Shell link to machine" msgstr "" -#: src/filemanager/cmd.c:1558 +#: src/filemanager/cmd.c:1570 msgid "SMB link to machine" msgstr "" -#: src/filemanager/cmd.c:1569 +#: src/filemanager/cmd.c:1581 msgid "Undelete files on an ext2 file system" msgstr "" -#: src/filemanager/cmd.c:1570 +#: src/filemanager/cmd.c:1582 msgid "" "Enter device (without /dev/) to undelete\n" "files on: (F1 for details)" msgstr "" -#: src/filemanager/cmd.c:1713 src/filemanager/cmd.c:1715 +#: src/filemanager/cmd.c:1726 src/filemanager/cmd.c:1728 msgid "Setup" msgstr "" -#: src/filemanager/cmd.c:1713 +#: src/filemanager/cmd.c:1726 #, c-format msgid "Setup saved to %s" msgstr "" -#: src/filemanager/cmd.c:1715 +#: src/filemanager/cmd.c:1728 #, c-format msgid "Unable to save setup to %s" msgstr "" -#: src/filemanager/command.c:277 src/filemanager/usermenu.c:930 +#: src/filemanager/command.c:277 src/filemanager/usermenu.c:937 msgid "Cannot execute commands on non-local filesystems" msgstr "" @@ -2856,27 +2856,27 @@ "%s" msgstr "" -#: src/filemanager/dir.c:568 src/filemanager/dir.c:648 +#: src/filemanager/dir.c:646 src/filemanager/dir.c:711 msgid "Cannot read directory contents" msgstr "" -#: src/filemanager/ext.c:246 src/filemanager/usermenu.c:475 +#: src/filemanager/ext.c:246 src/filemanager/usermenu.c:480 msgid "Parameter" msgstr "" -#: src/filemanager/ext.c:453 src/filemanager/usermenu.c:445 +#: src/filemanager/ext.c:453 src/filemanager/usermenu.c:451 #, c-format msgid "" "Cannot create temporary command file\n" "%s" msgstr "" -#: src/filemanager/ext.c:841 +#: src/filemanager/ext.c:839 #, c-format msgid " %s%s file error" msgstr "" -#: src/filemanager/ext.c:843 +#: src/filemanager/ext.c:841 #, c-format msgid "" "The format of the %smc.ext file has changed with version 3.0. It seems that " @@ -2884,19 +2884,19 @@ "Commander package." msgstr "" -#: src/filemanager/ext.c:863 +#: src/filemanager/ext.c:861 #, c-format msgid "%s file error" msgstr "" -#: src/filemanager/ext.c:865 +#: src/filemanager/ext.c:863 #, c-format msgid "" "The format of the %s file has changed with version 3.0. You may either want " "to copy it from %smc.ext or use that file as an example of how to write it." msgstr "" -#: src/filemanager/file.c:96 src/filemanager/file.c:1926 +#: src/filemanager/file.c:96 src/filemanager/file.c:1941 #: src/filemanager/tree.c:773 msgid "DialogTitle|Copy" msgstr "" @@ -2957,7 +2957,7 @@ msgid " with source mask:" msgstr "" -#: src/filemanager/file.c:168 src/filemanager/filegui.c:1220 +#: src/filemanager/file.c:168 src/filemanager/filegui.c:1233 msgid "to:" msgstr "" @@ -2966,18 +2966,18 @@ msgid "%s?" msgstr "" -#: src/filemanager/file.c:328 +#: src/filemanager/file.c:327 msgid "Cannot make the hardlink" msgstr "" -#: src/filemanager/file.c:380 +#: src/filemanager/file.c:379 #, c-format msgid "" "Cannot read source link \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:396 +#: src/filemanager/file.c:395 msgid "" "Cannot make stable symlinks acrossnon-local filesystems:\n" "\n" @@ -2991,28 +2991,28 @@ "%s" msgstr "" -#: src/filemanager/file.c:604 src/filemanager/file.c:645 -#: src/filemanager/file.c:689 src/filemanager/file.c:2464 +#: src/filemanager/file.c:605 src/filemanager/file.c:646 +#: src/filemanager/file.c:690 src/filemanager/file.c:2472 #: src/filemanager/filegui.c:261 src/filemanager/filegui.c:457 msgid "&Abort" msgstr "" -#: src/filemanager/file.c:645 +#: src/filemanager/file.c:646 msgid "Ski&p all" msgstr "" -#: src/filemanager/file.c:645 src/viewer/hex.c:389 +#: src/filemanager/file.c:646 src/viewer/hex.c:408 msgid "&Retry" msgstr "" -#: src/filemanager/file.c:680 +#: src/filemanager/file.c:681 #, c-format msgid "" "Directory \"%s\" not empty.\n" "Delete it recursively?" msgstr "" -#: src/filemanager/file.c:681 +#: src/filemanager/file.c:682 #, c-format msgid "" "Background process:\n" @@ -3020,18 +3020,18 @@ "Delete it recursively?" msgstr "" -#: src/filemanager/file.c:689 src/filemanager/filegui.c:453 +#: src/filemanager/file.c:690 src/filemanager/filegui.c:453 msgid "Non&e" msgstr "" -#: src/filemanager/file.c:905 +#: src/filemanager/file.c:906 #, c-format msgid "" "Cannot stat file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:918 src/filemanager/file.c:1545 +#: src/filemanager/file.c:919 src/filemanager/file.c:1560 #, c-format msgid "" "\"%s\"\n" @@ -3040,176 +3040,176 @@ "are the same file" msgstr "" -#: src/filemanager/file.c:924 +#: src/filemanager/file.c:925 #, c-format msgid "Cannot overwrite directory \"%s\"" msgstr "" -#: src/filemanager/file.c:969 +#: src/filemanager/file.c:970 #, c-format msgid "" "Cannot move file \"%s\" to \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1001 +#: src/filemanager/file.c:1002 #, c-format msgid "" "Cannot remove file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1046 +#: src/filemanager/file.c:1048 #, c-format msgid "" "Cannot delete file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1119 src/filemanager/file.c:1179 -#: src/filemanager/file.c:2446 +#: src/filemanager/file.c:1121 src/filemanager/file.c:1181 +#: src/filemanager/file.c:2454 #, c-format msgid "" "Cannot remove directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1512 src/filemanager/file.c:2334 +#: src/filemanager/file.c:1527 src/filemanager/file.c:2349 #, c-format msgid "" "Cannot overwrite directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1531 +#: src/filemanager/file.c:1546 #, c-format msgid "" "Cannot stat source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1582 +#: src/filemanager/file.c:1597 #, c-format msgid "" "Cannot create special file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1594 src/filemanager/file.c:1939 +#: src/filemanager/file.c:1609 src/filemanager/file.c:1954 #, c-format msgid "" "Cannot chown target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1609 src/filemanager/file.c:1959 +#: src/filemanager/file.c:1624 src/filemanager/file.c:1974 #, c-format msgid "" "Cannot chmod target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1630 +#: src/filemanager/file.c:1645 #, c-format msgid "" "Cannot open source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1645 +#: src/filemanager/file.c:1660 msgid "Reget failed, about to overwrite file" msgstr "" -#: src/filemanager/file.c:1657 +#: src/filemanager/file.c:1672 #, c-format msgid "" "Cannot fstat source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1695 +#: src/filemanager/file.c:1710 #, c-format msgid "" "Cannot create target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1717 +#: src/filemanager/file.c:1732 #, c-format msgid "" "Cannot fstat target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1737 +#: src/filemanager/file.c:1752 #, c-format msgid "" "Cannot preallocate space for target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1781 +#: src/filemanager/file.c:1796 #, c-format msgid "" "Cannot read source file\"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1822 +#: src/filemanager/file.c:1837 #, c-format msgid "" "Cannot write target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1861 +#: src/filemanager/file.c:1876 msgid "(stalled)" msgstr "" -#: src/filemanager/file.c:1897 +#: src/filemanager/file.c:1912 #, c-format msgid "" "Cannot close source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1909 +#: src/filemanager/file.c:1924 #, c-format msgid "" "Cannot close target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1927 +#: src/filemanager/file.c:1942 msgid "Incomplete file was retrieved. Keep it?" msgstr "" -#: src/filemanager/file.c:1928 +#: src/filemanager/file.c:1943 msgid "&Keep" msgstr "" -#: src/filemanager/file.c:2024 +#: src/filemanager/file.c:2039 #, c-format msgid "" "Cannot stat source directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2058 +#: src/filemanager/file.c:2073 #, c-format msgid "" "Source \"%s\" is not a directory\n" "%s" msgstr "" -#: src/filemanager/file.c:2070 +#: src/filemanager/file.c:2085 #, c-format msgid "" "Cannot copy cyclic symbolic link\n" "\"%s\"" msgstr "" -#: src/filemanager/file.c:2108 src/filemanager/file.c:2935 +#: src/filemanager/file.c:2123 src/filemanager/file.c:2940 #: src/filemanager/tree.c:827 #, c-format msgid "" @@ -3217,21 +3217,21 @@ "%s" msgstr "" -#: src/filemanager/file.c:2140 +#: src/filemanager/file.c:2155 #, c-format msgid "" "Cannot create target directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2164 +#: src/filemanager/file.c:2179 #, c-format msgid "" "Cannot chown target directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2298 +#: src/filemanager/file.c:2313 #, c-format msgid "" "\"%s\"\n" @@ -3240,36 +3240,36 @@ "are the same directory" msgstr "" -#: src/filemanager/file.c:2336 +#: src/filemanager/file.c:2351 #, c-format msgid "" "Cannot overwrite file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2357 +#: src/filemanager/file.c:2372 #, c-format msgid "" "Cannot move directory \"%s\" to \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2485 +#: src/filemanager/file.c:2493 msgid "Directory scanning" msgstr "" -#: src/filemanager/file.c:2538 +#: src/filemanager/file.c:2546 #, c-format msgid "" "%s\n" "Directories: %zd, total size: %s" msgstr "" -#: src/filemanager/file.c:2648 +#: src/filemanager/file.c:2655 msgid "Cannot operate on \"..\"!" msgstr "" -#: src/filemanager/file.c:2776 +#: src/filemanager/file.c:2783 msgid "Sorry, I could not put the job in background" msgstr "" @@ -3352,75 +3352,75 @@ msgid "Background process: File exists" msgstr "" -#: src/filemanager/filegui.c:934 +#: src/filemanager/filegui.c:939 #, c-format msgid "Files processed: %zu/%zu" msgstr "" -#: src/filemanager/filegui.c:936 +#: src/filemanager/filegui.c:941 #, c-format msgid "Files processed: %zu" msgstr "" -#: src/filemanager/filegui.c:980 +#: src/filemanager/filegui.c:988 #, c-format msgid "Time: %s %s" msgstr "" -#: src/filemanager/filegui.c:984 +#: src/filemanager/filegui.c:993 #, c-format msgid "Time: %s %s (%s)" msgstr "" -#: src/filemanager/filegui.c:990 +#: src/filemanager/filegui.c:999 #, c-format msgid "Time: %s" msgstr "" -#: src/filemanager/filegui.c:994 +#: src/filemanager/filegui.c:1003 #, c-format msgid "Time: %s (%s)" msgstr "" -#: src/filemanager/filegui.c:1002 +#: src/filemanager/filegui.c:1014 #, c-format msgid " Total: %s " msgstr "" -#: src/filemanager/filegui.c:1006 +#: src/filemanager/filegui.c:1018 #, c-format msgid " Total: %s/%s " msgstr "" -#: src/filemanager/filegui.c:1031 +#: src/filemanager/filegui.c:1044 msgid "Source" msgstr "" -#: src/filemanager/filegui.c:1056 +#: src/filemanager/filegui.c:1069 msgid "Target" msgstr "" -#: src/filemanager/filegui.c:1224 +#: src/filemanager/filegui.c:1237 msgid "Follow &links" msgstr "" -#: src/filemanager/filegui.c:1225 +#: src/filemanager/filegui.c:1238 msgid "Preserve &attributes" msgstr "" -#: src/filemanager/filegui.c:1227 +#: src/filemanager/filegui.c:1240 msgid "Di&ve into subdir if exists" msgstr "" -#: src/filemanager/filegui.c:1228 +#: src/filemanager/filegui.c:1241 msgid "&Stable symlinks" msgstr "" -#: src/filemanager/filegui.c:1233 +#: src/filemanager/filegui.c:1246 msgid "&Background" msgstr "" -#: src/filemanager/filegui.c:1287 +#: src/filemanager/filegui.c:1300 #, c-format msgid "Invalid source pattern '%s'" msgstr "" @@ -3490,7 +3490,7 @@ msgid "&Tree" msgstr "" -#: src/filemanager/find.c:604 src/filemanager/find.c:1582 +#: src/filemanager/find.c:604 src/filemanager/find.c:1581 msgid "Find File" msgstr "" @@ -3507,23 +3507,23 @@ msgid "Grepping in %s" msgstr "" -#: src/filemanager/find.c:1254 +#: src/filemanager/find.c:1253 msgid "Finished" msgstr "" -#: src/filemanager/find.c:1259 +#: src/filemanager/find.c:1258 #, c-format msgid "Finished (ignored %zd directory)" msgid_plural "Finished (ignored %zd directories)" msgstr[0] "" msgstr[1] "" -#: src/filemanager/find.c:1289 src/viewer/search.c:244 +#: src/filemanager/find.c:1288 src/viewer/search.c:244 #, c-format msgid "Searching %s" msgstr "" -#: src/filemanager/find.c:1516 src/filemanager/find.c:1596 +#: src/filemanager/find.c:1515 src/filemanager/find.c:1595 msgid "Searching" msgstr "" @@ -3576,7 +3576,7 @@ msgid "Directory hotlist" msgstr "" -#: src/filemanager/hotlist.c:754 src/filemanager/hotlist.c:1440 +#: src/filemanager/hotlist.c:754 src/filemanager/hotlist.c:1441 msgid "Top level group" msgstr "" @@ -3629,23 +3629,23 @@ "Remove it?" msgstr "" -#: src/filemanager/hotlist.c:1463 +#: src/filemanager/hotlist.c:1464 msgid "Hotlist Load" msgstr "" -#: src/filemanager/hotlist.c:1465 +#: src/filemanager/hotlist.c:1466 #, c-format msgid "" "MC was unable to write %s file,\n" "your old hotlist entries were not deleted" msgstr "" -#: src/filemanager/hotlist.c:1567 +#: src/filemanager/hotlist.c:1568 #, c-format msgid "Label for \"%s\":" msgstr "" -#: src/filemanager/hotlist.c:1579 +#: src/filemanager/hotlist.c:1580 msgid "Add to hotlist" msgstr "" @@ -3776,27 +3776,27 @@ msgid "&Show free space" msgstr "" -#: src/filemanager/layout.c:442 +#: src/filemanager/layout.c:452 msgid "Panel split" msgstr "" -#: src/filemanager/layout.c:443 +#: src/filemanager/layout.c:453 msgid "Console output" msgstr "" -#: src/filemanager/layout.c:447 +#: src/filemanager/layout.c:457 msgid "&Vertical" msgstr "" -#: src/filemanager/layout.c:448 +#: src/filemanager/layout.c:458 msgid "&Horizontal" msgstr "" -#: src/filemanager/layout.c:454 +#: src/filemanager/layout.c:464 msgid "Output lines:" msgstr "" -#: src/filemanager/layout.c:519 +#: src/filemanager/layout.c:523 msgid "Layout" msgstr "" @@ -4076,7 +4076,7 @@ msgid "ButtonBar|Mkdir" msgstr "" -#: src/filemanager/mountlist.c:854 +#: src/filemanager/mountlist.c:882 msgid "Memory exhausted!" msgstr "" @@ -4236,7 +4236,7 @@ msgid "Panelize" msgstr "" -#: src/filemanager/panel.c:1809 +#: src/filemanager/panel.c:1808 msgid "Unknown tag on display format:" msgstr "" @@ -4244,7 +4244,7 @@ msgid "Do you really want to execute?" msgstr "" -#: src/filemanager/panel.c:4250 +#: src/filemanager/panel.c:4246 msgid "User supplied format looks invalid, reverting to default." msgstr "" @@ -4252,12 +4252,12 @@ msgid "&Add new" msgstr "" -#: src/filemanager/panelize.c:175 src/filemanager/panelize.c:395 +#: src/filemanager/panelize.c:175 src/filemanager/panelize.c:379 msgid "External panelize" msgstr "" -#: src/filemanager/panelize.c:184 src/filemanager/panelize.c:286 -#: src/filemanager/panelize.c:592 src/filemanager/panelize.c:639 +#: src/filemanager/panelize.c:184 src/filemanager/panelize.c:281 +#: src/filemanager/panelize.c:568 src/filemanager/panelize.c:622 msgid "Other command" msgstr "" @@ -4273,31 +4273,31 @@ msgid "Enter command label:" msgstr "" -#: src/filemanager/panelize.c:326 +#: src/filemanager/panelize.c:320 msgid "Cannot invoke command." msgstr "" -#: src/filemanager/panelize.c:395 +#: src/filemanager/panelize.c:379 msgid "Pipe close failed" msgstr "" -#: src/filemanager/panelize.c:532 +#: src/filemanager/panelize.c:511 msgid "Cannot run external panelize in a non-local directory" msgstr "" -#: src/filemanager/panelize.c:596 +#: src/filemanager/panelize.c:572 msgid "Modified git files" msgstr "" -#: src/filemanager/panelize.c:597 +#: src/filemanager/panelize.c:573 msgid "Find rejects after patching" msgstr "" -#: src/filemanager/panelize.c:599 +#: src/filemanager/panelize.c:575 msgid "Find *.orig after patching" msgstr "" -#: src/filemanager/panelize.c:601 +#: src/filemanager/panelize.c:577 msgid "Find SUID and SGID programs" msgstr "" @@ -4350,79 +4350,79 @@ msgid "ButtonBar|Rmdir" msgstr "" -#: src/filemanager/treestore.c:369 +#: src/filemanager/treestore.c:372 #, c-format msgid "" "Cannot write to the %s file:\n" "%s\n" msgstr "" -#: src/filemanager/usermenu.c:316 +#: src/filemanager/usermenu.c:321 msgid "Debug" msgstr "" -#: src/filemanager/usermenu.c:334 +#: src/filemanager/usermenu.c:339 msgid "ERROR:" msgstr "" -#: src/filemanager/usermenu.c:338 +#: src/filemanager/usermenu.c:343 msgid "True:" msgstr "" -#: src/filemanager/usermenu.c:340 +#: src/filemanager/usermenu.c:345 msgid "False:" msgstr "" -#: src/filemanager/usermenu.c:561 +#: src/filemanager/usermenu.c:568 msgid "Error calling program" msgstr "" -#: src/filemanager/usermenu.c:594 +#: src/filemanager/usermenu.c:601 msgid "Warning -- ignoring file" msgstr "" -#: src/filemanager/usermenu.c:595 +#: src/filemanager/usermenu.c:602 #, c-format msgid "" "File %s is not owned by root or you or is world writable.\n" "Using it may compromise your security" msgstr "" -#: src/filemanager/usermenu.c:705 +#: src/filemanager/usermenu.c:713 msgid "Format error on file Extensions File" msgstr "" -#: src/filemanager/usermenu.c:706 +#: src/filemanager/usermenu.c:714 #, c-format msgid "The %%var macro has no default" msgstr "" -#: src/filemanager/usermenu.c:707 +#: src/filemanager/usermenu.c:715 #, c-format msgid "The %%var macro has no variable" msgstr "" -#: src/filemanager/usermenu.c:980 +#: src/filemanager/usermenu.c:987 #, c-format msgid "" "Cannot open file%s\n" "%s" msgstr "" -#: src/filemanager/usermenu.c:1083 +#: src/filemanager/usermenu.c:1090 #, c-format msgid "No suitable entries found in %s" msgstr "" -#: src/filemanager/usermenu.c:1095 +#: src/filemanager/usermenu.c:1104 msgid "User menu" msgstr "" -#: src/help.c:324 +#: src/help.c:325 msgid "Help file format error\n" msgstr "" -#: src/help.c:362 +#: src/help.c:363 msgid "Internal bug: Double start of link area" msgstr "" @@ -4501,18 +4501,18 @@ "key, or click with the mouse to define it. Move around with Tab." msgstr "" -#: src/main.c:257 +#: src/main.c:256 #, c-format msgid "" "Failed to run:\n" "%s\n" msgstr "" -#: src/main.c:270 +#: src/main.c:269 msgid "Home directory path is not absolute" msgstr "" -#: src/main.c:479 +#: src/main.c:481 #, c-format msgid "" "\n" @@ -4536,30 +4536,30 @@ msgid "%b %e %H:%M" msgstr "" -#: src/setup.c:1198 +#: src/setup.c:1199 #, c-format msgid "" "Cannot save file %s:\n" "%s" msgstr "" -#: src/subshell.c:390 +#: src/subshell.c:392 msgid "" "GNU Midnight Commander is already\n" "running on this terminal.\n" "Subshell support will be disabled." msgstr "" -#: src/subshell.c:847 +#: src/subshell.c:850 #, c-format msgid "Cannot open named pipe %s\n" msgstr "" -#: src/subshell.c:1059 +#: src/subshell.c:1063 msgid "The shell is still active. Quit anyway?" msgstr "" -#: src/subshell.c:1229 +#: src/subshell.c:1231 #, c-format msgid "Warning: Cannot change to %s.\n" msgstr "" @@ -4659,21 +4659,21 @@ msgid "Cache directory:" msgstr "" -#: src/vfs/cpio/cpio.c:228 src/vfs/cpio/cpio.c:253 +#: src/vfs/cpio/cpio.c:227 src/vfs/cpio/cpio.c:252 #, c-format msgid "" "Cannot open cpio archive\n" "%s" msgstr "" -#: src/vfs/cpio/cpio.c:331 +#: src/vfs/cpio/cpio.c:330 #, c-format msgid "" "Premature end of cpio archive\n" "%s" msgstr "" -#: src/vfs/cpio/cpio.c:415 +#: src/vfs/cpio/cpio.c:417 #, c-format msgid "" "Inconsistent hardlinks of\n" @@ -4682,20 +4682,20 @@ "%s" msgstr "" -#: src/vfs/cpio/cpio.c:456 +#: src/vfs/cpio/cpio.c:458 #, c-format msgid "%s contains duplicate entries! Skipping!" msgstr "" -#: src/vfs/cpio/cpio.c:547 src/vfs/cpio/cpio.c:608 src/vfs/cpio/cpio.c:614 -#: src/vfs/cpio/cpio.c:678 src/vfs/cpio/cpio.c:688 +#: src/vfs/cpio/cpio.c:549 src/vfs/cpio/cpio.c:610 src/vfs/cpio/cpio.c:616 +#: src/vfs/cpio/cpio.c:680 src/vfs/cpio/cpio.c:690 #, c-format msgid "" "Corrupted cpio header encountered in\n" "%s" msgstr "" -#: src/vfs/cpio/cpio.c:745 +#: src/vfs/cpio/cpio.c:749 #, c-format msgid "" "Unexpected end of file\n" @@ -4714,233 +4714,233 @@ msgid "Inconsistent extfs archive" msgstr "" -#: src/vfs/extfs/extfs.c:1574 +#: src/vfs/extfs/extfs.c:1575 #, c-format msgid "Warning: cannot open %s directory\n" msgstr "" -#: src/vfs/fish/fish.c:283 +#: src/vfs/fish/fish.c:284 #, c-format msgid "fish: Disconnecting from %s" msgstr "" -#: src/vfs/fish/fish.c:460 +#: src/vfs/fish/fish.c:461 msgid "fish: Waiting for initial line..." msgstr "" -#: src/vfs/fish/fish.c:470 +#: src/vfs/fish/fish.c:471 msgid "Sorry, we cannot do password authenticated connections for now." msgstr "" -#: src/vfs/fish/fish.c:477 +#: src/vfs/fish/fish.c:478 #, c-format msgid "fish: Password is required for %s" msgstr "" -#: src/vfs/fish/fish.c:486 +#: src/vfs/fish/fish.c:487 msgid "fish: Sending password..." msgstr "" -#: src/vfs/fish/fish.c:522 +#: src/vfs/fish/fish.c:523 msgid "fish: Sending initial line..." msgstr "" -#: src/vfs/fish/fish.c:533 +#: src/vfs/fish/fish.c:534 msgid "fish: Handshaking version..." msgstr "" -#: src/vfs/fish/fish.c:543 +#: src/vfs/fish/fish.c:544 msgid "fish: Getting host info..." msgstr "" -#: src/vfs/fish/fish.c:668 +#: src/vfs/fish/fish.c:669 #, c-format msgid "fish: Reading directory %s..." msgstr "" -#: src/vfs/fish/fish.c:834 src/vfs/ftpfs/ftpfs.c:1767 -#: src/vfs/undelfs/undelfs.c:389 +#: src/vfs/fish/fish.c:837 src/vfs/ftpfs/ftpfs.c:1775 +#: src/vfs/undelfs/undelfs.c:392 #, c-format msgid "%s: done." msgstr "" -#: src/vfs/fish/fish.c:841 src/vfs/ftpfs/ftpfs.c:1716 -#: src/vfs/undelfs/undelfs.c:392 +#: src/vfs/fish/fish.c:844 src/vfs/ftpfs/ftpfs.c:1724 +#: src/vfs/undelfs/undelfs.c:395 #, c-format msgid "%s: failure" msgstr "" -#: src/vfs/fish/fish.c:899 +#: src/vfs/fish/fish.c:902 #, c-format msgid "fish: store %s: sending command..." msgstr "" -#: src/vfs/fish/fish.c:937 +#: src/vfs/fish/fish.c:940 msgid "fish: Local read failed, sending zeros" msgstr "" -#: src/vfs/fish/fish.c:956 +#: src/vfs/fish/fish.c:959 msgid "fish: storing file" msgstr "" -#: src/vfs/fish/fish.c:1034 +#: src/vfs/fish/fish.c:1037 msgid "Aborting transfer..." msgstr "" -#: src/vfs/fish/fish.c:1050 +#: src/vfs/fish/fish.c:1053 msgid "Error reported after abort." msgstr "" -#: src/vfs/fish/fish.c:1052 +#: src/vfs/fish/fish.c:1055 msgid "Aborted transfer would be successful." msgstr "" -#: src/vfs/ftpfs/ftpfs.c:549 +#: src/vfs/ftpfs/ftpfs.c:551 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:602 +#: src/vfs/ftpfs/ftpfs.c:604 #, c-format msgid "FTP: Password required for %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:644 +#: src/vfs/ftpfs/ftpfs.c:646 msgid "ftpfs: sending login name" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:649 +#: src/vfs/ftpfs/ftpfs.c:651 msgid "ftpfs: sending user password" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:655 +#: src/vfs/ftpfs/ftpfs.c:657 #, c-format msgid "FTP: Account required for user %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:657 +#: src/vfs/ftpfs/ftpfs.c:659 msgid "Account:" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:662 +#: src/vfs/ftpfs/ftpfs.c:664 msgid "ftpfs: sending user account" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:671 +#: src/vfs/ftpfs/ftpfs.c:673 msgid "ftpfs: logged in" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:685 +#: src/vfs/ftpfs/ftpfs.c:687 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "" -#: src/vfs/ftpfs/ftpfs.c:812 +#: src/vfs/ftpfs/ftpfs.c:818 msgid "ftpfs: Invalid host name." msgstr "" -#: src/vfs/ftpfs/ftpfs.c:861 src/vfs/ftpfs/ftpfs.c:877 +#: src/vfs/ftpfs/ftpfs.c:867 src/vfs/ftpfs/ftpfs.c:883 #, c-format msgid "ftpfs: %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:884 +#: src/vfs/ftpfs/ftpfs.c:890 #, c-format msgid "ftpfs: making connection to %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:895 +#: src/vfs/ftpfs/ftpfs.c:901 msgid "ftpfs: connection interrupted by user" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:897 +#: src/vfs/ftpfs/ftpfs.c:903 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:951 +#: src/vfs/ftpfs/ftpfs.c:957 #, c-format msgid "Waiting to retry... %d (Control-G to cancel)" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1277 +#: src/vfs/ftpfs/ftpfs.c:1284 msgid "ftpfs: invalid address family" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1285 +#: src/vfs/ftpfs/ftpfs.c:1292 #, c-format msgid "ftpfs: could not create socket: %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1319 +#: src/vfs/ftpfs/ftpfs.c:1326 msgid "ftpfs: could not setup passive mode" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1417 +#: src/vfs/ftpfs/ftpfs.c:1423 msgid "ftpfs: aborting transfer." msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1420 +#: src/vfs/ftpfs/ftpfs.c:1426 #, c-format msgid "ftpfs: abort error: %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1428 +#: src/vfs/ftpfs/ftpfs.c:1434 msgid "ftpfs: abort failed" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1557 src/vfs/ftpfs/ftpfs.c:1670 +#: src/vfs/ftpfs/ftpfs.c:1565 src/vfs/ftpfs/ftpfs.c:1678 msgid "ftpfs: CWD failed." msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1567 src/vfs/ftpfs/ftpfs.c:1575 +#: src/vfs/ftpfs/ftpfs.c:1575 src/vfs/ftpfs/ftpfs.c:1583 msgid "ftpfs: couldn't resolve symlink" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1636 +#: src/vfs/ftpfs/ftpfs.c:1644 msgid "Resolving symlink..." msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1660 +#: src/vfs/ftpfs/ftpfs.c:1668 #, c-format msgid "ftpfs: Reading FTP directory %s... %s%s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1663 +#: src/vfs/ftpfs/ftpfs.c:1671 msgid "(strict rfc959)" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1663 +#: src/vfs/ftpfs/ftpfs.c:1671 msgid "(chdir first)" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1781 +#: src/vfs/ftpfs/ftpfs.c:1789 msgid "ftpfs: failed; nowhere to fallback to" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1859 +#: src/vfs/ftpfs/ftpfs.c:1867 msgid "ftpfs: storing file" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:2321 +#: src/vfs/ftpfs/ftpfs.c:2329 msgid "" "~/.netrc file has incorrect mode\n" "Remove password or correct mode" msgstr "" -#: src/vfs/sfs/sfs.c:426 +#: src/vfs/sfs/sfs.c:428 #, c-format msgid "%s: Warning: file %s not found\n" msgstr "" -#: src/vfs/sfs/sfs.c:455 +#: src/vfs/sfs/sfs.c:457 #, c-format msgid "" "Warning: Invalid line in %s:\n" "%s\n" msgstr "" -#: src/vfs/sfs/sfs.c:474 +#: src/vfs/sfs/sfs.c:476 #, c-format msgid "" "Warning: Invalid flag %c in %s:\n" @@ -4952,7 +4952,7 @@ msgid "sftp: an error occurred while reading %s: %s" msgstr "" -#: src/vfs/sftpfs/config_parcer.c:324 +#: src/vfs/sftpfs/config_parcer.c:323 msgid "sftp: Unable to get current user name." msgstr "" @@ -5006,7 +5006,7 @@ msgid "sftp: Failure establishing SSH session: (%d)" msgstr "" -#: src/vfs/sftpfs/file.c:240 +#: src/vfs/sftpfs/file.c:241 msgid "sftp: No file handler data present for reading file" msgstr "" @@ -5069,7 +5069,7 @@ msgid "Unexpected EOF on archive file" msgstr "" -#: src/vfs/tar/tar.c:791 +#: src/vfs/tar/tar.c:790 #, c-format msgid "" "%s\n" @@ -5117,51 +5117,51 @@ msgid "while doing inode scan %d" msgstr "" -#: src/vfs/undelfs/undelfs.c:371 +#: src/vfs/undelfs/undelfs.c:374 #, c-format msgid "Cannot open file %s" msgstr "" -#: src/vfs/undelfs/undelfs.c:374 +#: src/vfs/undelfs/undelfs.c:377 msgid "undelfs: reading inode bitmap..." msgstr "" -#: src/vfs/undelfs/undelfs.c:377 +#: src/vfs/undelfs/undelfs.c:380 #, c-format msgid "" "Cannot load inode bitmap from:\n" "%s" msgstr "" -#: src/vfs/undelfs/undelfs.c:380 +#: src/vfs/undelfs/undelfs.c:383 msgid "undelfs: reading block bitmap..." msgstr "" -#: src/vfs/undelfs/undelfs.c:383 +#: src/vfs/undelfs/undelfs.c:386 #, c-format msgid "" "Cannot load block bitmap from:\n" "%s" msgstr "" -#: src/vfs/undelfs/undelfs.c:408 +#: src/vfs/undelfs/undelfs.c:411 msgid "vfs_info is not fs!" msgstr "" -#: src/vfs/undelfs/undelfs.c:453 src/vfs/undelfs/undelfs.c:669 +#: src/vfs/undelfs/undelfs.c:459 src/vfs/undelfs/undelfs.c:678 msgid "You have to chdir to extract files first" msgstr "" -#: src/vfs/undelfs/undelfs.c:599 +#: src/vfs/undelfs/undelfs.c:605 msgid "while iterating over blocks" msgstr "" -#: src/vfs/undelfs/undelfs.c:712 +#: src/vfs/undelfs/undelfs.c:724 #, c-format msgid "Cannot open file \"%s\"" msgstr "" -#: src/vfs/undelfs/undelfs.c:805 +#: src/vfs/undelfs/undelfs.c:818 msgid "Ext2lib error" msgstr "" @@ -5191,23 +5191,23 @@ msgid "Empty output from child filter" msgstr "" -#: src/viewer/dialogs.c:174 +#: src/viewer/dialogs.c:180 msgid "&Line number (decimal)" msgstr "" -#: src/viewer/dialogs.c:175 +#: src/viewer/dialogs.c:181 msgid "Pe&rcents" msgstr "" -#: src/viewer/dialogs.c:176 +#: src/viewer/dialogs.c:182 msgid "&Decimal offset" msgstr "" -#: src/viewer/dialogs.c:177 +#: src/viewer/dialogs.c:183 msgid "He&xadecimal offset" msgstr "" -#: src/viewer/dialogs.c:212 +#: src/viewer/dialogs.c:218 msgid "Goto" msgstr "" @@ -5251,7 +5251,7 @@ msgid "ButtonBar|Format" msgstr "" -#: src/viewer/hex.c:378 +#: src/viewer/hex.c:397 #, c-format msgid "" "Error while closing the file:\n" @@ -5259,14 +5259,14 @@ "Data may have been written or not" msgstr "" -#: src/viewer/hex.c:386 +#: src/viewer/hex.c:405 #, c-format msgid "" "Cannot save file:\n" "%s" msgstr "" -#: src/viewer/lib.c:407 src/viewer/lib.c:409 +#: src/viewer/lib.c:403 src/viewer/lib.c:405 msgid "View: " msgstr "" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/mn.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/mn.gmo differ diff -Nru mc-4.8.10/po/mn.po mc-4.8.11/po/mn.po --- mc-4.8.10/po/mn.po 2013-08-02 19:06:22.000000000 +0000 +++ mc-4.8.11/po/mn.po 2013-11-29 18:47:00.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Mongolian (http://www.transifex.com/projects/p/mc/language/" "mn/)\n" @@ -4070,6 +4070,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Устгаж байна" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/nb.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/nb.gmo differ diff -Nru mc-4.8.10/po/nb.po mc-4.8.11/po/nb.po --- mc-4.8.10/po/nb.po 2013-08-02 19:06:23.000000000 +0000 +++ mc-4.8.11/po/nb.po 2013-11-29 18:47:00.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/mc/" "language/nb/)\n" @@ -4069,6 +4069,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Sletter" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/nl.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/nl.gmo differ diff -Nru mc-4.8.10/po/nl.po mc-4.8.11/po/nl.po --- mc-4.8.10/po/nl.po 2013-08-02 19:06:23.000000000 +0000 +++ mc-4.8.11/po/nl.po 2013-11-29 18:47:00.000000000 +0000 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/mc/language/nl/)\n" "Language: nl\n" @@ -701,6 +701,9 @@ "Please send any bug reports (including the output of 'mc -V')\n" "as tickets at www.midnight-commander.org\n" msgstr "" +"\n" +"Please send any bug reports (including the output of 'mc -V')\n" +"as tickets at www.midnight-commander.org\n" #, c-format msgid "GNU Midnight Commander %s\n" @@ -921,6 +924,8 @@ "File \"%s\" is too large.\n" "Open it anyway?" msgstr "" +"Bestand \"%s\" is te groot.\n" +"Toch openen?" #, c-format msgid "Error reading from pipe: %s" @@ -1506,7 +1511,7 @@ "geschreven voor de Midnight Commander" msgid "Copyright (C) 1996-2013 the Free Software Foundation" -msgstr "" +msgstr "Copyright (C) 1996-2013 the Free Software Foundation" msgid "About" msgstr "Over" @@ -1588,7 +1593,7 @@ #, c-format msgid "Type 'exit' to return to the Midnight Commander" -msgstr "" +msgstr "Typ 'exit' om naar de Midnight Commander terug te keren" msgid "Set &all" msgstr "Zet &alles" @@ -2144,7 +2149,7 @@ #, c-format msgid "Symlink '%s' points to:" -msgstr "" +msgstr "Symlink '%s' verwijst naar:" msgid "Edit symlink" msgstr "Bewerk symlink" @@ -2159,7 +2164,7 @@ #, c-format msgid "'%s' is not a symbolic link" -msgstr "" +msgstr "'%s' is geen symbolische link" msgid "FTP to machine" msgstr "FTP naar machine" @@ -2744,7 +2749,7 @@ #, c-format msgid "Invalid source pattern '%s'" -msgstr "" +msgstr "Ongeldig bronpatroon '%s'" msgid "&Chdir" msgstr "&Chdir" @@ -4260,6 +4265,8 @@ "Cannot open \"%s\" in parse mode\n" "%s" msgstr "" +"Kan \"%s\" niet openen in parsemodus\n" +"%s" msgid "Seeking to search result" msgstr "Op zoek naar zoekresultaat" @@ -4272,6 +4279,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Kan geen lokale versie van /ftp://some.host/editme.txt ophalen" - -#~ msgid "Deleting" -#~ msgstr "Aan het verwijderen" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/pl.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/pl.gmo differ diff -Nru mc-4.8.10/po/pl.po mc-4.8.11/po/pl.po --- mc-4.8.10/po/pl.po 2013-08-02 19:06:23.000000000 +0000 +++ mc-4.8.11/po/pl.po 2013-11-29 18:47:00.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 16:47+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish (http://www.transifex.com/projects/p/mc/language/pl/)\n" "Language: pl\n" @@ -4300,6 +4300,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" "Nie można pobrać lokalnej kopii /ftp://jakiś.komputer/modyfikuj_mnie.txt" - -#~ msgid "Deleting" -#~ msgstr "Usuwanie" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/pt.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/pt.gmo differ diff -Nru mc-4.8.10/po/pt.po mc-4.8.11/po/pt.po --- mc-4.8.10/po/pt.po 2013-08-02 19:06:23.000000000 +0000 +++ mc-4.8.11/po/pt.po 2013-11-29 18:47:00.000000000 +0000 @@ -11,9 +11,9 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 09:31+0000\n" -"Last-Translator: Gilberto J \n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" +"Last-Translator: Piotr Drąg \n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/mc/language/" "pt/)\n" "Language: pt\n" @@ -4295,6 +4295,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Não é possível obter uma cópia local de /ftp://some.host/editme.txt" - -#~ msgid "Deleting" -#~ msgstr "A apagar" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/pt_BR.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/pt_BR.gmo differ diff -Nru mc-4.8.10/po/pt_BR.po mc-4.8.11/po/pt_BR.po --- mc-4.8.10/po/pt_BR.po 2013-08-02 19:06:23.000000000 +0000 +++ mc-4.8.11/po/pt_BR.po 2013-11-29 18:47:00.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mc/" "language/pt_BR/)\n" @@ -4189,6 +4189,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Apagando" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/ro.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/ro.gmo differ diff -Nru mc-4.8.10/po/ro.po mc-4.8.11/po/ro.po --- mc-4.8.10/po/ro.po 2013-08-02 19:06:23.000000000 +0000 +++ mc-4.8.11/po/ro.po 2013-11-29 18:47:00.000000000 +0000 @@ -4,14 +4,15 @@ # # Translators: # Arthur Titeica , 2013 +# roentgen , 2013 # Slava Zanko , 2011 msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-21 19:04+0000\n" -"Last-Translator: roentgen \n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" +"Last-Translator: Piotr Drąg \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/mc/language/" "ro/)\n" "Language: ro\n" @@ -22,14 +23,14 @@ "2:1));\n" msgid "Warning: cannot load codepages list" -msgstr "Atenţie: nu se poate încărca lista de coduri de pagină" +msgstr "Atenție: nu se poate încărca lista de coduri de pagină" msgid "7-bit ASCII" msgstr "7-bit ASCII" #, c-format msgid "Cannot translate from %s to %s" -msgstr "Nu pot face trecerea din %s în %s " +msgstr "Nu pot face trecerea din %s în %s" msgid "Event system already initialized" msgstr "Sistemul de evenimente este deja inițializat" @@ -65,17 +66,17 @@ msgstr "Fișier blocat" msgid "&Grab lock" -msgstr "" +msgstr "&Preia blocarea" msgid "&Ignore lock" -msgstr "" +msgstr "&Ignoră blocarea" #, c-format msgid "Cannot create %s directory" -msgstr "Nu se poate crea directorul %s" +msgstr "Nu se poate crea dosarul %s" msgid "FATAL: not a directory:" -msgstr "FATAL: nu este un director:" +msgstr "FATAL: nu este un dosar:" #, c-format msgid "An error occurred while migrating user settings: %s" @@ -89,7 +90,7 @@ "http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html" msgstr "" "Vechile tale setări au fost migrate din %s\n" -"în directoarele recomandate de Freedesktop.\n" +"în dosarele recomandate de Freedesktop.\n" "Pentru mai multe informații, te rog vizitează\n" "http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html" @@ -108,11 +109,11 @@ msgstr "Nu este încă implementat" msgid "Num of replace tokens not equal to num of found tokens" -msgstr "Nr token-urilor de înlocuire nu este egal cu nr token-urilor găsite" +msgstr "Nr. jetoanelor de înlocuire nu este egal cu nr. jetoanelor găsite" #, c-format msgid "Invalid token number %d" -msgstr "Număr token nevalid %d" +msgstr "Număr jeton nevalid %d" msgid "Regular expression error" msgstr "Expresie regulată eronată" @@ -124,7 +125,7 @@ msgstr "Expresie re&gulată" msgid "He&xadecimal" -msgstr "He&xadecimal" +msgstr "He&xazecimal" msgid "Wil&dcard search" msgstr "Căutare me&tacaracter" @@ -134,16 +135,16 @@ "Unable to load '%s' skin.\n" "Default skin has been loaded" msgstr "" -"Nu se poate încărca tema '%s'.\n" -"A fost încărcată tema implicită" +"Nu se poate încărca tematica '%s'.\n" +"A fost încărcată tematica implicită" #, c-format msgid "" "Unable to parse '%s' skin.\n" "Default skin has been loaded" msgstr "" -"Nu se poate interpreta tema '%s'.\n" -"A fost încărcată tema implicită" +"Nu se poate interpreta tematica '%s'.\n" +"A fost încărcată tematica implicită" #, c-format msgid "" @@ -151,69 +152,69 @@ "on non-256 colors terminal.\n" "Default skin has been loaded" msgstr "" -"Nu se poate folosi tema '%s' cu suport pentru 256 de culori\n" +"Nu se poate folosi tematica '%s' cu suport pentru 256 de culori\n" "pe un terminal non-256.\n" -"A fost încărcată tema implicită" +"A fost încărcată tematica implicită" msgid "Function key 1" -msgstr "Tasta funcţ. 1" +msgstr "Tasta funcț. 1" msgid "Function key 2" -msgstr "Tasta funcţ. 2" +msgstr "Tasta funcț. 2" msgid "Function key 3" -msgstr "Tasta funcţ. 3" +msgstr "Tasta funcț. 3" msgid "Function key 4" -msgstr "Tasta funcţ. 4" +msgstr "Tasta funcț. 4" msgid "Function key 5" -msgstr "Tasta funcţ. 5" +msgstr "Tasta funcț. 5" msgid "Function key 6" -msgstr "Tasta funcţ. 6" +msgstr "Tasta funcț. 6" msgid "Function key 7" -msgstr "Tasta funcţ. 7" +msgstr "Tasta funcț. 7" msgid "Function key 8" -msgstr "Tasta funcţ. 8" +msgstr "Tasta funcț. 8" msgid "Function key 9" -msgstr "Tasta funcţ. 9" +msgstr "Tasta funcț. 9" msgid "Function key 10" -msgstr "Tasta funcţ. 10" +msgstr "Tasta funcț. 10" msgid "Function key 11" -msgstr "Tasta funcţ. 11" +msgstr "Tasta funcț. 11" msgid "Function key 12" -msgstr "Tasta funcţ. 12" +msgstr "Tasta funcț. 12" msgid "Function key 13" -msgstr "Tasta funcţ. 13" +msgstr "Tasta funcț. 13" msgid "Function key 14" -msgstr "Tasta funcţ. 14" +msgstr "Tasta funcț. 14" msgid "Function key 15" -msgstr "Tasta funcţ. 14" +msgstr "Tasta funcț. 14" msgid "Function key 16" -msgstr "Tasta funcţ. 16" +msgstr "Tasta funcț. 16" msgid "Function key 17" -msgstr "Tasta funcţ. 17" +msgstr "Tasta funcț. 17" msgid "Function key 18" -msgstr "Tasta funcţ. 18" +msgstr "Tasta funcț. 18" msgid "Function key 19" -msgstr "Tasta funcţ. 19" +msgstr "Tasta funcț. 19" msgid "Function key 20" -msgstr "Tasta funcţ. 20" +msgstr "Tasta funcț. 20" msgid "Backspace key" msgstr "Tasta Backspace" @@ -270,16 +271,16 @@ msgstr "Tasta Escape" msgid "Left arrow keypad" -msgstr "Stânga pe keypad" +msgstr "Săgeată stânga pe keypad" msgid "Right arrow keypad" -msgstr "Dreapta pe keypad" +msgstr "Săgeată dreapta pe keypad" msgid "Up arrow keypad" -msgstr "Sus pe keypad" +msgstr "Săgeată sus pe keypad" msgid "Down arrow keypad" -msgstr "Jos pe keypad" +msgstr "Săgeată jos pe keypad" msgid "Home on keypad" msgstr "Home pe keypad" @@ -303,16 +304,16 @@ msgstr "Enter pe keypad" msgid "Function key 21" -msgstr "Tasta funcțională 21" +msgstr "Tasta funcț. 21" msgid "Function key 22" -msgstr "Tasta funcțională 22" +msgstr "Tasta funcț. 22" msgid "Function key 23" -msgstr "Tasta funcțională 23" +msgstr "Tasta funcț. 23" msgid "Function key 24" -msgstr "Tasta funcțională 24" +msgstr "Tasta funcț. 24" msgid "A1 key" msgstr "Tasta A1" @@ -357,7 +358,7 @@ msgstr "Semn de întrebare" msgid "Ampersand" -msgstr "Semnul &" +msgstr "Semnul &&" msgid "Dollar sign" msgstr "Semnul dollar" @@ -378,13 +379,13 @@ msgstr "" msgid "Underline" -msgstr "" +msgstr "Subliniere" msgid "Understrike" msgstr "" msgid "Pipe" -msgstr "" +msgstr "Pipe" msgid "Left parenthesis" msgstr "Paranteză stânga" @@ -393,16 +394,16 @@ msgstr "Paranteză dreapta" msgid "Left bracket" -msgstr "" +msgstr "Paranteză dreaptă stânga" msgid "Right bracket" -msgstr "" +msgstr "Paranteză dreaptă dreapta" msgid "Left brace" -msgstr "" +msgstr "Acoladă stânga" msgid "Right brace" -msgstr "" +msgstr "Acoladă dreapta" msgid "Enter" msgstr "Enter" @@ -414,13 +415,13 @@ msgstr "Tasta spațiu" msgid "Slash key" -msgstr "" +msgstr "Tasta slash" msgid "Backslash key" -msgstr "" +msgstr "Tasta backslash" msgid "Number sign #" -msgstr "" +msgstr "Semn #" #. TRANSLATORS: Please translate as in "at sign" (@). msgid "At sign" @@ -444,10 +445,10 @@ "Check the TERM environment variable.\n" msgstr "" "Mărimea %dx%d a ecranului nu este suportată.\n" -"Verificaţi variabila e mediu TERM.\n" +"Verificați variabila de mediu TERM.\n" msgid "Warning" -msgstr "Atenţie" +msgstr "Atenție" msgid "Pipe failed" msgstr "" @@ -460,7 +461,7 @@ #, c-format msgid "Directory cache expired for %s" -msgstr "Cache-ul directorului %s a expirat" +msgstr "Cache-ul dosarelor a expirat pentru %s" msgid "bytes transferred" msgstr "octeți transferați" @@ -469,44 +470,44 @@ msgstr "Pornesc transferul liniar..." msgid "Getting file" -msgstr "Transfer fişierul" +msgstr "Transfer fișierul" msgid "Changes to file lost" -msgstr "S-au pierdut schimbările efectuate în fişier" +msgstr "S-au pierdut schimbările efectuate în fișier" #, c-format msgid "%s is not a directory\n" -msgstr "%s nu este un director\n" +msgstr "%s nu este un dosar\n" #, c-format msgid "Directory %s is not owned by you\n" -msgstr "Nu deţineţi directorul %s\n" +msgstr "Nu dețineți dosarul %s\n" #, c-format msgid "Cannot set correct permissions for directory %s\n" -msgstr " Nu pot seta permisiile corecte pentru directorul %s\n" +msgstr "Nu pot seta permisiunile corecte pentru dosarul %s\n" #, c-format msgid "Cannot create temporary directory %s: %s\n" -msgstr "Nu pot crea directorul temporar %s: %s\n" +msgstr "Nu pot crea dosarul temporar %s: %s\n" #, c-format msgid "Temporary files will be created in %s\n" -msgstr "Fişierele temporare vor fi create în %s\n" +msgstr "Fișierele temporare vor fi create în %s\n" #, c-format msgid "Temporary files will not be created\n" -msgstr "Nu vor fi create fişiere temporare\n" +msgstr "Nu vor fi create fișiere temporare\n" #, c-format msgid "Press any key to continue..." -msgstr "Apăsaţi o tastă pentru a continua..." +msgstr "Apăsați o tastă pentru a continua..." msgid "Cannot parse:" -msgstr "Nu pot prelucra:" +msgstr "Nu pot interpreta:" msgid "More parsing errors will be ignored." -msgstr "Alte erori de prelucrare vor fi ignorate" +msgstr "Alte erori de interpretare vor fi ignorate" msgid "Internal error:" msgstr "Eroare internă:" @@ -537,28 +538,28 @@ msgstr "&OK" msgid "&Cancel" -msgstr "&Renunţă" +msgstr "&Renunță" msgid "Background process:" -msgstr "Procese în fundal:" +msgstr "Sarcină în fundal:" msgid "Error" msgstr "Eroare" msgid "Displays the current version" -msgstr "Afişează versiunea curentă" +msgstr "Afișează versiunea curentă" msgid "Print data directory" -msgstr "Arată datele directorului" +msgstr "Afișează dosarul de date" msgid "Print extended info about used data directories" -msgstr "Afișează informații extinse despre directoarele de date folosite" +msgstr "Afișează informații extinse despre dosarele de date folosite" msgid "Print configure options" msgstr "Afișează opțiunile de configurare" msgid "Print last working directory to specified file" -msgstr "Arată ultimul directorul curent în fişierul specificat" +msgstr "Arată ultimul dosar curent în fișierul specificat" msgid "Enables subshell support (default)" msgstr "Activează suportul pentru subshell (implicit)" @@ -567,25 +568,25 @@ msgstr "Dezactivează suportul subshell" msgid "Log ftp dialog to specified file" -msgstr "Înregistrează dialogul ftp în fişierul specificat" +msgstr "Înregistrează dialogul ftp în fișierul specificat" msgid "Set debug level" msgstr "Nivelul de depanare" msgid "Launches the file viewer on a file" -msgstr "Lansează vizualizatorul de fişiere pe un fişier" +msgstr "Lansează vizualizatorul pe un fișier" msgid "Edit files" msgstr "Editează fișiere" msgid "Forces xterm features" -msgstr "Forţează facilităţile xterm" +msgstr "Forțează facilitățile xterm" msgid "Disable X11 support" msgstr "Dezactivează suportul X11" msgid "Tries to use an old highlight mouse tracking" -msgstr "" +msgstr "Încearcă să folosească o determinare veche a evidențierii mausului" msgid "Disable mouse support in text version" msgstr "Dezactivează suportul de mouse în versiunea text" @@ -597,16 +598,18 @@ msgstr "Pentru a rula pe terminale încete" msgid "Use stickchars to draw" -msgstr "Utilizează +, -, | pentru desenare" +msgstr "Utilizează stickchars pentru afișare" msgid "Resets soft keys on HP terminals" msgstr "Resetează tastele soft pe terminale HP" msgid "Load definitions of key bindings from specified file" -msgstr "încarcă definițiile de combinații de taste din fișierul specificat" +msgstr "Încarcă definițiile de combinații de taste din fișierul specificat" msgid "Don't load definitions of key bindings from file, use defaults" msgstr "" +"Nu încarca definițiile de combinații de taste din fișier, folosește tastele " +"implicite" msgid "Requests to run in black and white" msgstr "Cerere de rulare în alb/negru" @@ -615,10 +618,10 @@ msgstr "Cerere de rulare în culori" msgid "Specifies a color configuration" -msgstr "Specifică o configuraţie de culori" +msgstr "Specifică o configurație de culori" msgid "Show mc with specified skin" -msgstr "Arată mc cu tema specificată" +msgstr "Arată mc cu tematica specificată" #. TRANSLATORS: don't translate keywords msgid "" @@ -655,6 +658,16 @@ "Attributes:\n" " bold, underline, reverse, blink; append more with '+'\n" msgstr "" +"Culori standard:\n" +" black, gray, red, brightred, green, brightgreen, brown,\n" +" yellow, blue, brightblue, magenta, brightmagenta, cyan,\n" +" brightcyan, lightgray și white\n" +"\n" +"Culori extinse, când sunt disponibile 256 culori:\n" +" color16 la color255, sau rgb000 la rgb555 și gray0 la gray23\n" +"\n" +"Atribute:\n" +" bold, underline, reverse, blink; adaugă mai multe cu '+'\n" msgid "Color options" msgstr "Opțiuni culori" @@ -663,7 +676,7 @@ msgstr "+număr" msgid "[this_dir] [other_panel_dir]" -msgstr "" +msgstr "[acest_dir] [celălalt_panou_dir]" msgid "Set initial line number for the internal editor" msgstr "Numărul primei linii pentru editorul intern" @@ -676,7 +689,7 @@ "\n" "Te rog trimite rapoartele de disfuncționalitate (inclusiv rezultatul " "comenzii 'mc -V')\n" -"ca și tichet pe www.midnight-commander.org\n" +"ca tichet pe www.midnight-commander.org\n" #, c-format msgid "GNU Midnight Commander %s\n" @@ -695,13 +708,13 @@ msgstr "Nu au fost date argumente către vizualizator." msgid "Two files are required to evoke the diffviewer." -msgstr "Două fișiere sunt necesare pentru a invoca vizualizatorul de diferențe" +msgstr "Sunt necesare două fișiere pentru a invoca vizualizatorul de diferențe" msgid "Background process error" -msgstr "Eroare a procesului din fundal" +msgstr "Eroare a sarciniii din fundal" msgid "Unknown error in child" -msgstr "Eroare necunoscută in procesul copil" +msgstr "Eroare necunoscută în procesul copil" msgid "Child died unexpectedly" msgstr "Procesul copil a murit neașteptat" @@ -716,20 +729,20 @@ "Background process sent us a request for more arguments\n" "than we can handle." msgstr "" -"Procesul din fundal a cerut mai multe argumente\n" -"decât putem gestiona" +"Sarcina din fundal a cerut mai multe argumente\n" +"decât putem gestiona." msgid "&Dismiss" -msgstr "&Închide" +msgstr "Închi&de" msgid "Enter search string:" -msgstr "" +msgstr "Introdu șirul de căutare:" msgid "Cas&e sensitive" -msgstr "Sensibil la majuscule" +msgstr "S&ensibil la majuscule" msgid "&Backwards" -msgstr "în sens &Invers " +msgstr "În sens &invers" msgid "&Whole words" msgstr "C&uvinte întregi" @@ -748,7 +761,7 @@ "Cannot create temporary diff file\n" "%s" msgstr "" -"Nu se poate crea fișierele temporare de diferențe\n" +"Nu se poate crea fișierul temporare de diferențe\n" "%s" #, c-format @@ -770,767 +783,786 @@ "%s" msgid "&Fastest (Assume large files)" -msgstr "&Rapid (Presupune fișiere mari)" +msgstr "Rapid (Presupune &fișiere mari)" msgid "&Minimal (Find a smaller set of change)" -msgstr "" +msgstr "&Minim (Caută un set mai mic de modificări)" msgid "Diff algorithm" -msgstr "" +msgstr "Algoritm diff" msgid "Diff extra options" -msgstr "" +msgstr "Opțiuni extra diff" msgid "&Ignore case" -msgstr "" +msgstr "&Ignoră majuscule" msgid "Ignore tab &expansion" -msgstr "" +msgstr "Ignoră &expansiunea tab" msgid "Ignore &space change" -msgstr "" +msgstr "Ignoră schimbările date de &spații" msgid "Ignore all &whitespace" -msgstr "" +msgstr "Ignoră toate &spațiile" msgid "Strip &trailing carriage return" -msgstr "" +msgstr "Înlătură semnul de sfârșit de linie &final" msgid "Diff Options" -msgstr "" +msgstr "Opțiuni diff" msgid "Edit" -msgstr "" +msgstr "Editare" msgid "Edit is disabled" -msgstr "" +msgstr "Editarea este dezactivată" msgid "Goto line (left)" -msgstr "" +msgstr "Mergi la linia (stânga)" msgid "Goto line (right)" -msgstr "" +msgstr "Mergi la linia (dreapta)" msgid "Enter line:" -msgstr "" +msgstr "Introdu linia:" msgid "ButtonBar|Help" -msgstr "" +msgstr "ButtonBar|Ajutor" msgid "ButtonBar|Save" -msgstr "" +msgstr "ButtonBar|Salvare" msgid "ButtonBar|Edit" -msgstr "" +msgstr "ButtonBar|Editare" msgid "ButtonBar|Merge" -msgstr "" +msgstr "ButtonBar|Combină" msgid "ButtonBar|Search" -msgstr "" +msgstr "ButtonBar|Caută" msgid "ButtonBar|Options" -msgstr "" +msgstr "ButtonBar|Opțiuni" msgid "ButtonBar|Quit" -msgstr "" +msgstr "ButtonBar|Ieșire" msgid "Quit" -msgstr "Ieşi" +msgstr "Ieși" msgid "File(s) was modified. Save with exit?" -msgstr "" +msgstr "Fișierul a fost modificat. Salvezi la ieșire?" msgid "" "Midnight Commander is being shut down.\n" "Save modified file(s)?" msgstr "" +"Midnight Commander este în curs de închidere.\n" +"Salvezi fișierul modificat?" msgid "Diff:" -msgstr "" +msgstr "Diff:" #, c-format msgid "\"%s\" is a directory" -msgstr "" +msgstr "\"%s\" este un dosar" #, c-format msgid "" "Cannot stat \"%s\"\n" "%s" msgstr "" +"Nu se poate găsi \"%s\"\n" +"%s" msgid "Diff viewer: invalid mode" -msgstr "" +msgstr "Vizualizator diff: mod invalid" msgid "Two files are needed to compare" -msgstr "" +msgstr "Sunt necesare două fișiere pentru comparare" msgid "Choose syntax highlighting" -msgstr "" +msgstr "Alege sintaxa de evidenţiere" msgid "< Auto >" -msgstr "" +msgstr "< Auto >" msgid "< Reload Current Syntax >" -msgstr "" +msgstr "< Reîncarcă sintaxa curentă >" #, c-format msgid "Cannot open %s for reading" -msgstr "" +msgstr "Nu se poate deschide %s pentru citire" #, c-format msgid "Error reading %s" -msgstr "" +msgstr "Eroare la citirea %s" #, c-format msgid "Cannot get size/permissions for %s" -msgstr "" +msgstr "Nu se pot obține mărimea/permisiunile pentru %s" #, c-format msgid "\"%s\" is not a regular file" -msgstr "" +msgstr "\"%s\" nu este un fișier obișnuit" #, c-format msgid "" "File \"%s\" is too large.\n" "Open it anyway?" msgstr "" +"Fișierul \"%s\" este prea mare.\n" +"Îl deschizi oricum?" #, c-format msgid "Error reading from pipe: %s" -msgstr "" +msgstr "Eroare la citirea din pipe: %s" #, c-format msgid "Cannot open pipe for reading: %s" -msgstr "" +msgstr "Nu se poate deschide pipe pentru citire: %s" msgid "File has hard-links. Detach before saving?" -msgstr "" +msgstr "Fișierul are hard-links. Desprinzi înainte de a salva?" msgid "The file has been modified in the meantime. Save anyway?" -msgstr "" +msgstr "Fișierul a fost modificat între timp. Salvezi oricum?" #, c-format msgid "Error writing to pipe: %s" -msgstr "" +msgstr "Eroare la scrierea în pipe: %s" #, c-format msgid "Cannot open pipe for writing: %s" -msgstr "" +msgstr "Nu se poate pipe pentru scriere: %s" #, c-format msgid "Cannot open file for writing: %s" -msgstr "" +msgstr "Nu se poate deschide fișierul pentru scriere: %s" msgid "The file you are saving is not finished with a newline" -msgstr "" +msgstr "Fișierul pe care îl salvezi nu se termină cu o linie nouă" msgid "C&ontinue" -msgstr "" +msgstr "C&ontinuă" msgid "&Do not change" -msgstr "" +msgstr "&Nu schimba" msgid "&Unix format (LF)" -msgstr "" +msgstr "Format &Unix (LF)" msgid "&Windows/DOS format (CR LF)" -msgstr "" +msgstr "Format &Windows/DOS (CR LF)" msgid "&Macintosh format (CR)" -msgstr "" +msgstr "Format &Macintosh (CR)" msgid "Enter file name:" -msgstr "" +msgstr "Introdu numele de fișier:" msgid "Change line breaks to:" -msgstr "" +msgstr "Schimbă finalul de linie în:" msgid "Save As" -msgstr "" +msgstr "Salvează ca" msgid "Block is large, you may not be able to undo this action" -msgstr "" +msgstr "Blocul este mare, este posibil sa nu poți anula această acțiune" msgid "&Quick save" -msgstr "" +msgstr "Salvare &rapidă" msgid "&Safe save" -msgstr "" +msgstr "&Salvare sigură" msgid "&Do backups with following extension:" -msgstr "" +msgstr "&Fă copii de siguranță cu următoarea extensie:" msgid "Check &POSIX new line" -msgstr "" +msgstr "Verificare &POSIX pentru o noua linie" msgid "Edit Save Mode" -msgstr "" +msgstr "Editare mod salvare" msgid "Save as" -msgstr "" +msgstr "Salvează ca" msgid "Cannot save: destination is not a regular file" -msgstr "" +msgstr "Nu se poate salva: destinația nu este un fișier obișnuit" msgid "A file already exists with this name" -msgstr "" +msgstr "Deja există un fișier cu acest nume" msgid "&Overwrite" -msgstr "" +msgstr "S&uprascrie" msgid "Cannot save file" -msgstr "" +msgstr "Nu se poate salva fișierul" msgid "Delete macro" -msgstr "" +msgstr "Șterge macro" msgid "Press macro hotkey:" -msgstr "" +msgstr "Apasă combinația de taste pentru macro:" msgid "Macro not deleted" -msgstr "" +msgstr "Macro nu a fost șters" msgid "Save macro" -msgstr "" +msgstr "Salvează macro" msgid "Press the macro's new hotkey:" -msgstr "" +msgstr "Apasă noua combinație de taste pentru macro:" msgid "Repeat last commands" -msgstr "" +msgstr "Repetă ultimele comenzi" msgid "Repeat times:" -msgstr "" +msgstr "Număr de repetări:" #, c-format msgid "Confirm save file: \"%s\"" -msgstr "" +msgstr "Confirmă salvarea fișierului: \"%s\"" msgid "Save file" -msgstr "" +msgstr "Salvează fișier" msgid "&Save" msgstr "&Salvează" msgid "Load" -msgstr "" +msgstr "Încarcă" msgid "Syntax file edit" -msgstr "editare fişier sintaxă" +msgstr "Editare fișier sintaxă" msgid "Which syntax file you want to edit?" -msgstr "" +msgstr "Ce fișier de sintaxă dorești să editezi?" msgid "&User" msgstr "&Utilizator" msgid "&System wide" -msgstr "" +msgstr "În tot &sistemul" msgid "Menu edit" -msgstr "" +msgstr "Editare meniu" msgid "Which menu file do you want to edit?" -msgstr "" +msgstr "Ce fișier de meniu dorești să editezi?" msgid "&Local" msgstr "&Local" msgid "Replace" -msgstr "" +msgstr "Înlocuiește" #, c-format msgid "%ld replacements made" -msgstr "" +msgstr "%ld înlocuiri efectuate" msgid "[NoName]" -msgstr "" +msgstr "[FărăNume]" #, c-format msgid "" "File %s was modified.\n" "Save before close?" msgstr "" +"Fișierul %s a fost modificat.\n" +"Salvezi înainte de închidere?" msgid "Close file" -msgstr "" +msgstr "Închide fișier" #, c-format msgid "" "Midnight Commander is being shut down.\n" "Save modified file %s?" msgstr "" +"Midnight Commander este în curs de închidere.\n" +"Salvezi fișierul modificat %s?" msgid "This function is not implemented" -msgstr "" +msgstr "Această funcție nu este implementată" msgid "Copy to clipboard" -msgstr "" +msgstr "Copiază în clipboard" msgid "Unable to save to file" -msgstr "" +msgstr "Nu se poate salva în fișier" msgid "Cut to clipboard" -msgstr "" +msgstr "Taie în clipboard" msgid "Goto line" -msgstr "" +msgstr "Mergi la linia" msgid "Save block" -msgstr "" +msgstr "Salvează blocul" msgid "Insert file" -msgstr "" +msgstr "Inserează fișierul" msgid "Cannot insert file" -msgstr "" +msgstr "Nu se poate insera fișierul" msgid "Sort block" -msgstr "" +msgstr "Sortează blocul" msgid "You must first highlight a block of text" -msgstr "" +msgstr "Mai întâi trebuie să evidențiezi un bloc de text" msgid "Run sort" -msgstr "" +msgstr "Rulează sortarea" msgid "Enter sort options (see manpage) separated by whitespace:" msgstr "" +"Introdu opțiunile de sortare (vezi pagina de manual) separate prin spațiu:" msgid "Sort" -msgstr "" +msgstr "Sortare" msgid "Cannot execute sort command" -msgstr "" +msgstr "Nu se poate rula comanda de sortare" #, c-format msgid "Sort returned non-zero: %s" -msgstr "" +msgstr "Sortarea a returnat non-zero: %s" msgid "Paste output of external command" -msgstr "" +msgstr "Lipește ieșirea unei comenzi externe" msgid "Enter shell command(s):" -msgstr "" +msgstr "Introdu comandă shell:" msgid "External command" -msgstr "" +msgstr "Comandă externă" msgid "Cannot execute command" -msgstr "" +msgstr "Nu se poate executa comanda" msgid "mail -s -c " -msgstr "" +msgstr "mail -s -c " msgid "To" -msgstr "" +msgstr "Către" msgid "Subject" -msgstr "" +msgstr "Subiect" msgid "Copies to" -msgstr "" +msgstr "Copie către" msgid "Mail" -msgstr "" +msgstr "Mail" msgid "Insert literal" -msgstr "" +msgstr "Inserează literal" msgid "Press any key:" -msgstr "" +msgstr "Apasă orice tastă:" msgid "" "Current text was modified without a file save.\n" "Continue discards these changes" msgstr "" +"Textul curent a fost modificat fără a se salva fișierul.\n" +"Dacă se continuă schimbările vor fi pierdute." msgid "In se&lection" -msgstr "" +msgstr "În se&lecție" msgid "&Find all" -msgstr "" +msgstr "&Găsește tot" msgid "Enter replacement string:" -msgstr "" +msgstr "Introdu șirul de înlocuire:" msgid "Replace with:" -msgstr "" +msgstr "Înlocuiește cu:" msgid "&Replace" -msgstr "&Înlocuieşte" +msgstr "&Înlocuiește" msgid "A&ll" -msgstr "&Toate" +msgstr "Toa&te" msgid "&Skip" msgstr "&Sar" msgid "Confirm replace" -msgstr "" +msgstr "Confirmă înlocuirea" msgid "Cancel" -msgstr "Renunţă" +msgstr "Renunță" msgid "" "Current text was modified without a file save.\n" "Continue discards these changes." msgstr "" +"Textul curent a fost modificat fără a se salva fișierul.\n" +"Dacă se continuă schimbările vor fi pierdute." msgid "NoName" -msgstr "" +msgstr "FărăNume" msgid "&Open file..." -msgstr "D&eschide cu..." +msgstr "D&eschide fișier..." msgid "&New" -msgstr "" +msgstr "&Nou" msgid "&Close" -msgstr "" +msgstr "În&chide" msgid "Save &as..." -msgstr "" +msgstr "Salvează c&a..." msgid "&Insert file..." -msgstr "" +msgstr "&Inserează fișier..." msgid "Cop&y to file..." -msgstr "" +msgstr "Co&piază în fișier..." msgid "&User menu..." -msgstr "" +msgstr "Meniu &utilizator..." msgid "A&bout..." -msgstr "" +msgstr "Des&pre..." msgid "&Quit" -msgstr "&Ieşire" +msgstr "&Ieșire" msgid "&Undo" -msgstr "" +msgstr "An&ulează" msgid "&Redo" -msgstr "" +msgstr "&Refă" msgid "&Toggle ins/overw" -msgstr "" +msgstr "Comu&tă ins/supr" msgid "To&ggle mark" -msgstr "" +msgstr "Co&mută selecția" msgid "&Mark columns" -msgstr "" +msgstr "Selectează coloa&ne" msgid "Mark &all" -msgstr "" +msgstr "Selecte&ază tot" msgid "Unmar&k" -msgstr "" +msgstr "Deselectează" msgid "Cop&y" -msgstr "" +msgstr "C&opiază" msgid "Mo&ve" -msgstr "" +msgstr "Mu&tă" msgid "&Delete" -msgstr "&Şterge" +msgstr "Ş&terge" msgid "Co&py to clipfile" -msgstr "" +msgstr "Co&piază în fișierul clip" msgid "&Cut to clipfile" -msgstr "" +msgstr "&Taie în fișierul clip" msgid "Pa&ste from clipfile" -msgstr "" +msgstr "Li&pește din fișierul clip" msgid "&Beginning" -msgstr "" +msgstr "În&ceput" msgid "&End" -msgstr "" +msgstr "Sfârşi&t" msgid "&Search..." -msgstr "" +msgstr "&Caută..." msgid "Search &again" -msgstr "" +msgstr "C&aută din nou" msgid "&Replace..." -msgstr "" +msgstr "În&locuire..." msgid "&Toggle bookmark" -msgstr "" +msgstr "&Comută marcaj" msgid "&Next bookmark" -msgstr "" +msgstr "Marcajul &următor" msgid "&Prev bookmark" -msgstr "" +msgstr "Marcajul &precedent" msgid "&Flush bookmarks" -msgstr "" +msgstr "Ște&rge marcaje" msgid "&Go to line..." -msgstr "" +msgstr "Mer&gi la linia..." msgid "&Toggle line state" -msgstr "" +msgstr "&Comută linia de stare" msgid "Go to matching &bracket" -msgstr "" +msgstr "Mergi la ¶nteza pereche" msgid "Toggle s&yntax highlighting" -msgstr "" +msgstr "Comută evidenţierea de sinta&xă" msgid "&Find declaration" -msgstr "" +msgstr "&Găsește declarația" msgid "Back from &declaration" -msgstr "" +msgstr "Înapoi de la &declarație" msgid "For&ward to declaration" -msgstr "" +msgstr "Î&nainte către declarație" msgid "Encod&ing..." -msgstr "" +msgstr "Codif&icare" msgid "&Refresh screen" -msgstr "" +msgstr "&Reîmprospătare ecran" msgid "&Start/Stop record macro" -msgstr "" +msgstr "&Start/stop înregistrare macro" msgid "Delete macr&o..." -msgstr "" +msgstr "Șterge macr&o..." msgid "Record/Repeat &actions" -msgstr "" +msgstr "Înregistrare/Repetare &acțiuni" msgid "S&pell check" -msgstr "" +msgstr "Veri&ficare ortografică" msgid "C&heck word" -msgstr "" +msgstr "V&erifică cuvânt" msgid "Change spelling &language..." -msgstr "" +msgstr "Schimbă &limba de verificare..." msgid "&Mail..." -msgstr "" +msgstr "&Mail..." msgid "Insert &literal..." -msgstr "" +msgstr "Inserează &literal..." msgid "Insert &date/time" -msgstr "" +msgstr "Inserează &dată/timp" msgid "&Format paragraph" -msgstr "" +msgstr "&Format paragraf" msgid "&Sort..." -msgstr "" +msgstr "&Sortare..." msgid "&Paste output of..." -msgstr "" +msgstr "&Lipește ieșirea comenzii..." msgid "&External formatter" -msgstr "" +msgstr "Program de formatare &extern" msgid "&Move" msgstr "&Mută" msgid "&Resize" -msgstr "" +msgstr "&Redimensionează" msgid "&Toggle fullscreen" -msgstr "" +msgstr "Comu&tă pe tot ecranul" msgid "&Next" -msgstr "" +msgstr "&Următorul" msgid "&Previous" -msgstr "" +msgstr "&Precedentul" msgid "&List..." -msgstr "" +msgstr "&Listă..." msgid "&General..." -msgstr "" +msgstr "&General..." msgid "Save &mode..." -msgstr "" +msgstr "&Mod salvare..." msgid "Learn &keys..." -msgstr "" +msgstr "Învață &taste..." msgid "Syntax &highlighting..." -msgstr "" +msgstr "Evidențiere de s&intaxă..." msgid "S&yntax file" -msgstr "" +msgstr "Fișier de s&intaxă" msgid "&Menu file" -msgstr "" +msgstr "Fișier de &meniu" msgid "&Save setup" msgstr "&Salvează setările" msgid "&File" -msgstr "" +msgstr "&Fișier" msgid "&Edit" -msgstr "" +msgstr "&Editare" msgid "&Search" -msgstr "" +msgstr "&Caută" msgid "&Command" -msgstr "" +msgstr "&Comandă" msgid "For&mat" -msgstr "" +msgstr "For&mat" msgid "&Window" -msgstr "" +msgstr "Fe&reastră" msgid "&Options" -msgstr "" +msgstr "&Opțiuni" msgid "&None" -msgstr "" +msgstr "&Nimic" msgid "&Dynamic paragraphing" -msgstr "" +msgstr "Paragrafe &dinamice" msgid "Type &writer wrap" -msgstr "" +msgstr "Aranjare tip &mașină de scris" msgid "Wrap mode" msgstr "Mod de aranjare" msgid "Tabulation" -msgstr "" +msgstr "Tabulare" msgid "&Fake half tabs" msgstr "&Simulează tab-urile 1/2" msgid "&Backspace through tabs" -msgstr "şterge deodată &Tab-urile" +msgstr "Șterge deodată &tab-urile" msgid "Fill tabs with &spaces" -msgstr "&Umple tab-urile cu spaţii" +msgstr "&Umple tab-urile cu spații" msgid "Tab spacing:" -msgstr "" +msgstr "Spațiere tab:" msgid "Other options" -msgstr "" +msgstr "Alte opțiuni" msgid "&Return does autoindent" -msgstr "returul &Autoindentează" +msgstr "Enter &autoindentează" msgid "Confir&m before saving" -msgstr "&Confirmă înainte de a salva" +msgstr "Confir&mă înainte de a salva" msgid "Save file &position" -msgstr "Salvează fişierul şi &poziţia" +msgstr "Salvează &poziția în fișier" msgid "&Visible trailing spaces" -msgstr "" +msgstr "Spații la final &vizibile" msgid "Visible &tabs" -msgstr "" +msgstr "&Taburi vizibile" msgid "Synta&x highlighting" -msgstr "&Evidenţiere sintaxă" +msgstr "&Evidențiere sintaxă" msgid "C&ursor after inserted block" -msgstr "" +msgstr "C&ursor după blocul inserat" msgid "Pers&istent selection" -msgstr "" +msgstr "Selecție pers&istentă" msgid "Cursor be&yond end of line" -msgstr "" +msgstr "Cursor &dincolo de sfârşit fișier" msgid "&Group undo" msgstr "" msgid "Word wrap line length:" -msgstr "" +msgstr "Lungime linie pentru curgere cuvinte:" msgid "Editor options" -msgstr "" +msgstr "Opțiuni editor" msgid "" "A user friendly text editor\n" "written for the Midnight Commander." msgstr "" +"Un editor de text ușor de utilizat\n" +"creat pentru Midnight Commander." msgid "Copyright (C) 1996-2013 the Free Software Foundation" -msgstr "" +msgstr "Copyright (C) 1996-2013 the Free Software Foundation" msgid "About" -msgstr "" +msgstr "Despre" msgid "Open files" -msgstr "" +msgstr "Deschide fișiere" msgid "Edit: " -msgstr "" +msgstr "Editează: " msgid "ButtonBar|Mark" -msgstr "" +msgstr "ButtonBar|Marc" msgid "ButtonBar|Replac" -msgstr "" +msgstr "ButtonBar|Înloc" msgid "ButtonBar|Copy" -msgstr "" +msgstr "ButtonBar|Copie" msgid "ButtonBar|Move" -msgstr "" +msgstr "ButtonBar|Mută" msgid "ButtonBar|Delete" -msgstr "" +msgstr "ButtonBar|Șterge" msgid "ButtonBar|PullDn" -msgstr "" +msgstr "ButtonBar|ÎnJos" msgid "&Add word" -msgstr "" +msgstr "&Adaugă cuvânt" msgid "Language" -msgstr "" +msgstr "Limbă" msgid "Misspelled" -msgstr "" +msgstr "Scris greșit" msgid "Check word" -msgstr "" +msgstr "Verifică cuvânt" msgid "Suggest" -msgstr "" +msgstr "Sugerează" msgid "Select language" -msgstr "" +msgstr "Selectează limba" msgid "Load syntax file" -msgstr "" +msgstr "Încarcă fișier de sintaxă" #, c-format msgid "" "Cannot open file %s\n" "%s" msgstr "" +"Nu se poate deschide fișierul %s\n" +"%s" #, c-format msgid "Error in file %s on line %d" -msgstr "" +msgstr "Eroare în fișierul %s pe linia %d" msgid "" "The Commander can't change to the directory that\n" @@ -1538,17 +1570,21 @@ "deleted your working directory, or given yourself\n" "extra access permissions with the \"su\" command?" msgstr "" +"Commander nu poate schimba calea în dosarul în care\n" +"pretinde subterminalul că te afli. Probabil ai șters\n" +"dosarul de lucru sau ți-ai acordat permisiuni\n" +"suplimentare prin comanda \"su\"?" #, c-format msgid "Cannot fetch a local copy of %s" -msgstr "" +msgstr "Nu se poate prelua o copie locală a %s" msgid "The shell is already running a command" -msgstr "" +msgstr "Terminalul deja rulează o comandă" #, c-format msgid "Type 'exit' to return to the Midnight Commander" -msgstr "" +msgstr "Tastați `exit' pentru a reveni în Midnight Commander" msgid "Set &all" msgstr "Set. &tot" @@ -1566,31 +1602,35 @@ msgstr "grup" msgid "other" -msgstr "alţii" +msgstr "alții" msgid "Flag" msgstr "Ind." msgid "Chown advanced command" -msgstr "" +msgstr "Comandă avansată chown" #, c-format msgid "" "Cannot chmod \"%s\"\n" "%s" msgstr "" +"Nu se poate aplica chmod \"%s\"\n" +"%s" #, c-format msgid "" "Cannot chown \"%s\"\n" "%s" msgstr "" +"Nu se poate aplica chown \"%s\"\n" +"%s" msgid "Other 8 bit" -msgstr "8 biţi" +msgstr "Alt 8 biți" msgid "Running" -msgstr "" +msgstr "Rulează" msgid "Stopped" msgstr "Oprit" @@ -1599,142 +1639,142 @@ msgstr "&Niciodată" msgid "On dum&b terminals" -msgstr "" +msgstr "Pe terminale dum&b" msgid "Alwa&ys" msgstr "&Întotdeauna" msgid "File operations" -msgstr "" +msgstr "Acțiuni fișiere" msgid "&Verbose operation" -msgstr "operaţii des&Criptive" +msgstr "Operații &detaliate" msgid "Compute tota&ls" -msgstr "" +msgstr "Calculează tota&luri" msgid "Classic pro&gressbar" -msgstr "" +msgstr "Bară de pro&gres clasică" msgid "Mkdi&r autoname" -msgstr "" +msgstr "Redenumire automată pentru mkdi&r" msgid "&Preallocate space" -msgstr "" +msgstr "&Prealocare spațiu" msgid "Esc key mode" -msgstr "" +msgstr "Modul tastei Esc" msgid "S&ingle press" -msgstr "" +msgstr "O s&ingură apăsare" msgid "Timeout:" -msgstr "" +msgstr "Interval:" msgid "Pause after run" -msgstr "" +msgstr "Pauză după rulare" msgid "Use internal edi&t" -msgstr "" +msgstr "Folosește edi&torul intern" msgid "Use internal vie&w" -msgstr "" +msgstr "Folosește vi&zualizatorul intern" msgid "A&sk new file name" -msgstr "" +msgstr "Ce&re nume nou de fișier" msgid "Auto m&enus" -msgstr "" +msgstr "M&eniuri automate" msgid "&Drop down menus" -msgstr "&Desfăşoară meniurile" +msgstr "&Desfășoară meniurile" msgid "S&hell patterns" -msgstr "" +msgstr "Șabloane s&hell" msgid "Co&mplete: show all" -msgstr "" +msgstr "Co&mplet: arată tot" msgid "Rotating d&ash" -msgstr "" +msgstr "D&ash care se învârte" msgid "Cd follows lin&ks" -msgstr "" +msgstr "Cd urmărește le&găturile" msgid "Sa&fe delete" -msgstr "" +msgstr "Ștergere sigu&ră" msgid "A&uto save setup" -msgstr "" +msgstr "Auto-salvare a configurației" msgid "Configure options" -msgstr "Opţiuni de configurare" +msgstr "Opțiuni de configurare" msgid "Case &insensitive" -msgstr "" +msgstr "&Ignoră majuscule" msgid "Use panel sort mo&de" -msgstr "" +msgstr "Folosește mo&dul de sortare al panoului" msgid "Show mi&ni-status" -msgstr "" +msgstr "Arată mi&ni-status" msgid "Use SI si&ze units" -msgstr "" +msgstr "Folosește unități de mărime SI" msgid "Mi&x all files" -msgstr "" +msgstr "Ameste&că toate fișierele" msgid "Show &backup files" -msgstr "" +msgstr "Arată fișierele de &backup" msgid "Show &hidden files" -msgstr "" +msgstr "Arată fișierele a&scunse" msgid "&Fast dir reload" -msgstr "reîncarc&Ă dir. rapid" +msgstr "Reîncarcare rapidă a dosarului" msgid "Ma&rk moves down" -msgstr "" +msgstr "Selecta&rea mută în jos" msgid "Re&verse files only" -msgstr "" +msgstr "Afișare in&versă doar pentru fișiere" msgid "Simple s&wap" -msgstr "" +msgstr "Permutare simplă" msgid "A&uto save panels setup" -msgstr "" +msgstr "Salvare a&utomată a configurației panourilor" msgid "Navigation" -msgstr "" +msgstr "Navigare" msgid "L&ynx-like motion" -msgstr "navigare în stil L&ynx" +msgstr "Navigare în stil L&ynx" msgid "Pa&ge scrolling" -msgstr "" +msgstr "Derulare pa&gină" msgid "&Mouse page scrolling" -msgstr "" +msgstr "Derulare pagină cu ajutorul &mausului" msgid "File highlight" -msgstr "" +msgstr "Evidențiere fișier" msgid "File &types" -msgstr "" +msgstr "&Tipuri de fișier" msgid "&Permissions" -msgstr "" +msgstr "&Permisiuni" msgid "Quick search" -msgstr "" +msgstr "Căutare rapidă" msgid "Panel options" -msgstr "" +msgstr "Opțiuni panou" msgid "Information" -msgstr "" +msgstr "Informație" msgid "" "Using the fast reload option may not reflect the exact\n" @@ -1742,124 +1782,128 @@ "manual reload of the directory. See the man page for\n" "the details." msgstr "" +"Când se folosește opțiunea de reîncărcare rapidă conținutul dosarelor\n" +"este posibil să nu reflecte realitatea. În astfel de cazuri va fi nevoie\n" +"de o reîncărcare manuală a dosarului. Vezi pagina de manual\n" +"pentru detalii." msgid "&Full file list" -msgstr "listă de &Fişiere completă" +msgstr "Listă de &fișiere completă" msgid "&Brief file list" -msgstr "listă &Scurtă de fişiere" +msgstr "Listă &scurtă de fișiere" msgid "&Long file list" -msgstr "listă &Lungă de fişiere" +msgstr "Listă &lungă de fișiere" msgid "&User defined:" -msgstr "definit de &Utilizator:" +msgstr "Definit de &utilizator:" msgid "User &mini status" -msgstr "" +msgstr "&Mini-status utilizator" msgid "Listing mode" msgstr "Mod de listare" msgid "Executable &first" -msgstr "" +msgstr "Mai întâ&i executabilele" msgid "&Reverse" -msgstr "in&Vers" +msgstr "In&vers" msgid "Sort order" msgstr "Ordinea de sortare" #. TRANSLATORS: no need to translate 'Confirmation', it's just a context prefix msgid "Confirmation|&Delete" -msgstr "" +msgstr "Confirmation|Șter&ge" msgid "Confirmation|O&verwrite" -msgstr "" +msgstr "Confirmation|Su&prascrie" msgid "Confirmation|&Execute" -msgstr "" +msgstr "Confirmation|&Execută" msgid "Confirmation|E&xit" -msgstr "" +msgstr "Confirmation|Ieșir&e" msgid "Confirmation|Di&rectory hotlist delete" -msgstr "" +msgstr "Confirmation|Ștergere &listă rapidă de dosare" msgid "Confirmation|&History cleanup" -msgstr "" +msgstr "Confirmation|Curățare &istoric" msgid "Confirmation" -msgstr "" +msgstr "Confirmare" msgid "&UTF-8 output" -msgstr "" +msgstr "Ieșire &UTF-8" msgid "&Full 8 bits output" -msgstr "" +msgstr "Ieșire pe 8 biți comple&tă" msgid "&ISO 8859-1" -msgstr "" +msgstr "&ISO 8859-1" msgid "7 &bits" -msgstr "" +msgstr "7 &biți" msgid "F&ull 8 bits input" -msgstr "&Intrare pe 8 biţi" +msgstr "&Intrare pe 8 biți completă" msgid "Display bits" -msgstr "" +msgstr "Biți de afișare" msgid "Input / display codepage:" -msgstr "Intrare / cod de afişare:" +msgstr "Intrare / cod de afișare:" msgid "&Select" -msgstr "&Selectează " +msgstr "&Selectare" msgid "Directory tree" -msgstr "" +msgstr "Arbore dosare" msgid "Timeout for freeing VFSs (sec):" -msgstr "" +msgstr "Intervalul de timp pentru eliberarea VFS (sec):" msgid "FTP anonymous password:" -msgstr "" +msgstr "Parola pentru FTP anonim:" msgid "FTP directory cache timeout (sec):" -msgstr "" +msgstr "Expirare cache dosare FTP (sec):" msgid "&Always use ftp proxy:" -msgstr "" +msgstr "Folosește mereu prox&y FTP:" msgid "&Use ~/.netrc" msgstr "&Utilizează ~/.netrc" msgid "Use &passive mode" -msgstr "Utilizează modul _pasiv" +msgstr "Utilizează modul &pasiv" msgid "Use passive mode over pro&xy" -msgstr "" +msgstr "Folosește modul pasiv prin pro&xy" msgid "Virtual File System Setting" -msgstr "" +msgstr "Setări sistem virtual de fișiere" msgid "cd" msgstr "cd" msgid "Quick cd" -msgstr "Schimbare rapidă de director" +msgstr "Cd rapid" msgid "Existing filename (filename symlink will point to):" -msgstr "Fişier existent (către care va indica legătura):" +msgstr "Fișier existent (către care va indica legătura):" msgid "Symbolic link filename:" msgstr "Numele legăturii simbolice:" msgid "Symbolic link" -msgstr "Numele legăturii simbolice:" +msgstr "Legătura simbolică" msgid "&Stop" -msgstr "O&preşte" +msgstr "&Stop" msgid "&Resume" msgstr "&Reia" @@ -1868,7 +1912,7 @@ msgstr "&Omoară" msgid "Background jobs" -msgstr "" +msgstr "Sarcini în fundal" #, c-format msgid "Password for \\\\%s\\%s" @@ -1881,55 +1925,55 @@ msgstr "Nume proprietar:" msgid "SMB authentication" -msgstr "" +msgstr "Autentificare SMB" msgid "set &user ID on execution" -msgstr "" +msgstr "Setează ID &proprietar la executare" msgid "set &group ID on execution" -msgstr "" +msgstr "Setează ID &grup la executare" msgid "stick&y bit" -msgstr "" +msgstr "Bit stick&y" msgid "&read by owner" -msgstr "" +msgstr "&citește de către proprietar" msgid "&write by owner" -msgstr "" +msgstr "&scrie de către proprietar" msgid "e&xecute/search by owner" -msgstr "" +msgstr "e&xecută/caută de către proprietar" msgid "rea&d by group" -msgstr "" +msgstr "citește &de către grup" msgid "write by grou&p" -msgstr "" +msgstr "scrie de către gru&p" msgid "execu&te/search by group" -msgstr "" +msgstr "execu&tă/caută de către grup" msgid "read &by others" -msgstr "" +msgstr "citește de către &alții" msgid "wr&ite by others" -msgstr "" +msgstr "sc&rie de către alții" msgid "execute/searc&h by others" -msgstr "" +msgstr "execută/caută de către alții" msgid "Name:" -msgstr "" +msgstr "Nume:" msgid "Permissions (octal):" -msgstr "" +msgstr "Permisiuni (octal):" msgid "Owner name:" -msgstr "" +msgstr "Nume proprietar:" msgid "Group name:" -msgstr "" +msgstr "Nume grup:" msgid "&Marked all" msgstr "&Tot marc." @@ -1944,10 +1988,10 @@ msgstr "Comanda chmod" msgid "Permission" -msgstr "Drepturi" +msgstr "Permisiuni" msgid "File" -msgstr " Fişier" +msgstr "Fișier" msgid "Set &groups" msgstr "Setează &grupuri" @@ -1959,119 +2003,119 @@ msgstr "Nume" msgid "Owner name" -msgstr "Numele proprietarului" +msgstr "Nume proprietar" msgid "Group name" -msgstr "Numele grupului" +msgstr "Nume grup" msgid "Size" msgstr "Mărime" msgid "Chown command" -msgstr "" +msgstr "Comanda chown" msgid "User name" -msgstr "" +msgstr "Nume proprietar" msgid "" -msgstr "" +msgstr "" msgid "" msgstr "" msgid "Enter machine name (F1 for details):" -msgstr "" +msgstr "Introdu numele mașinii (F1 pentru detalii):" msgid "Files tagged, want to cd?" -msgstr "Există fişiere marcate, doriţi să schimbaţi directorul?" +msgstr "Există fișiere marcate, doriți să cd?" msgid "Cannot change directory" msgstr "Nu pot deschide directorul %s" msgid "Filter" -msgstr "" +msgstr "Filtru" msgid "Set expression for filtering filenames" -msgstr "" +msgstr "Folosește expresia pentru filtrarea numelor de fișiere" msgid "&Files only" -msgstr "" +msgstr "Numai &fișiere" msgid "&Using shell patterns" -msgstr "&Utilizez \"shell patterns\"" +msgstr "&Folosire șabloane shell" msgid "&Case sensitive" -msgstr "" +msgstr "Sensibil la majus&cule" #, c-format msgid "Link %s to:" -msgstr "Leagă %s de:" +msgstr "Leagă %s la:" msgid "Link" -msgstr "" +msgstr "Legătură" #, c-format msgid "link: %s" -msgstr "" +msgstr "legătură: %s" #, c-format msgid "symlink: %s" -msgstr "" +msgstr "legătură: %s" #, c-format msgid "Cannot chdir to \"%s\"" -msgstr "" +msgstr "Nu se poate chdir în \"%s\"" msgid "View file" -msgstr "" +msgstr "Vizualizare fișier" msgid "Filename:" -msgstr "" +msgstr "Nume fișier:" msgid "Filtered view" -msgstr "" +msgstr "Afișare filtrată" msgid "Filter command and arguments:" -msgstr "" +msgstr "Comanda și argumentele pentru filtrare:" msgid "Edit file" -msgstr "" +msgstr "Editează fișier" msgid "Create a new Directory" -msgstr "Creează un nou Director" +msgstr "Creează un nou dosar" msgid "Enter directory name:" -msgstr "" +msgstr "Introdu numele dosarului:" msgid "Select" -msgstr "" +msgstr "Selectează" msgid "Unselect" -msgstr "" +msgstr "Deselectează" msgid "Extension file edit" -msgstr "Editează fişierul de extensii" +msgstr "Editează fișierul de extensii" msgid "Which extension file you want to edit?" -msgstr "" +msgstr "Ce fișier de extensii dorești să editezi?" msgid "&System Wide" -msgstr "Pentru tot &Sistemul" +msgstr "În tot &sistemul" msgid "Highlighting groups file edit" -msgstr "" +msgstr "Editare fișier pentru sintaxa de grup" msgid "Which highlighting file you want to edit?" -msgstr "" +msgstr "Ce fișier de sintaxă dorești să editezi?" msgid "Compare directories" -msgstr "" +msgstr "Compară dosarele" msgid "Select compare method:" -msgstr "" +msgstr "Alege metoda de comparare:" msgid "&Quick" -msgstr "&Rapidă" +msgstr "&Rapid" msgid "&Size only" msgstr "&Doar mărime" @@ -2083,86 +2127,96 @@ "Both panels should be in the listing mode\n" "to use this command" msgstr "" +"Pentru a utiliza această comandă ambele\n" +"trebuie să fie în modul listare" msgid "" "Not an xterm or Linux console;\n" "the panels cannot be toggled." msgstr "" +"Nu este o consolă xterm sau Linux;\n" +"panourile nu pot fi comutate." #, c-format msgid "Symlink '%s' points to:" -msgstr "" +msgstr "Legătura '%s' duce către:" msgid "Edit symlink" -msgstr "" +msgstr "Editare legătură" #, c-format msgid "edit symlink, unable to remove %s: %s" -msgstr "" +msgstr "editare legătură, nu se poate înlătura %s: %s" #, c-format msgid "edit symlink: %s" -msgstr "" +msgstr "editare legătură: %s" #, c-format msgid "'%s' is not a symbolic link" -msgstr "" +msgstr "'%s' nu este o legătură simbolică" msgid "FTP to machine" -msgstr "" +msgstr "FTP către mașina" msgid "SFTP to machine" -msgstr "" +msgstr "SFTP către mașina" msgid "Shell link to machine" -msgstr "" +msgstr "Legătură shell către mașina" msgid "SMB link to machine" -msgstr "" +msgstr "Legătură SMB către mașina" msgid "Undelete files on an ext2 file system" -msgstr "" +msgstr "Recuperare fișiere dintr-o partiție de tip ext2" msgid "" "Enter device (without /dev/) to undelete\n" "files on: (F1 for details)" msgstr "" +"Introdu dispozitivul (fără /dev/) în care se vor recupera\n" +"fișiere: (F1 pentru detalii)" msgid "Setup" -msgstr "" +msgstr "Configurație" #, c-format msgid "Setup saved to %s" -msgstr "" +msgstr "Configurația a fost salvată în %s" #, c-format msgid "Unable to save setup to %s" -msgstr "" +msgstr "Nu se poate salva configurația în %s" msgid "Cannot execute commands on non-local filesystems" -msgstr "" +msgstr "Nu se pot executa comenzi în sisteme de fișiere ne-locale" #, c-format msgid "" "Cannot chdir to \"%s\"\n" "%s" msgstr "" +"Nu se poate chdir în \"%s\"\n" +"%s" msgid "Cannot read directory contents" -msgstr "Nu pot citi conţinutul directorului" +msgstr "Nu pot citi conținutul dosarului" msgid "Parameter" -msgstr "" +msgstr "Parametru" #, c-format msgid "" "Cannot create temporary command file\n" "%s" msgstr "" +"Nu se poate crea fișierul temporar pentru linia de comandă\n" +"%s" #, c-format msgid " %s%s file error" -msgstr "" +msgstr " %s%s eroare fișier" #, c-format msgid "" @@ -2170,34 +2224,38 @@ "the installation failed. Please fetch a fresh copy from the Midnight " "Commander package." msgstr "" +"Formatul fișierului %smc.ext a fost schimbat în versiunea 3.0. Se pare că " +"instalarea a eșuat. Te rog să obții o copie din pachetul Midnight Commander." #, c-format msgid "%s file error" -msgstr "" +msgstr "%s eroare fișier" #, c-format msgid "" "The format of the %s file has changed with version 3.0. You may either want " "to copy it from %smc.ext or use that file as an example of how to write it." msgstr "" +"Formatul fișierului %s a fost schimbat în versiunea 3.0. Vei putea să îl " +"copiezi din %smc.ext sau poți folosi acel fișier ca exemplu." msgid "DialogTitle|Copy" -msgstr "" +msgstr "DialogTitle|Copiere" msgid "DialogTitle|Move" -msgstr "" +msgstr "DialogTitle|Mutare" msgid "DialogTitle|Delete" -msgstr "" +msgstr "DialogTitle|Ștergere" msgid "FileOperation|Copy" -msgstr "" +msgstr "FileOperation|Copiază" msgid "FileOperation|Move" -msgstr "" +msgstr "FileOperation|Mută" msgid "FileOperation|Delete" -msgstr "" +msgstr "FileOperation|Șterge" #, no-c-format msgid "%o %f \"%s\"%m" @@ -2208,19 +2266,19 @@ msgstr "%o %d %f%m" msgid "file" -msgstr "fişierul" +msgstr "fișierul" msgid "files" -msgstr "fişiere" +msgstr "fișiere" msgid "directory" -msgstr "director" +msgstr "dosar" msgid "directories" -msgstr "directoare" +msgstr "dosare" msgid "files/directories" -msgstr "fişiere/directoare" +msgstr "fișiere/dosare" #. TRANSLATORS: keep leading space here to split words in Copy/Move dialog msgid " with source mask:" @@ -2231,43 +2289,53 @@ #, c-format msgid "%s?" -msgstr "" +msgstr "%s?" msgid "Cannot make the hardlink" -msgstr "" +msgstr "Nu se poate crea o legătură dură" #, c-format msgid "" "Cannot read source link \"%s\"\n" "%s" msgstr "" +"Nu se poate citi legătura sursă \"%s\"\n" +"%s" msgid "" "Cannot make stable symlinks acrossnon-local filesystems:\n" "\n" "Option Stable Symlinks will be disabled" msgstr "" +"Nu se pot face legături simbolice stabile care traversează sisteme de " +"fișiere ne-locale:\n" +"\n" +"Opțiunea pentru legături simbolice stabile va fi dezactivată" #, c-format msgid "" "Cannot create target symlink \"%s\"\n" "%s" msgstr "" +"Nu se poate crea legătura destinație \"%s\"\n" +"%s" msgid "&Abort" -msgstr "&Întrerup" +msgstr "&Anulează" msgid "Ski&p all" -msgstr "" +msgstr "Sări t&ot" msgid "&Retry" -msgstr "&Reîncerc" +msgstr "&Reîncearcă" #, c-format msgid "" "Directory \"%s\" not empty.\n" "Delete it recursively?" msgstr "" +"Dosarul \"%s\" nu este gol.\n" +"Îl ștergi în mod recursiv?" #, c-format msgid "" @@ -2275,15 +2343,20 @@ "Directory \"%s\" not empty.\n" "Delete it recursively?" msgstr "" +"Sarcină în fundal:\n" +"Dosarul \"%s\" nu este gol.\n" +"Îl ștergi în mod recursiv?" msgid "Non&e" -msgstr "&Niciunul" +msgstr "&Nimic" #, c-format msgid "" "Cannot stat file \"%s\"\n" "%s" msgstr "" +"Nu se poate găsi fișierul \"%s\"\n" +"%s" #, c-format msgid "" @@ -2292,86 +2365,112 @@ "\"%s\"\n" "are the same file" msgstr "" +"\"%s\"\n" +"și\n" +"\"%s\"\n" +"sunt același fișier" #, c-format msgid "Cannot overwrite directory \"%s\"" -msgstr "" +msgstr "Nu se poate suprascrie dosarul \"%s\"" #, c-format msgid "" "Cannot move file \"%s\" to \"%s\"\n" "%s" msgstr "" +"Nu se poate muta fișierul \"%s\" în \"%s\"\n" +"%s" #, c-format msgid "" "Cannot remove file \"%s\"\n" "%s" msgstr "" +"Nu se poate șterge fișierul \"%s\"\n" +"%s" #, c-format msgid "" "Cannot delete file \"%s\"\n" "%s" msgstr "" +"Nu se poate șterge fișierul \"%s\"\n" +"%s" #, c-format msgid "" "Cannot remove directory \"%s\"\n" "%s" msgstr "" +"Nu se poate șterge dosarul \"%s\"\n" +"%s" #, c-format msgid "" "Cannot overwrite directory \"%s\"\n" "%s" msgstr "" +"Nu se poate suprascrie dosarul \"%s\"\n" +"%s" #, c-format msgid "" "Cannot stat source file \"%s\"\n" "%s" msgstr "" +"Nu se poate găsi fișierul sursă \"%s\"\n" +"%s" #, c-format msgid "" "Cannot create special file \"%s\"\n" "%s" msgstr "" +"Nu se poate crea fișierul special \"%s\"\n" +"%s" #, c-format msgid "" "Cannot chown target file \"%s\"\n" "%s" msgstr "" +"Nu se poate aplica chown pe fișierul destinație \"%s\"\n" +"%s" #, c-format msgid "" "Cannot chmod target file \"%s\"\n" "%s" msgstr "" +"Nu se poate aplica chmod pe fișierul destinație \"%s\"\n" +"%s" #, c-format msgid "" "Cannot open source file \"%s\"\n" "%s" msgstr "" +"Nu se poate deschide fișierul sursă \"%s\"\n" +"%s" msgid "Reget failed, about to overwrite file" -msgstr "" +msgstr "Re-descărcarea a eșuat, se va suprascrie fișierul" #, c-format msgid "" "Cannot fstat source file \"%s\"\n" "%s" msgstr "" +"Nu se poate găsi fișierul sursă \"%s\"\n" +"%s" #, c-format msgid "" "Cannot create target file \"%s\"\n" "%s" msgstr "" -"Nu se poate crea fișierul țintă \"%s\"\n" +"Nu se poate crea fișierul destinație \"%s\"\n" "%s" #, c-format @@ -2379,13 +2478,15 @@ "Cannot fstat target file \"%s\"\n" "%s" msgstr "" +"Nu se poate găsi fișierul destinație \"%s\"\n" +"%s" #, c-format msgid "" "Cannot preallocate space for target file \"%s\"\n" "%s" msgstr "" -"Nu se poate pre-aloca spațiu pentru fișierul țintă \"%s\"\n" +"Nu se poate pre-aloca spațiu pentru fișierul destinație \"%s\"\n" "%s" #, c-format @@ -2401,7 +2502,7 @@ "Cannot write target file \"%s\"\n" "%s" msgstr "" -"Nu se poate scrie fișierul țintă \"%s\"\n" +"Nu se poate scrie fișierul destinație \"%s\"\n" "%s" msgid "(stalled)" @@ -2420,11 +2521,11 @@ "Cannot close target file \"%s\"\n" "%s" msgstr "" -"Nu se poate închide fișierul țintă \"%s\"\n" +"Nu se poate închide fișierul destinație \"%s\"\n" "%s" msgid "Incomplete file was retrieved. Keep it?" -msgstr "Fişierul a fost transferat incomplet. Îl păstrez?" +msgstr "Fișierul a fost transferat incomplet. Îl păstrez?" msgid "&Keep" msgstr "&Păstrează" @@ -2434,7 +2535,7 @@ "Cannot stat source directory \"%s\"\n" "%s" msgstr "" -"Nu se poate găsi directorul sursă \"%s\"\n" +"Nu se poate găsi dosarul sursă \"%s\"\n" "%s" #, c-format @@ -2442,7 +2543,7 @@ "Source \"%s\" is not a directory\n" "%s" msgstr "" -"Sursa \"%s\" nu este un director\n" +"Sursa \"%s\" nu este un dosar\n" "%s" #, c-format @@ -2458,7 +2559,7 @@ "Destination \"%s\" must be a directory\n" "%s" msgstr "" -"Destinația \"%s\" trebuie să fie un director\n" +"Destinația \"%s\" trebuie să fie un dosar\n" "%s" #, c-format @@ -2466,7 +2567,7 @@ "Cannot create target directory \"%s\"\n" "%s" msgstr "" -"Nu se poate crea directorul țintă \"%s\"\n" +"Nu se poate crea dosarul destinație \"%s\"\n" "%s" #, c-format @@ -2474,7 +2575,7 @@ "Cannot chown target directory \"%s\"\n" "%s" msgstr "" -"Nu se poate aplica chown pe directorul țintă \"%s\"\n" +"Nu se poate aplica chown pe dosarul destinație \"%s\"\n" "%s" #, c-format @@ -2487,7 +2588,7 @@ "\"%s\"\n" "și\n" "\"%s\"\n" -"sunt în același director" +"sunt în același dosar" #, c-format msgid "" @@ -2502,11 +2603,11 @@ "Cannot move directory \"%s\" to \"%s\"\n" "%s" msgstr "" -"Nu se poate muta directorul \"%s\" în \"%s\"\n" +"Nu se poate muta dosarul \"%s\" în \"%s\"\n" "%s" msgid "Directory scanning" -msgstr "Scanarea directoarelor" +msgstr "Scanarea dosarelor" #, c-format msgid "" @@ -2514,10 +2615,10 @@ "Directories: %zd, total size: %s" msgstr "" "%s\n" -"Directoare: %zd, mărime totală: %s" +"Dosare: %zd, mărime totală: %s" msgid "Cannot operate on \"..\"!" -msgstr "Nu se poate opera asupra \"..\"!" +msgstr "Nu se poate acționa asupra \"..\"!" msgid "Sorry, I could not put the job in background" msgstr "Scuze, nu am putut pune sarcina în fundal" @@ -2534,54 +2635,54 @@ #, c-format msgid "ETA %s" -msgstr "" +msgstr "ETA %s" #, c-format msgid "%.2f MB/s" -msgstr "%.2f MB/" +msgstr "%.2f MO/s" #, c-format msgid "%.2f KB/s" -msgstr "%.2f KB/" +msgstr "%.2f KO/s" #, c-format msgid "%ld B/s" -msgstr "%ld B/" +msgstr "%ld O/s" msgid "Target file already exists!" -msgstr "Fișierul țintă deja există!" +msgstr "Fișierul destinație deja există!" #, c-format msgid "New : %s, size %s" -msgstr "" +msgstr "Nou : %s, mărime %s" #, c-format msgid "Existing: %s, size %s" -msgstr "" +msgstr "Existent: %s, mărime %s" msgid "Overwrite this target?" -msgstr "Suprascriu această ţintă?" +msgstr "Suprascrie destinația?" msgid "A&ppend" -msgstr "adau&G" +msgstr "Adau&gă" msgid "&Reget" msgstr "&Readuc" msgid "Overwrite all targets?" -msgstr "Suprascriu toate desinaţiile?" +msgstr "Suprascrie toate destinațiile?" msgid "&Update" -msgstr "cele &Vechi" +msgstr "Act&ualizează" msgid "If &size differs" -msgstr "dacă mă&Rimea diferă" +msgstr "Dacă mă&rimea diferă" msgid "File exists" msgstr "Fișierul există" msgid "Background process: File exists" -msgstr "Proces în fundal: Fișierul există" +msgstr "Sarcină în fundal: Fișierul există" #, c-format msgid "Files processed: %zu/%zu" @@ -2619,7 +2720,7 @@ msgstr "Sursă" msgid "Target" -msgstr "Ţintă" +msgstr "Destinație" msgid "Follow &links" msgstr "Urmărește &legăturile" @@ -2628,23 +2729,23 @@ msgstr "Păstrează &atributele" msgid "Di&ve into subdir if exists" -msgstr "Să&ri in subdir dacă există" +msgstr "In&tră în dosar dacă există" msgid "&Stable symlinks" msgstr "Legături simbolice &stabile" msgid "&Background" -msgstr "&Fundal" +msgstr "În &Fundal" #, c-format msgid "Invalid source pattern '%s'" -msgstr "Model sursă nevalid '%s'" +msgstr "Șablon sursă nevalid '%s'" msgid "&Chdir" msgstr "&Chdir" msgid "&Again" -msgstr "&Din nou" +msgstr "Din &nou" msgid "Pane&lize" msgstr "Pane&lizare" @@ -2666,7 +2767,7 @@ msgstr "Nume de fișier:" msgid "&Find recursively" -msgstr "%Caută recursiv" +msgstr "&Caută recursiv" msgid "S&kip hidden" msgstr "Sări &peste ascunse" @@ -2678,25 +2779,25 @@ msgstr "&Caută în conținut" msgid "Case sens&itive" -msgstr "Sensibil la majuscule" +msgstr "Sens&ibil la majuscule" msgid "A&ll charsets" msgstr "Toate seturi&le de caractere" msgid "Fir&st hit" -msgstr "" +msgstr "Primul gă&sit" msgid "&Tree" -msgstr "&Arbore" +msgstr "Arbore" msgid "Find File" -msgstr "Caut fişier" +msgstr "Caută fișier" msgid "Start at:" msgstr "Încep la:" msgid "Ena&ble ignore directories:" -msgstr "&Activează directoarele ignorate:" +msgstr "Activează dosarele ignora&te:" #, c-format msgid "Grepping in %s" @@ -2708,9 +2809,9 @@ #, c-format msgid "Finished (ignored %zd directory)" msgid_plural "Finished (ignored %zd directories)" -msgstr[0] "Finalizat (a fost ignorat %zd director)" -msgstr[1] "Finalizat (au fost ignorate %zd directoare)" -msgstr[2] "Finalizat (au fost ignorate %zd directoare)" +msgstr[0] "Finalizat (a fost ignorat %zd dosar)" +msgstr[1] "Finalizat (au fost ignorate %zd dosare)" +msgstr[2] "Finalizat (au fost ignorate %zd de dosare)" #, c-format msgid "Searching %s" @@ -2723,7 +2824,7 @@ msgstr "Schimbă &la" msgid "&Free VFSs now" -msgstr "" +msgstr "&Eliberează VFS acum" msgid "&Refresh" msgstr "&Reîncarcă" @@ -2744,29 +2845,29 @@ msgstr "&Inserează" msgid "&Remove" -msgstr "Ş&Terge" +msgstr "Ș&terge" msgid "Subgroup - press ENTER to see list" -msgstr "Subgrup - apăsaţi ENTER ca să vedeţi lista" +msgstr "Subgrup - apăsați ENTER ca să vedeți lista" msgid "Active VFS directories" -msgstr "Directoare VFS active" +msgstr "Dosare VFS active" msgid "Directory hotlist" -msgstr "Lista rapidă de directoare" +msgstr "Lista rapidă de dosare" msgid "Top level group" msgstr "Grupul cel mai de sus" msgid "Directory path" -msgstr "Calea directorului" +msgstr "Calea dosarului" #, c-format msgid "Moving %s" msgstr "Mut %s" msgid "Directory label" -msgstr "Eticheta directorului" +msgstr "Eticheta dosarului" msgid "&Append" msgstr "&Adaugă" @@ -2775,10 +2876,10 @@ msgstr "Intrare nouă în lista rapidă" msgid "Directory label:" -msgstr "Eticheta directorului:" +msgstr "Eticheta dosarului:" msgid "Directory path:" -msgstr "Calea directorului:" +msgstr "Calea dosarului:" msgid "New hotlist group" msgstr "Grup nou pentru lista rapidă" @@ -2818,20 +2919,20 @@ #, c-format msgid "Midnight Commander %s" -msgstr "Comandant la miezul nopţii %s ;)" +msgstr "Midnight Commander %s" #, c-format msgid "File: %s" -msgstr "Fişier: %s" +msgstr "Fișier: %s" msgid "No node information" -msgstr "Nu există informaţii despre noduri" +msgstr "Nu există informații despre noduri" msgid "Free nodes:" msgstr "Noduri libere:" msgid "No space information" -msgstr "Nu există date despre spaţiul gol" +msgstr "Nu există date despre spațiul folosit" #, c-format msgid "Free space: %s/%s (%d%%)" @@ -2846,11 +2947,11 @@ #, c-format msgid "Device: %s" -msgstr "Dispozit.: %s" +msgstr "Dispozitiv: %s" #, c-format msgid "Filesystem: %s" -msgstr "Partiţie: %s" +msgstr "Sistem fișiere: %s" #, c-format msgid "Accessed: %s" @@ -2867,7 +2968,7 @@ #, c-format msgid "Dev. type: major %lu, minor %lu" -msgstr "" +msgstr "Dev. tip: major %lu, minor %lu" #, c-format msgid "Size: %s" @@ -2878,7 +2979,7 @@ msgid_plural " (%ld blocks)" msgstr[0] " (%ld bloc)" msgstr[1] " (%ld blocuri)" -msgstr[2] " (%ld blocuri)" +msgstr[2] " (%ld de blocuri)" #, c-format msgid "Owner: %s/%s" @@ -2894,19 +2995,19 @@ #, c-format msgid "Location: %Xh:%Xh" -msgstr "Locaţie: %Xh:%Xh" +msgstr "Locație: %Xh:%Xh" msgid "&Equal split" -msgstr "împărţire &Egală" +msgstr "Împărțire &egală" msgid "&Menubar visible" msgstr "Bara de &meniu vizibilă" msgid "Command &prompt" -msgstr "" +msgstr "&Prompt de comandă" msgid "&Keybar visible" -msgstr "bară taste &Vizibilă" +msgstr "Bară taste &vizibilă" msgid "H&intbar visible" msgstr "Bara de &indicii vizibilă" @@ -2921,16 +3022,16 @@ msgstr "Împărțirea panourilor" msgid "Console output" -msgstr "" +msgstr "Ieșire consolă" msgid "&Vertical" msgstr "&Verticală" msgid "&Horizontal" -msgstr "ori&Zontală" +msgstr "Ori&zontală" msgid "Output lines:" -msgstr "" +msgstr "Linii de ieșire:" msgid "Layout" msgstr "Aspect" @@ -2939,13 +3040,13 @@ msgstr "&Lista de fișiere" msgid "&Quick view" -msgstr "&Vizualizare rapidă" +msgstr "Vizualizare &rapidă" msgid "&Info" msgstr "&Info" msgid "&Listing mode..." -msgstr "mod de &Listare..." +msgstr "Mod de &afișare..." msgid "&Sort order..." msgstr "&Ordinea sortării..." @@ -2957,16 +3058,16 @@ msgstr "Codificar&e" msgid "FT&P link..." -msgstr "legătură FT&P..." +msgstr "Conectare FT&P..." msgid "S&hell link..." -msgstr "conexiune s&hell..." +msgstr "Conectare s&hell..." msgid "S&FTP link..." -msgstr "Legătură S&FTP..." +msgstr "Conectare S&FTP..." msgid "SM&B link..." -msgstr "legătură SM&B..." +msgstr "Conectare SM&B..." msgid "Paneli&ze" msgstr "Paneli&zare" @@ -2978,7 +3079,7 @@ msgstr "&Vizualizează" msgid "Vie&w file..." -msgstr "&Vizualizează fișier" +msgstr "Vi&zualizează fișier" msgid "&Filtered view" msgstr "Vizualizare &filtrată" @@ -2993,7 +3094,7 @@ msgstr "&Legătură" msgid "&Symlink" -msgstr "Legatură &simbolică" +msgstr "Legătură &simbolică" msgid "Relative symlin&k" msgstr "Legătură simbolică relati&vă" @@ -3014,7 +3115,7 @@ msgstr "&Mkdir" msgid "&Quick cd" -msgstr "cd &rapid" +msgstr "Cd &rapid" msgid "Select &group" msgstr "Selectează &grupul" @@ -3032,7 +3133,7 @@ msgstr "Meniu &utilizator" msgid "&Directory tree" -msgstr "arbore de &Directoare" +msgstr "Arbore de &dosare" msgid "&Find file" msgstr "&Caută fișier" @@ -3044,7 +3145,7 @@ msgstr "Comută &panourile da/nu" msgid "&Compare directories" -msgstr "&Compară directoare" +msgstr "&Compară dosare" msgid "C&ompare files" msgstr "C&ompară fișiere" @@ -3053,37 +3154,37 @@ msgstr "Panelizare e&xternă" msgid "Show directory s&izes" -msgstr "Arată mărimea directoarelor" +msgstr "Arată mărimea dosarelor" msgid "Command &history" msgstr "&Istoric comenzi" msgid "Di&rectory hotlist" -msgstr "Listă rapidă de di&rectoare" +msgstr "Listă rapidă de dosa&re" msgid "&Active VFS list" msgstr "Lista SVF &active" msgid "&Background jobs" -msgstr "" +msgstr "Sarcini în &fundal" msgid "Screen lis&t" msgstr "Lis&ta ecranelor" msgid "&Undelete files (ext2fs only)" -msgstr "rec&Uperare fişiere (doar ext2fs)" +msgstr "Rec&uperare fișiere (doar ext2fs)" msgid "&Listing format edit" -msgstr "Mod de listare" +msgstr "Editare mod de &listare" msgid "Edit &extension file" -msgstr "editare fişier &Extensii" +msgstr "Editare fișier &extensii" msgid "Edit &menu file" -msgstr "editare fişier &Meniuri" +msgstr "Editare fișier &meniuri" msgid "Edit hi&ghlighting group file" -msgstr "Editează fișierul de evidenţiere &grup" +msgstr "Editează fișierul de evidențiere &grup" msgid "&Configuration..." msgstr "&Configurare..." @@ -3092,16 +3193,16 @@ msgstr "&Aspect..." msgid "&Panel options..." -msgstr "Opțiuni &Panou..." +msgstr "Opțiuni &panou..." msgid "C&onfirmation..." msgstr "C&onfirmare..." msgid "&Display bits..." -msgstr "&Biţi de afişare..." +msgstr "&Biți de afișare..." msgid "&Virtual FS..." -msgstr "Sistem &Virtual de Fişiere..." +msgstr "Sistem &virtual de fișiere..." msgid "Panels:" msgstr "Panouri:" @@ -3111,7 +3212,7 @@ msgid_plural "You have %zd opened screens. Quit anyway?" msgstr[0] "Ai %zd ecran deschis. Închizi oricum?" msgstr[1] "Ai %zd ecrane deschise. Închizi oricum?" -msgstr[2] "Ai %zd ecrane deschise. Închizi oricum?" +msgstr[2] "Ai %zd de ecrane deschise. Închizi oricum?" msgid "The Midnight Commander" msgstr "Midnight Commander" @@ -3120,28 +3221,28 @@ msgstr "Chiar dorești sa închizi Midnight Commander?" msgid "&Above" -msgstr "" +msgstr "&Deasupra" msgid "&Left" -msgstr "" +msgstr "&Stânga" msgid "&Below" -msgstr "" +msgstr "&Dedesubt" msgid "&Right" msgstr "D&reapta" msgid "ButtonBar|Menu" -msgstr "" +msgstr "ButtonBar|Meniu" msgid "ButtonBar|View" -msgstr "" +msgstr "ButtonBar|Vezi" msgid "ButtonBar|RenMov" -msgstr "" +msgstr "ButtonBar|RedMut" msgid "ButtonBar|Mkdir" -msgstr "" +msgstr "ButtonBar|Mkdir" msgid "Memory exhausted!" msgstr "Memorie epuizată!" @@ -3149,15 +3250,15 @@ #. TRANSLATORS: one single character to represent 'unsorted' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix msgid "sort|u" -msgstr "" +msgstr "sort|u" msgid "&Unsorted" -msgstr "ne-Sor&tat" +msgstr "nesor&tat" #. TRANSLATORS: one single character to represent 'name' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix msgid "sort|n" -msgstr "" +msgstr "sort|n" msgid "&Name" msgstr "&Nume" @@ -3165,7 +3266,7 @@ #. TRANSLATORS: one single character to represent 'version' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix msgid "sort|v" -msgstr "" +msgstr "sort|v" msgid "&Version" msgstr "&Versiune" @@ -3173,7 +3274,7 @@ #. TRANSLATORS: one single character to represent 'extension' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix msgid "sort|e" -msgstr "" +msgstr "sort|e" msgid "E&xtension" msgstr "E&xtensie" @@ -3181,37 +3282,37 @@ #. TRANSLATORS: one single character to represent 'size' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix msgid "sort|s" -msgstr "" +msgstr "sort|s" msgid "&Size" msgstr "&Mărime" msgid "Block Size" -msgstr "Mărimea Blocului" +msgstr "Mărimea blocului" #. TRANSLATORS: one single character to represent 'Modify time' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix msgid "sort|m" -msgstr "" +msgstr "sort|m" msgid "&Modify time" -msgstr "data modi&Ficării" +msgstr "Data &modificării" #. TRANSLATORS: one single character to represent 'Access time' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix msgid "sort|a" -msgstr "" +msgstr "sort|a" msgid "&Access time" -msgstr "data &Accesului" +msgstr "Data &accesului" #. TRANSLATORS: one single character to represent 'Change time' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix msgid "sort|h" -msgstr "" +msgstr "sort|h" msgid "C&hange time" -msgstr "Sc&himbă timpul" +msgstr "Data sc&himbării" msgid "Perm" msgstr "Mod" @@ -3222,7 +3323,7 @@ #. TRANSLATORS: one single character to represent 'inode' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix msgid "sort|i" -msgstr "" +msgstr "sort|i" msgid "&Inode" msgstr "&Inod" @@ -3252,7 +3353,7 @@ msgstr "SUB-DIR" msgid "" -msgstr "" +msgstr "" #, c-format msgid "%s byte" @@ -3266,28 +3367,29 @@ msgid_plural "%s in %d files" msgstr[0] "%s în %d fișier" msgstr[1] "%s în %d fișiere" -msgstr[2] "%s în %d fișiere" +msgstr[2] "%s în %d de fișiere" msgid "Panelize" msgstr "Panelizare" msgid "Unknown tag on display format:" -msgstr "" +msgstr "Etichetă necunoscută în formatul de afișare:" msgid "Do you really want to execute?" msgstr "Chiar dorești să execuți?" msgid "User supplied format looks invalid, reverting to default." -msgstr "Formatul furnizat de utilizator pare invalid, revin la cel implicit" +msgstr "" +"Formatul furnizat de utilizator pare invalid, se revine la cel implicit" msgid "&Add new" msgstr "&Adaugă nou" msgid "External panelize" -msgstr "Panelare externă" +msgstr "Panelizare externă" msgid "Other command" -msgstr "Alte comenzi" +msgstr "Altă comendă" msgid "Command" msgstr "Comandă" @@ -3296,44 +3398,44 @@ msgstr "Adaugă la panelizarea externă" msgid "Enter command label:" -msgstr "Introduceți eticheta comenzii:" +msgstr "Introdu eticheta comenzii:" msgid "Cannot invoke command." -msgstr "Nu pot invoca comanda." +msgstr "Nu se poate rula comanda." msgid "Pipe close failed" -msgstr "Închiderea filtrului a eşuat" +msgstr "Închiderea pipe a eșuat" msgid "Cannot run external panelize in a non-local directory" -msgstr "Nu se poate rula panelizarea externă într-un director ne-local" +msgstr "Nu se poate rula panelizarea externă într-un dosar care nu este local" msgid "Modified git files" msgstr "Fișiere git modificate" msgid "Find rejects after patching" -msgstr "Caută reject-uri după patch-uire" +msgstr "Caută reject-uri după patchuire" msgid "Find *.orig after patching" -msgstr "Caută fişierele *.orig după patching" +msgstr "Caută fișierele *.orig după patchuire" msgid "Find SUID and SGID programs" -msgstr "Caută programe SUID şi SGID" +msgstr "Caută programe SUID și SGID" #, c-format msgid "" "Cannot open the %s file for writing:\n" "%s\n" msgstr "" -"Nu pot deschide fişierul %s pentru scriere:\n" +"Nu pot deschide fișierul %s pentru scriere:\n" "%s\n" #, c-format msgid "Copy \"%s\" directory to:" -msgstr "Copiază directorul \"%s\" în:" +msgstr "Copiază dosarul \"%s\" în:" #, c-format msgid "Move \"%s\" directory to:" -msgstr "Mută directorul \"%s\" în:" +msgstr "Mută dosarul \"%s\" în:" #, c-format msgid "" @@ -3360,18 +3462,18 @@ msgstr "ButtonBar|Uită" msgid "ButtonBar|Rmdir" -msgstr "" +msgstr "ButtonBar|Rmdir" #, c-format msgid "" "Cannot write to the %s file:\n" "%s\n" msgstr "" -"Nu se poate scrie în fişierul %s:\n" +"Nu se poate scrie în fișierul %s:\n" "%s\n" msgid "Debug" -msgstr "" +msgstr "Debug" msgid "ERROR:" msgstr "EROARE:" @@ -3383,22 +3485,22 @@ msgstr "Fals:" msgid "Error calling program" -msgstr "Eroare la pornirea programului" +msgstr "Eroare la executarea programului" msgid "Warning -- ignoring file" -msgstr "Atenţie -- se ignoră fișierul" +msgstr "Atenție -- se ignoră fișierul" #, c-format msgid "" "File %s is not owned by root or you or is world writable.\n" "Using it may compromise your security" msgstr "" -"Fişierul %s nu este deţinut de root ori dvs. sau poate fi modificat de " +"Fișierul %s nu este deținut de root ori dvs. sau poate fi modificat de " "oricine.\n" -"Utilizându-l vă puteţi compromite securitatea" +"Utilizându-l vă puteți compromite securitatea" msgid "Format error on file Extensions File" -msgstr "Format eronat în Fișierul de Extensii" +msgstr "Format eronat în fișierul de extensii" #, c-format msgid "The %%var macro has no default" @@ -3427,7 +3529,7 @@ msgstr "Format eronat al fișierului de ajutor\n" msgid "Internal bug: Double start of link area" -msgstr "" +msgstr "Bug intern: Double start of link area" #, c-format msgid "Cannot find node %s in help file" @@ -3440,13 +3542,13 @@ msgstr "ButtonBar|Index" msgid "ButtonBar|Prev" -msgstr "ButtonBar|Înapoi" +msgstr "ButtonBar|Prec" msgid "Learn keys" -msgstr "Învaţă tastele" +msgstr "Învață tastele" msgid "Teach me a key" -msgstr "Învață-ma o tastă" +msgstr "Învață-mă o tastă" #, c-format msgid "" @@ -3459,14 +3561,14 @@ "If you want to escape, press a single Escape key\n" "and wait as well." msgstr "" -"Vă rog să apăsaţi %s\n" -"iar apoi să aşteptaţi până când mesajul dispare.\n" +"Te rog apasă %s\n" +"iar apoi așteaptă până când acest mesaj dispare.\n" "\n" -"Apoi, apăsaţi-o din nou pentru a vedea dacă apare OK\n" +"Apoi, apas-o din nou pentru a vedea dacă apare OK\n" "lângă butonul său.\n" "\n" -"Dacă doriţi să ieşiţi, apăsaţi o singură dată tasta Escape\n" -"şi aşteptaţi." +"Dacă dorești să ieși, apasă o singură dată tasta Escape\n" +"și așteaptă." msgid "Cannot accept this key" msgstr "Această tastă nu poate fi acceptată" @@ -3484,7 +3586,7 @@ "work fine. That's great." msgstr "" "Se pare că toate tastele dvs. deja\n" -"funcţionează corect. Asta e excelent." +"funcționează corect. Excelent." msgid "&Discard" msgstr "&Anulează" @@ -3493,18 +3595,17 @@ "Great! You have a complete terminal database!\n" "All your keys work well." msgstr "" -"Excelent! Aveţi o bază de date terminal completă!\n" -"Toate tastele dvs. funcţionează corect." +"Excelent! Aveți o bază de date terminal completă!\n" +"Toate tastele dvs. funcționează corect." msgid "" "Press all the keys mentioned here. After you have done it, check\n" "which keys are not marked with OK. Press space on the missing\n" "key, or click with the mouse to define it. Move around with Tab." msgstr "" -"Apasă toate tastele menționate aici. După ce ai terminat, verifică\n" +"Apasă toate tastele menționate aici. După ce ai terminat verifică\n" "care taste nu sunt marcate cu OK. Apasă tasta spațiu pentru cheile\n" -"lipsă, sau apasă cu maus-ul pentru a le defini. Te poți mișca folosind tasta " -"Tab." +"lipsă sau apasă cu mausul pentru a le defini. Te poți mișca cu Tab." #, c-format msgid "" @@ -3515,7 +3616,7 @@ "%s\n" msgid "Home directory path is not absolute" -msgstr "Calea către directorul acasă nu este absolută" +msgstr "Calea către dosarul acasă nu este absolută" #, c-format msgid "" @@ -3523,6 +3624,9 @@ "Failed while close:\n" "%s\n" msgstr "" +"\n" +"A eșuat în timpul închiderii:\n" +"%s\n" msgid "Choose codepage" msgstr "Alege pagina de cod" @@ -3541,47 +3645,52 @@ "Cannot save file %s:\n" "%s" msgstr "" +"Nu se poate salva fișierul %s:\n" +"%s" msgid "" "GNU Midnight Commander is already\n" "running on this terminal.\n" "Subshell support will be disabled." msgstr "" +"GNU Midnight Commander rulează\n" +"deja în acest terminal.\n" +"Suportul pentru subshell va fi dezactivat." #, c-format msgid "Cannot open named pipe %s\n" -msgstr "Nu pot deschide filtrul numit %s\n" +msgstr "Nu se poate deschide pipe %s\n" msgid "The shell is still active. Quit anyway?" -msgstr "" +msgstr "Terminalul este încă activ. Ieși oricum?" #, c-format msgid "Warning: Cannot change to %s.\n" -msgstr "Atenţie: Nu pot schimba în %s.\n" +msgstr "Atenție: Nu se poate schimba în %s.\n" msgid "Using the S-Lang library with terminfo database\n" -msgstr "" +msgstr "Folosind librăria S-Lang cu baza de date terminfo\n" msgid "Using the ncurses library\n" -msgstr "" +msgstr "Folosind librăria ncurses\n" msgid "Using the ncursesw library\n" -msgstr "" +msgstr "Folosind librăria ncursesw\n" msgid "With builtin Editor\n" -msgstr "Cu Editor integrat\n" +msgstr "Cu editor integrat\n" msgid "With optional subshell support\n" -msgstr "" +msgstr "Cu suport pentru subshell opțional\n" msgid "With subshell support as default\n" -msgstr "" +msgstr "Cu suport pentru subshell implicit\n" msgid "With support for background operations\n" -msgstr "Cu suport pentru operaţii în fundal\n" +msgstr "Cu suport pentru sarcini în fundal\n" msgid "With mouse support on xterm and Linux console\n" -msgstr "Cu suport de mouse în xterm şi consola Linux\n" +msgstr "Cu suport de mouse în xterm și consola Linux\n" msgid "With mouse support on xterm\n" msgstr "Cu suport de mouse în xterm.\n" @@ -3590,46 +3699,46 @@ msgstr "Cu suport pentru evenimente X11\n" msgid "With internationalization support\n" -msgstr "Cu suport de internaţionalizare\n" +msgstr "Cu suport de internaționalizare\n" msgid "With multiple codepages support\n" msgstr "Cu suport pentru coduri de pagină multiple\n" #, c-format msgid "Built with GLib %d.%d.%d\n" -msgstr "" +msgstr "Construit cu GLib %d.%d.%d\n" #, c-format msgid "Virtual File Systems:" -msgstr "" +msgstr "Sistem virtual de fișiere:" #, c-format msgid "Data types:" -msgstr "" +msgstr "Tipuri de date:" msgid "Root directory:" -msgstr "" +msgstr "Dosar rădăcină:" msgid "System data" -msgstr "" +msgstr "Date sistem" msgid "Config directory:" -msgstr "" +msgstr "Dosarul pentru configurări:" msgid "Data directory:" -msgstr "" +msgstr "Dosarul pentru date:" msgid "File extension handlers:" -msgstr "" +msgstr "Programe pentru extensii de fișier:" msgid "VFS plugins and scripts:" -msgstr "" +msgstr "Pluginuri si scripturi VFS:" msgid "User data" -msgstr "" +msgstr "Date utilizator" msgid "Cache directory:" -msgstr "" +msgstr "Dosarul pentru cache:" #, c-format msgid "" @@ -3644,7 +3753,7 @@ "Premature end of cpio archive\n" "%s" msgstr "" -"Sfârşit prematur al arhivei cpio\n" +"Sfârșit prematur al arhivei cpio\n" "%s" #, c-format @@ -3660,7 +3769,7 @@ #, c-format msgid "%s contains duplicate entries! Skipping!" -msgstr "%s conţine intrări duplicate! Trec peste!" +msgstr "%s conține intrări duplicate! Trec peste!" #, c-format msgid "" @@ -3675,7 +3784,7 @@ "Unexpected end of file\n" "%s" msgstr "" -"Sfârşit de fişier (EOF) neaşteptat\n" +"Sfârșit de fișier (EOF) neașteptat\n" "%s" #, c-format @@ -3691,14 +3800,14 @@ #, c-format msgid "Warning: cannot open %s directory\n" -msgstr "" +msgstr "Atenție: nu se poate deschide dosarul %s\n" #, c-format msgid "fish: Disconnecting from %s" msgstr "fish: Se deconectează de la %s" msgid "fish: Waiting for initial line..." -msgstr "fish: Se aşteptă linia iniţială..." +msgstr "fish: Se așteptă linia inițială..." msgid "Sorry, we cannot do password authenticated connections for now." msgstr "" @@ -3707,23 +3816,23 @@ #, c-format msgid "fish: Password is required for %s" -msgstr "" +msgstr "fish: Este necesară o parolă pentru %s" msgid "fish: Sending password..." msgstr "fish: Se trimite parola..." msgid "fish: Sending initial line..." -msgstr "fish: Se trimite linia iniţială..." +msgstr "fish: Se trimite linia inițială..." msgid "fish: Handshaking version..." msgstr "fish: Se negociază versiunea..." msgid "fish: Getting host info..." -msgstr "" +msgstr "fish: Se obțin informații despre gazdă..." #, c-format msgid "fish: Reading directory %s..." -msgstr "fish: Citesc directorul %s..." +msgstr "fish: Citesc dosarul %s..." #, c-format msgid "%s: done." @@ -3731,17 +3840,17 @@ #, c-format msgid "%s: failure" -msgstr "%s: eşec" +msgstr "%s: eșec" #, c-format msgid "fish: store %s: sending command..." msgstr "fish: stochează %s: trimit comanda..." msgid "fish: Local read failed, sending zeros" -msgstr "fish: Citirea locală a eşuat, trimit zero-uri" +msgstr "fish: Citirea locală a eșuat, trimit zero-uri" msgid "fish: storing file" -msgstr "" +msgstr "fish: se stochează fișierul" msgid "Aborting transfer..." msgstr "Abandonez transferul..." @@ -3750,7 +3859,7 @@ msgstr "S-a raportat o eroare după abandon." msgid "Aborted transfer would be successful." -msgstr "Transferul abandonat va reuşi." +msgstr "Transferul abandonat va reuși." #, c-format msgid "ftpfs: Disconnecting from %s" @@ -3758,7 +3867,7 @@ #, c-format msgid "FTP: Password required for %s" -msgstr "" +msgstr "FTP: Este necesară o parolă pentru %s" msgid "ftpfs: sending login name" msgstr "ftpfs: se trimite numele de logare" @@ -3768,13 +3877,13 @@ #, c-format msgid "FTP: Account required for user %s" -msgstr "" +msgstr "FTP: Este necesar un cont pentru utilizatorul %s" msgid "Account:" -msgstr "" +msgstr "Cont:" msgid "ftpfs: sending user account" -msgstr "" +msgstr "ftpfs: se trimite contul de utilizator" msgid "ftpfs: logged in" msgstr "ftpfs: conectat" @@ -3788,7 +3897,7 @@ #, c-format msgid "ftpfs: %s" -msgstr "" +msgstr "ftpfs: %s" #, c-format msgid "ftpfs: making connection to %s" @@ -3799,18 +3908,18 @@ #, c-format msgid "ftpfs: connection to server failed: %s" -msgstr "ftpfs: conectarea la server a eşuat: %s" +msgstr "ftpfs: conectarea la server a eșuat: %s" #, c-format msgid "Waiting to retry... %d (Control-G to cancel)" -msgstr "" +msgstr "Se reîncearcă... %d (Control-G pentru a renunța)" msgid "ftpfs: invalid address family" -msgstr "" +msgstr "ftpfs: familie de adrese incorectă" #, c-format msgid "ftpfs: could not create socket: %s" -msgstr "" +msgstr "ftpfs: nu se poate crea socketul: %s" msgid "ftpfs: could not setup passive mode" msgstr "ftpfs: nu pot seta modul pasiv" @@ -3823,10 +3932,10 @@ msgstr "ftpfs: eroare la abandon: %s" msgid "ftpfs: abort failed" -msgstr "ftpfs: abandon eşuat" +msgstr "ftpfs: abandon eșuat" msgid "ftpfs: CWD failed." -msgstr "ftpfs: CWD eşuat." +msgstr "ftpfs: CWD eșuat." msgid "ftpfs: couldn't resolve symlink" msgstr "ftpfs: nu pot rezolva legătura simbolică" @@ -3836,7 +3945,7 @@ #, c-format msgid "ftpfs: Reading FTP directory %s... %s%s" -msgstr "ftpfs: Citesc directorul FTP %s... %s%s" +msgstr "ftpfs: Citesc dosarul FTP %s... %s%s" msgid "(strict rfc959)" msgstr "(rfc959 strict)" @@ -3845,26 +3954,28 @@ msgstr "(întâi chdir)" msgid "ftpfs: failed; nowhere to fallback to" -msgstr "ftpfs: eşec; nu mai există nici o variantă la care să revin" +msgstr "ftpfs: eșec; nu mai există nici o variantă la care să revin" msgid "ftpfs: storing file" -msgstr "" +msgstr "ftpfs: se stochează fișierul" msgid "" "~/.netrc file has incorrect mode\n" "Remove password or correct mode" msgstr "" +"fișierul ~/.netrc are permisiuni incorecte\n" +"Înlătură parola sau corectează permisiunile" #, c-format msgid "%s: Warning: file %s not found\n" -msgstr "" +msgstr "%s: Atenție: fișierul %s nu a fost găsit\n" #, c-format msgid "" "Warning: Invalid line in %s:\n" "%s\n" msgstr "" -"Atenţie: Linie invalidă în %s:\n" +"Atenție: Linie invalidă în %s:\n" "%s\n" #, c-format @@ -3872,91 +3983,91 @@ "Warning: Invalid flag %c in %s:\n" "%s\n" msgstr "" -"Atenţie: Indicator %c invalid în %s:\n" +"Atenție: Indicator %c invalid în %s:\n" "%s\n" #, c-format msgid "sftp: an error occurred while reading %s: %s" -msgstr "" +msgstr "sftp: a intervenit o eroare la citirea %s: %s" msgid "sftp: Unable to get current user name." -msgstr "" +msgstr "sftp: Nu se poate obține numele de utlizator curent." msgid "sftp: Invalid host name." -msgstr "" +msgstr "sftp: Nume de gazdă incorect." msgid "sftp: Invalid port value." -msgstr "" +msgstr "sftp: Port nevalid." #, c-format msgid "sftp: %s" -msgstr "" +msgstr "sftp: %s" #, c-format msgid "sftp: making connection to %s" -msgstr "" +msgstr "sftp: se efectuează conectarea la %s" msgid "sftp: connection interrupted by user" -msgstr "" +msgstr "sftp: conectare întreruptă de utilizator" #, c-format msgid "sftp: connection to server failed: %s" -msgstr "" +msgstr "sftp: conectarea la server a eșuat: %s" #, c-format msgid "sftp: Enter passphrase for %s " -msgstr "" +msgstr "sftp: Introdu parola pentru %s " msgid "sftp: Passphrase is empty." -msgstr "" +msgstr "sftp: Parola este goală." #, c-format msgid "sftp: Enter password for %s " -msgstr "" +msgstr "sftp: Introdu parola pentru %s " msgid "sftp: Password is empty." -msgstr "" +msgstr "sftp: Parola este goală." #, c-format msgid "sftp: Failure establishing SSH session: (%d)" -msgstr "" +msgstr "sftp: Eroare la stabilirea unei sesiuni SSH: (%d)" msgid "sftp: No file handler data present for reading file" -msgstr "" +msgstr "sftp: Nu există date de manipulare a citirii fișierului" #, c-format msgid "sftp: (Ctrl-G break) Listing... %s" -msgstr "" +msgstr "sftp: (Ctrl-G întrerupe) Afișare... %s" msgid "sftp: Listing done." -msgstr "" +msgstr "sftp: Afișarea a fost efectuată." #, c-format msgid "reconnect to %s failed" -msgstr "" +msgstr "reconectarea la %s a eșuat" msgid "Authentication failed" -msgstr "" +msgstr "Autentificarea a eșuat" #, c-format msgid "Error %s creating directory %s" -msgstr "" +msgstr "Eroare %s la crearea dosarului %s" #, c-format msgid "Error %s removing directory %s" -msgstr "" +msgstr "Eroare %s la ștergerea dosarului %s" #, c-format msgid "%s opening remote file %s" -msgstr "" +msgstr "%s se deschide fișierul de la distanță %s" #, c-format msgid "%s removing remote file %s" -msgstr "" +msgstr "%s se șterge fișierul de la distanță %s" #, c-format msgid "%s renaming files\n" -msgstr "" +msgstr "%s se redenumesc fișierele\n" #, c-format msgid "" @@ -3970,49 +4081,51 @@ msgstr "Arhivă tar trunchiată" msgid "Unexpected EOF on archive file" -msgstr "Sfârşit de fişier (EOF) neaşteptat în fişierul arhivă" +msgstr "Sfârșit de fișier (EOF) neașteptat în fișierul arhivă" #, c-format msgid "" "%s\n" "doesn't look like a tar archive." msgstr "" +"%s\n" +"nu pare a fi o arhivă tar." msgid "undelfs: error" -msgstr "" +msgstr "undelfs: eroare" msgid "not enough memory" -msgstr "" +msgstr "nu există destulă memorie" msgid "while allocating block buffer" -msgstr "" +msgstr "în timp ce se aloca tamponul de blocuri" #, c-format msgid "open_inode_scan: %d" -msgstr "" +msgstr "open_inode_scan: %d" #, c-format msgid "while starting inode scan %d" -msgstr "" +msgstr "în timpul pornirii scanării de inoduri %d" #, c-format msgid "undelfs: loading deleted files information %d inodes" -msgstr "undelfs: încarc informaţiile despre fişierele şterse: %d inoduri" +msgstr "undelfs: încarc informațiile despre fișierele șterse: %d inoduri" #, c-format msgid "while calling ext2_block_iterate %d" -msgstr "" +msgstr "în timp ce se rula ext2_block_iterate %d" msgid "no more memory while reallocating array" -msgstr "" +msgstr "nu a mai rămas memorie în timpul realocării array-ului" #, c-format msgid "while doing inode scan %d" -msgstr "" +msgstr "în timpul scanării inodurilor %d" #, c-format msgid "Cannot open file %s" -msgstr "" +msgstr "Nu se poate deschide fișierul %s" msgid "undelfs: reading inode bitmap..." msgstr "undelfs: citesc harta inodurilor..." @@ -4022,6 +4135,8 @@ "Cannot load inode bitmap from:\n" "%s" msgstr "" +"Nu se poate încărca harta inodurilor din:\n" +"%s" msgid "undelfs: reading block bitmap..." msgstr "undelfs: citesc harta blocurilor..." @@ -4031,87 +4146,91 @@ "Cannot load block bitmap from:\n" "%s" msgstr "" +"Nu se poate încărca harta blocurilor din:\n" +"%s" msgid "vfs_info is not fs!" -msgstr "" +msgstr "vfs_info nu este fs!" msgid "You have to chdir to extract files first" -msgstr "" +msgstr "Trebuie mai întâi să chdir pentru a extrage fișierele" msgid "while iterating over blocks" -msgstr "" +msgstr "în timpul parcurgerii blocurilor" #, c-format msgid "Cannot open file \"%s\"" -msgstr "" +msgstr "Nu se poate deschide fișierul \"%s\"" msgid "Ext2lib error" -msgstr "" +msgstr "Eroare ext2lib" msgid "Invalid value" -msgstr "" +msgstr "Valoare nevalidă" msgid "File was modified. Save with exit?" -msgstr "" +msgstr "Fișierul a fost modificat. Salvezi la ieșire?" msgid "&Cancel quit" -msgstr "" +msgstr "&Renunță la ieșire" msgid "" "Midnight Commander is being shut down.\n" "Save modified file?" msgstr "" +"Midnight Commander este în curs de închidere.\n" +"Salvezi fișierul modificat?" msgid "Cannot spawn child process" -msgstr "" +msgstr "Nu se poate porni procesul copil" msgid "Empty output from child filter" -msgstr "Ieşire vidă de la filtrul copil" +msgstr "Ieșire vidă de la filtrul copil" msgid "&Line number (decimal)" -msgstr "" +msgstr "Număr de &linie (zecimal)" msgid "Pe&rcents" -msgstr "" +msgstr "P&rocente" msgid "&Decimal offset" -msgstr "" +msgstr "Decalaj &zecimal" msgid "He&xadecimal offset" -msgstr "" +msgstr "Decalaj he&xazecimal" msgid "Goto" -msgstr "Du-teLa" +msgstr "Mergi la" msgid "ButtonBar|Ascii" -msgstr "" +msgstr "ButtonBar|Ascii" msgid "ButtonBar|HxSrch" -msgstr "" +msgstr "ButtonBar|HxCăut" msgid "ButtonBar|UnWrap" -msgstr "" +msgstr "ButtonBar|UnWrap" msgid "ButtonBar|Wrap" -msgstr "" +msgstr "ButtonBar|Wrap" msgid "ButtonBar|Hex" -msgstr "" +msgstr "ButtonBar|Hex" msgid "ButtonBar|Goto" -msgstr "" +msgstr "ButtonBar|Mergi la" msgid "ButtonBar|Raw" -msgstr "" +msgstr "ButtonBar|Crud" msgid "ButtonBar|Parse" -msgstr "" +msgstr "ButtonBar|Interpretează" msgid "ButtonBar|Unform" -msgstr "" +msgstr "ButtonBar|Unform" msgid "ButtonBar|Format" -msgstr "" +msgstr "ButtonBar|Format" #, c-format msgid "" @@ -4119,42 +4238,48 @@ "%s\n" "Data may have been written or not" msgstr "" +"Eroare la închiderea fișierului:\n" +"%s\n" +"Este posibil ca datele să nu fi fost scrise" #, c-format msgid "" "Cannot save file:\n" "%s" msgstr "" +"Nu se poate salva fișierul:\n" +"%s" msgid "View: " -msgstr "" +msgstr "Vizualizează: " #, c-format msgid "" "Cannot open \"%s\"\n" "%s" msgstr "" +"Nu se poate deschide \"%s\"\n" +"%s" msgid "Cannot view: not a regular file" -msgstr "" +msgstr "Nu se poate vizualiza: nu este un fișier regulat" #, c-format msgid "" "Cannot open \"%s\" in parse mode\n" "%s" msgstr "" +"Nu se poate deschide \"%s\" în mod parsare\n" +"%s" msgid "Seeking to search result" -msgstr "" +msgstr "Se merge la rezultatul căutării" msgid "Search done" -msgstr "" +msgstr "Căutarea a fost efectuată" msgid "Continue from beginning?" -msgstr "" +msgstr "Continuă de la început?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" -msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Ştergere" +msgstr "Nu se poate aduce o copie locală a /ftp://some.host/editme.txt" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/ru.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/ru.gmo differ diff -Nru mc-4.8.10/po/ru.po mc-4.8.11/po/ru.po --- mc-4.8.10/po/ru.po 2013-08-02 19:06:23.000000000 +0000 +++ mc-4.8.11/po/ru.po 2013-11-29 18:47:00.000000000 +0000 @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" "PO-Revision-Date: 2013-07-05 09:15+0300\n" "Last-Translator: Andrew Borodin \n" "Language-Team: Russian (http://www.transifex.com/projects/p/mc/language/" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/sk.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/sk.gmo differ diff -Nru mc-4.8.10/po/sk.po mc-4.8.11/po/sk.po --- mc-4.8.10/po/sk.po 2013-08-02 19:06:23.000000000 +0000 +++ mc-4.8.11/po/sk.po 2013-11-29 18:47:00.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Slovak (http://www.transifex.com/projects/p/mc/language/sk/)\n" "Language: sk\n" @@ -4093,6 +4093,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Deleting" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/sl.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/sl.gmo differ diff -Nru mc-4.8.10/po/sl.po mc-4.8.11/po/sl.po --- mc-4.8.10/po/sl.po 2013-08-02 19:06:23.000000000 +0000 +++ mc-4.8.11/po/sl.po 2013-11-29 18:47:00.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/mc/language/" "sl/)\n" @@ -4091,6 +4091,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Brišem" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/sr.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/sr.gmo differ diff -Nru mc-4.8.10/po/sr.po mc-4.8.11/po/sr.po --- mc-4.8.10/po/sr.po 2013-08-02 19:06:23.000000000 +0000 +++ mc-4.8.11/po/sr.po 2013-11-29 18:47:00.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Serbian (http://www.transifex.com/projects/p/mc/language/" "sr/)\n" @@ -4078,6 +4078,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Бришем" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/sv.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/sv.gmo differ diff -Nru mc-4.8.10/po/sv.po mc-4.8.11/po/sv.po --- mc-4.8.10/po/sv.po 2013-08-02 19:06:23.000000000 +0000 +++ mc-4.8.11/po/sv.po 2013-11-29 18:47:00.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/mc/language/" "sv/)\n" @@ -4069,6 +4069,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Tar bort" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/sv_SE.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/sv_SE.gmo differ diff -Nru mc-4.8.10/po/sv_SE.po mc-4.8.11/po/sv_SE.po --- mc-4.8.10/po/sv_SE.po 2013-08-02 19:06:23.000000000 +0000 +++ mc-4.8.11/po/sv_SE.po 2013-11-29 18:47:00.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" "PO-Revision-Date: 2011-12-07 11:21+0000\n" "Last-Translator: slavazanko \n" "Language-Team: Swedish (Sweden) (http://www.transifex.net/projects/p/mc/team/" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/szl.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/szl.gmo differ diff -Nru mc-4.8.10/po/szl.po mc-4.8.11/po/szl.po --- mc-4.8.10/po/szl.po 2013-08-02 19:06:23.000000000 +0000 +++ mc-4.8.11/po/szl.po 2013-11-29 18:47:00.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Silesian (http://www.transifex.com/projects/p/mc/language/" "szl/)\n" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/ta.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/ta.gmo differ diff -Nru mc-4.8.10/po/ta.po mc-4.8.11/po/ta.po --- mc-4.8.10/po/ta.po 2013-08-02 19:06:23.000000000 +0000 +++ mc-4.8.11/po/ta.po 2013-11-29 18:47:00.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Tamil (http://www.transifex.com/projects/p/mc/language/ta/)\n" "Language: ta\n" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/tr.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/tr.gmo differ diff -Nru mc-4.8.10/po/tr.po mc-4.8.11/po/tr.po --- mc-4.8.10/po/tr.po 2013-08-02 19:06:23.000000000 +0000 +++ mc-4.8.11/po/tr.po 2013-11-29 18:47:00.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/mc/language/" "tr/)\n" @@ -4070,6 +4070,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Siliniyor" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/uk.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/uk.gmo differ diff -Nru mc-4.8.10/po/uk.po mc-4.8.11/po/uk.po --- mc-4.8.10/po/uk.po 2013-08-02 19:06:23.000000000 +0000 +++ mc-4.8.11/po/uk.po 2013-11-29 18:47:00.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/mc/language/" "uk/)\n" @@ -4286,6 +4286,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Видалення" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/vi.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/vi.gmo differ diff -Nru mc-4.8.10/po/vi.po mc-4.8.11/po/vi.po --- mc-4.8.10/po/vi.po 2013-08-02 19:06:23.000000000 +0000 +++ mc-4.8.11/po/vi.po 2013-11-29 18:47:00.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/mc/language/" "vi/)\n" @@ -4068,6 +4068,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Đang xóa" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/wa.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/wa.gmo differ diff -Nru mc-4.8.10/po/wa.po mc-4.8.11/po/wa.po --- mc-4.8.10/po/wa.po 2013-08-02 19:06:23.000000000 +0000 +++ mc-4.8.11/po/wa.po 2013-11-29 18:47:00.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Walloon (http://www.transifex.com/projects/p/mc/language/" "wa/)\n" @@ -4051,6 +4051,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "Dji disface" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/zh_CN.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/zh_CN.gmo differ diff -Nru mc-4.8.10/po/zh_CN.po mc-4.8.11/po/zh_CN.po --- mc-4.8.10/po/zh_CN.po 2013-08-02 19:06:23.000000000 +0000 +++ mc-4.8.11/po/zh_CN.po 2013-11-29 18:47:00.000000000 +0000 @@ -8,13 +8,14 @@ # qingxianhao , 2012 # Slava Zanko , 2011 # walking , 2013 +# xtoaster , 2013 msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-11 09:19+0000\n" -"Last-Translator: xtoaster \n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" +"Last-Translator: Piotr Drąg \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mc/" "language/zh_CN/)\n" "Language: zh_CN\n" @@ -24,7 +25,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" msgid "Warning: cannot load codepages list" -msgstr "警告：无法加载代码页列表" +msgstr "警告: 无法加载代码页列表" msgid "7-bit ASCII" msgstr "7-bit ASCII" @@ -34,24 +35,24 @@ msgstr "无法从 %s 翻译到 %s" msgid "Event system already initialized" -msgstr "事件系统已经初始化" +msgstr "事件系统已初始化" msgid "Failed to initialize event system" -msgstr "初始化事件系统失败" +msgstr "事件系统初始化失败" msgid "Event system not initialized" -msgstr "事件系统没有初始化" +msgstr "事件系统未初始化" msgid "Check input data! Some of parameters are NULL!" -msgstr "检查输入数据！有的参数为NULL！" +msgstr "请检查输入数据! 某些参数为空 (NULL)!" #, c-format msgid "Unable to create group '%s' for events!" -msgstr "无法创建事件组'%s' ！" +msgstr "无法创建事件组“%s”!" #, c-format msgid "Unable to create event '%s'!" -msgstr "无法创建事件 '%s'!" +msgstr "无法创建事件“%s”!" #, c-format msgid "" @@ -59,9 +60,9 @@ "User: %s\n" "Process ID: %d" msgstr "" -"文件\"%s\"正在被编辑。 \n" -"用户：%s\n" -"进程号：%d" +"文件“%s”正在被编辑。\n" +"用户: %s\n" +"进程 ID: %d" msgid "File locked" msgstr "文件被锁定" @@ -74,14 +75,14 @@ #, c-format msgid "Cannot create %s directory" -msgstr "不能建立目录%s" +msgstr "无法建立目录%s" msgid "FATAL: not a directory:" -msgstr "严重错误：不是一个目录：" +msgstr "严重错误: 不是一个目录: " #, c-format msgid "An error occurred while migrating user settings: %s" -msgstr "迁移用户设置时发生了一个错误：%s" +msgstr "迁移用户设置时发生了一个错误: %s" #, c-format msgid "" @@ -90,7 +91,7 @@ "To get more info, please visit\n" "http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html" msgstr "" -"你的旧设置被从 %s 迁移\n" +"您的旧设置被从 %s 迁移\n" "到 Freedesktop 推荐目录。\n" "更多信息，请访问\n" "http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html" @@ -100,7 +101,7 @@ "Your old settings were migrated from %s\n" "to %s\n" msgstr "" -"你的旧设置被从 %s 迁移\n" +"您的旧设置被从 %s 迁移\n" "到 %s\n" msgid "Search string not found" @@ -114,7 +115,7 @@ #, c-format msgid "Invalid token number %d" -msgstr "无效的标记个数%d " +msgstr "无效的标记个数 %d" msgid "Regular expression error" msgstr "正则表达式错误" @@ -129,23 +130,23 @@ msgstr "十六进制(&X)" msgid "Wil&dcard search" -msgstr "通配符查找 (&D)" +msgstr "通配符查找(&D)" #, c-format msgid "" "Unable to load '%s' skin.\n" "Default skin has been loaded" msgstr "" -"无法加载皮肤'%s'。\n" -"默认皮肤已经加载" +"无法加载皮肤“%s”。\n" +"已加载默认皮肤" #, c-format msgid "" "Unable to parse '%s' skin.\n" "Default skin has been loaded" msgstr "" -"无法解析皮肤'%s'。\n" -"默认皮肤已经加载" +"无法解析皮肤“%s”。\n" +"已加载默认皮肤" #, c-format msgid "" @@ -153,9 +154,9 @@ "on non-256 colors terminal.\n" "Default skin has been loaded" msgstr "" -"不能在非256色终端上使用\n" -"带256色支持的皮肤 '%s'。\n" -"载入默认皮肤。" +"无法在非256色终端上使用\n" +"支持256色的皮肤“%s”。\n" +"已加载默认皮肤" msgid "Function key 1" msgstr "F1" @@ -218,43 +219,43 @@ msgstr "F20" msgid "Backspace key" -msgstr "退格键" +msgstr "Backspace 键" msgid "End key" -msgstr "末尾键" +msgstr "End 键" msgid "Up arrow key" -msgstr "上箭头键" +msgstr "向上键" msgid "Down arrow key" -msgstr "下箭头键" +msgstr "向下键" msgid "Left arrow key" -msgstr "左箭头键" +msgstr "向左键" msgid "Right arrow key" -msgstr "右箭头键" +msgstr "向右键" msgid "Home key" -msgstr "行首键" +msgstr "Home 键" msgid "Page Down key" -msgstr "下页键" +msgstr "Page Down 键" msgid "Page Up key" -msgstr "上页键" +msgstr "Page Up 键" msgid "Insert key" -msgstr "插入键" +msgstr "Insert 键" msgid "Delete key" -msgstr "删除键" +msgstr "Delete 键" msgid "Completion/M-tab" msgstr "补全/M-Tab" msgid "Back Tabulation S-tab" -msgstr "后退制表 S-tab " +msgstr "后退制表 S-tab" msgid "+ on keypad" msgstr "小键盘 +" @@ -269,40 +270,40 @@ msgstr "小键盘 *" msgid "Escape key" -msgstr "ESC键" +msgstr "ESC 键" msgid "Left arrow keypad" -msgstr "小键盘左箭头键" +msgstr "小键盘向左键" msgid "Right arrow keypad" -msgstr "小键盘右箭头键" +msgstr "小键盘向右键" msgid "Up arrow keypad" -msgstr "小键盘上箭头键" +msgstr "小键盘向上键" msgid "Down arrow keypad" -msgstr "小键盘下箭头键" +msgstr "小键盘向下键" msgid "Home on keypad" -msgstr "小键盘行首键" +msgstr "小键盘 Home 键" msgid "End on keypad" -msgstr "小键盘末尾键" +msgstr "小键盘 End 键" msgid "Page Down keypad" -msgstr "小键盘下页键" +msgstr "小键盘 Page Down 键" msgid "Page Up keypad" -msgstr "小键盘上页键" +msgstr "小键盘 Page Up 键" msgid "Insert on keypad" -msgstr "小键盘插入键" +msgstr "小键盘 Insert 键" msgid "Delete on keypad" -msgstr "小键盘删除键" +msgstr "小键盘 Del 键" msgid "Enter on keypad" -msgstr "小键盘回车键" +msgstr "小键盘 Enter 键" msgid "Function key 21" msgstr "F21" @@ -323,16 +324,16 @@ msgstr "C1键" msgid "Plus" -msgstr "加" +msgstr "加号" msgid "Minus" -msgstr "减" +msgstr "减号" msgid "Asterisk" msgstr "星号" msgid "Dot" -msgstr "点" +msgstr "句号" msgid "Less than" msgstr "小于" @@ -371,13 +372,13 @@ msgstr "百分号" msgid "Caret" -msgstr "脱字符^" +msgstr "脱字符(^)" msgid "Tilda" -msgstr "波浪号~" +msgstr "波浪号(~)" msgid "Prime" -msgstr "Prime" +msgstr "重音符(`)" msgid "Underline" msgstr "下划线" @@ -386,59 +387,59 @@ msgstr "着重线" msgid "Pipe" -msgstr "管道" +msgstr "管道符(|)" msgid "Left parenthesis" -msgstr "左括弧" +msgstr "左圆括号" msgid "Right parenthesis" -msgstr "右括弧" +msgstr "右圆括号" msgid "Left bracket" -msgstr "左括号" +msgstr "左方括号" msgid "Right bracket" -msgstr "右括号" +msgstr "右方括号" msgid "Left brace" -msgstr "左大括号" +msgstr "左花括号" msgid "Right brace" -msgstr "右大括号" +msgstr "右花括号" msgid "Enter" msgstr "回车" msgid "Tab key" -msgstr "制表符键" +msgstr "Tab 键" msgid "Space key" msgstr "空格键" msgid "Slash key" -msgstr "斜线键" +msgstr "/ 键" msgid "Backslash key" -msgstr "反斜线键" +msgstr "\\ 键" msgid "Number sign #" -msgstr "井号键#" +msgstr "井号(#)" #. TRANSLATORS: Please translate as in "at sign" (@). msgid "At sign" -msgstr "AT" +msgstr "at 符" msgid "Ctrl" -msgstr "Ctrl" +msgstr "Ctrl 键" msgid "Alt" -msgstr "Alt" +msgstr "Alt 键" msgid "Shift" -msgstr "Shift" +msgstr "Shift 键" msgid "The TERM environment variable is unset!\n" -msgstr "没有设置 TERM 环境变量！\n" +msgstr "没有设置 TERM 环境变量!\n" #, c-format msgid "" @@ -452,10 +453,10 @@ msgstr "警告" msgid "Pipe failed" -msgstr "管道失败 " +msgstr "管道失败" msgid "Dup failed" -msgstr "复制失败 " +msgstr "复制失败" msgid "Error dup'ing old error pipe" msgstr "复制原有出错管道时发生错误" @@ -478,43 +479,43 @@ #, c-format msgid "%s is not a directory\n" -msgstr "%s不是目录\n" +msgstr "%s 不是目录\n" #, c-format msgid "Directory %s is not owned by you\n" -msgstr "目录%s不属于你\n" +msgstr "目录 %s 的所有者不是您\n" #, c-format msgid "Cannot set correct permissions for directory %s\n" -msgstr "无法正确设置目录%s的权限\n" +msgstr "无法正确设置目录 %s 的权限\n" #, c-format msgid "Cannot create temporary directory %s: %s\n" -msgstr "无法创建临时目录%s：%s\n" +msgstr "无法创建临时目录 %s: %s\n" #, c-format msgid "Temporary files will be created in %s\n" -msgstr "在%s中创建临时文件\n" +msgstr "在 %s 中创建临时文件\n" #, c-format msgid "Temporary files will not be created\n" -msgstr "不能创建临时文件\n" +msgstr "无法创建临时文件\n" #, c-format msgid "Press any key to continue..." msgstr "按任意键继续..." msgid "Cannot parse:" -msgstr "无法解析：" +msgstr "无法解析: " msgid "More parsing errors will be ignored." msgstr "以后的解析错误将被忽略。" msgid "Internal error:" -msgstr "内部错误：" +msgstr "内部错误: " msgid "Password:" -msgstr "口令：" +msgstr "密码: " msgid "Screens" msgstr "屏幕" @@ -527,7 +528,7 @@ msgstr "DialogTitle|清除历史" msgid "Do you want clean this history?" -msgstr "你要清除历史" +msgstr "您确认要清除历史?" msgid "&Yes" msgstr "是(&Y)" @@ -542,7 +543,7 @@ msgstr "取消(&C)" msgid "Background process:" -msgstr "后台进程：" +msgstr "后台进程: " msgid "Error" msgstr "错误" @@ -587,7 +588,7 @@ msgstr "禁用 X11 支持" msgid "Tries to use an old highlight mouse tracking" -msgstr "尝试使用老式的高亮鼠标跟踪" +msgstr "尝试使用老式高亮鼠标跟踪" msgid "Disable mouse support in text version" msgstr "在文本模式下禁用鼠标支持" @@ -596,7 +597,7 @@ msgstr "尝试使用 termcap 而不是 terminfo" msgid "To run on slow terminals" -msgstr "在慢速终端上运行" +msgstr "若要在缓慢的终端上运行" msgid "Use stickchars to draw" msgstr "用线条字符绘制" @@ -620,7 +621,7 @@ msgstr "指定颜色配置" msgid "Show mc with specified skin" -msgstr "用指定的皮肤显示MC" +msgstr "用指定的皮肤显示 MC" #. TRANSLATORS: don't translate keywords msgid "" @@ -647,20 +648,20 @@ "\n" "{FORE}, {BACK} 及 {ATTR} 可以忽略，忽略时使用默认值\n" "\n" -" 关键词：\n" -" 全局： errors, disabled, reverse, gauge, header\n" +" 关键词: \n" +" 全局: errors, disabled, reverse, gauge, header\n" " input, inputmark, inputunchanged, commandlinemark\n" " bbarhotkey, bbarbutton, statusbar\n" -" 文件显示：normal, selected, marked, markselect\n" -" 对话框窗口：dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" +" 文件显示: normal, selected, marked, markselect\n" +" 对话框窗口: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" " errdhotfocus\n" -" 菜单： menunormal, menuhot, menusel, menuhotsel, menuinactive\n" -" 弹出菜单： pmenunormal, pmenusel, pmenutitle\n" -" 编辑器： editnormal, editbold, editmarked, editwhitespace,\n" +" 菜单: menunormal, menuhot, menusel, menuhotsel, menuinactive\n" +" 弹出菜单: pmenunormal, pmenusel, pmenutitle\n" +" 编辑器: editnormal, editbold, editmarked, editwhitespace,\n" " editlinestate, editbg, editframe, editframeactive\n" " editframedrag\n" -" 查看器： viewbold, viewunderline, viewselected\n" -" 帮助： helpnormal, helpitalic, helpbold, helplink, helpslink\n" +" 查看器: viewbold, viewunderline, viewselected\n" +" 帮助: helpnormal, helpi talic, helpbold, helplink, helpslink\n" #. TRANSLATORS: don't translate color names and attributes msgid "" @@ -675,16 +676,16 @@ "Attributes:\n" " bold, underline, reverse, blink; append more with '+'\n" msgstr "" -"标准颜色：\n" +"标准颜色: \n" " black, gray, red, brightred, green, brightgreen, brown,\n" " yellow, blue, brightblue, magenta, brightmagenta, cyan,\n" " brightcyan, lightgray and white\n" "\n" -"扩展颜色，当256色可用时：\n" +"扩展颜色，当256色可用时: \n" " color16 到 color255，或者 rgb000 到 rgb555 或者 gray0 到 gray23\n" "\n" -"属性：\n" -" bold, underline, reverse, blink; 添加更多用 '+'\n" +"属性: \n" +" bold, underline, reverse, blink; 添加更多用 “+”\n" msgid "Color options" msgstr "颜色选项" @@ -715,16 +716,16 @@ msgstr "主要选项" msgid "Terminal options" -msgstr "终端选项 " +msgstr "终端选项" msgid "Arguments parse error!" -msgstr "参数解析错误！" +msgstr "参数解析错误!" msgid "No arguments given to the viewer." -msgstr "查看器没有指定参数" +msgstr "查看器没有指定参数。" msgid "Two files are required to evoke the diffviewer." -msgstr "两个文件需要调用差异查看器" +msgstr "两个文件需要调用差异查看器。" msgid "Background process error" msgstr "后台进程错误" @@ -733,7 +734,7 @@ msgstr "子进程未知错误" msgid "Child died unexpectedly" -msgstr " 子进程异常退出" +msgstr "子进程异常退出" msgid "Background protocol error" msgstr "后台协议错误" @@ -752,7 +753,7 @@ msgstr "取消(&D)" msgid "Enter search string:" -msgstr "输入查找字符串：" +msgstr "输入查找字符串: " msgid "Cas&e sensitive" msgstr "大小写敏感(&e)" @@ -777,8 +778,8 @@ "Cannot create temporary diff file\n" "%s" msgstr "" -"无法创建临时diff文件 \n" -"%s " +"无法创建临时 diff 文件 \n" +"%s" #, c-format msgid "" @@ -787,8 +788,8 @@ "%s" msgstr "" "无法创建备份文件\n" -"%s%s \n" -"%s " +"%s%s\n" +"%s" #, c-format msgid "" @@ -796,7 +797,7 @@ "%s" msgstr "" "无法创建临时合并文件\n" -"%s " +"%s" msgid "&Fastest (Assume large files)" msgstr "最快(&F针对大文件)" @@ -805,16 +806,16 @@ msgstr "最小(&M查找较小的更改集)" msgid "Diff algorithm" -msgstr "Diff算法" +msgstr "Diff 算法" msgid "Diff extra options" -msgstr "Diff其它选项 " +msgstr "Diff 其它选项" msgid "&Ignore case" msgstr "忽略大小写(&I)" msgid "Ignore tab &expansion" -msgstr "忽略TAB扩展(&E)" +msgstr "忽略 Tab 展开(&E)" msgid "Ignore &space change" msgstr "忽略空格变化(&S)" @@ -826,7 +827,7 @@ msgstr "去除行末的回车换行(&T)" msgid "Diff Options" -msgstr "Diff选项" +msgstr "Diff 选项" msgid "Edit" msgstr "编辑" @@ -841,7 +842,7 @@ msgstr "跳转到行(右)" msgid "Enter line:" -msgstr "输入行号：" +msgstr "输入行号: " msgid "ButtonBar|Help" msgstr "ButtonBar|帮助" @@ -868,32 +869,32 @@ msgstr "退出" msgid "File(s) was modified. Save with exit?" -msgstr "文件已被修改，保存并退出？" +msgstr "文件已被修改，保存并退出?" msgid "" "Midnight Commander is being shut down.\n" "Save modified file(s)?" msgstr "" -"Midnight Commander就要被关闭了，\n" +"Midnight Commander 即将被关闭。\n" "要保存修改过的文件吗?" msgid "Diff:" -msgstr "差异：" +msgstr "差异: " #, c-format msgid "\"%s\" is a directory" -msgstr "\"%s\" 是一个目录" +msgstr "“%s”是一个目录" #, c-format msgid "" "Cannot stat \"%s\"\n" "%s" msgstr "" -"无法查看\"%s\"的状态\n" +"无法查看“%s”的状态\n" "%s" msgid "Diff viewer: invalid mode" -msgstr "Diff 查看器：无效模式" +msgstr "Diff 查看器: 模式无效" msgid "Two files are needed to compare" msgstr "比较时需要两个文件" @@ -909,53 +910,53 @@ #, c-format msgid "Cannot open %s for reading" -msgstr "不能打开%s读" +msgstr "无法打开 %s 读取内容" #, c-format msgid "Error reading %s" -msgstr "读错误%s" +msgstr "读取错误 %s" #, c-format msgid "Cannot get size/permissions for %s" -msgstr "无法获取文件%s的大小和权限信息" +msgstr "无法获取文件 %s 的大小和权限信息" #, c-format msgid "\"%s\" is not a regular file" -msgstr "\"%s\"不是一个常规文件" +msgstr "“%s”不是一个常规文件" #, c-format msgid "" "File \"%s\" is too large.\n" "Open it anyway?" msgstr "" -"文件 \"%s\" 体积过大。\n" -"仍然打开？" +"文件“%s”体积过大。\n" +"仍然打开?" #, c-format msgid "Error reading from pipe: %s" -msgstr "读取管道时发生错误：%s" +msgstr "读取管道时发生错误: %s" #, c-format msgid "Cannot open pipe for reading: %s" -msgstr "不能打开管道读取：%s" +msgstr "无法打开管道读取: %s" msgid "File has hard-links. Detach before saving?" -msgstr "文件有硬链接，保存文件前分离该链接吗？" +msgstr "文件有硬链接。保存文件前分离该链接吗?" msgid "The file has been modified in the meantime. Save anyway?" -msgstr "文件同时已经被修改。仍然保存吗？" +msgstr "文件同时已经被修改。仍然保存吗?" #, c-format msgid "Error writing to pipe: %s" -msgstr "写入管道时发生错误：%s" +msgstr "写入管道时发生错误: %s" #, c-format msgid "Cannot open pipe for writing: %s" -msgstr "试图打开管道写入时失败：%s" +msgstr "试图打开管道写入时失败: %s" #, c-format msgid "Cannot open file for writing: %s" -msgstr "无法打开文件进行写操作：%s" +msgstr "无法打开文件进行写操作: %s" msgid "The file you are saving is not finished with a newline" msgstr "您要保存的文件没有以换行符结束" @@ -967,25 +968,25 @@ msgstr "不修改(&D)" msgid "&Unix format (LF)" -msgstr "&Unix格式(LF)" +msgstr "&Unix格式 (LF)" msgid "&Windows/DOS format (CR LF)" msgstr "&Windows/DOS格式 (CR LF)" msgid "&Macintosh format (CR)" -msgstr "&Macintosh格式(CR)" +msgstr "&Macintosh格式 (CR)" msgid "Enter file name:" -msgstr "输入文件名：" +msgstr "输入文件名: " msgid "Change line breaks to:" -msgstr "更改换行符为：" +msgstr "更改换行符为: " msgid "Save As" -msgstr "保存为" +msgstr "另存为" msgid "Block is large, you may not be able to undo this action" -msgstr "块过大，您可能无法撤消这个动作。" +msgstr "块过大，您可能无法撤消这个操作" msgid "&Quick save" msgstr "快速保存(&Q)" @@ -994,19 +995,19 @@ msgstr "安全保存(&S)" msgid "&Do backups with following extension:" -msgstr "使用下面后缀备份文件(&B)：" +msgstr "使用下面后缀备份文件(&B): " msgid "Check &POSIX new line" -msgstr "检查&POSIX换行" +msgstr "检查 &POSIX 换行" msgid "Edit Save Mode" -msgstr "编辑保存模式 " +msgstr "编辑保存模式" msgid "Save as" -msgstr "保存为" +msgstr "另存为" msgid "Cannot save: destination is not a regular file" -msgstr "无法保存：目标位置不是常规文件" +msgstr "无法保存: 目标位置不是常规文件" msgid "A file already exists with this name" msgstr "同名文件已存在" @@ -1015,13 +1016,13 @@ msgstr "覆盖(&O)" msgid "Cannot save file" -msgstr "不能保存文件" +msgstr "无法保存文件" msgid "Delete macro" msgstr "删除宏" msgid "Press macro hotkey:" -msgstr "按下宏热键：" +msgstr "按下宏热键: " msgid "Macro not deleted" msgstr "宏没有删除" @@ -1030,17 +1031,17 @@ msgstr "保存宏" msgid "Press the macro's new hotkey:" -msgstr "为该宏按下新热键：" +msgstr "为该宏按下新热键: " msgid "Repeat last commands" msgstr "重复上一个命令" msgid "Repeat times:" -msgstr "重复半数" +msgstr "重复次数: " #, c-format msgid "Confirm save file: \"%s\"" -msgstr "确认保存文件：\"%s\"" +msgstr "确认保存文件:“%s”" msgid "Save file" msgstr "保存文件" @@ -1055,7 +1056,7 @@ msgstr "语法文件编辑" msgid "Which syntax file you want to edit?" -msgstr "您要编辑哪个语法文件？" +msgstr "您要编辑哪个语法文件?" msgid "&User" msgstr "用户(&U)" @@ -1067,7 +1068,7 @@ msgstr "菜单编辑" msgid "Which menu file do you want to edit?" -msgstr "您要编辑哪个菜单文件？" +msgstr "您要编辑哪个菜单文件?" msgid "&Local" msgstr "本地(&L)" @@ -1080,7 +1081,7 @@ msgstr "替换了 %ld 处" msgid "[NoName]" -msgstr "" +msgstr "[未命名]" #, c-format msgid "" @@ -1088,7 +1089,7 @@ "Save before close?" msgstr "" "文件 %s 已修改。\n" -"关闭前保存？" +"关闭前保存?" msgid "Close file" msgstr "关闭文件" @@ -1098,7 +1099,7 @@ "Midnight Commander is being shut down.\n" "Save modified file %s?" msgstr "" -"Midnight Commander就要被关闭了，\n" +"Midnight Commander 即将被关闭。\n" "要保存修改过的文件 %s 吗?" msgid "This function is not implemented" @@ -1132,10 +1133,10 @@ msgstr "您必需先突出显示一个文字块" msgid "Run sort" -msgstr "运行sort" +msgstr "运行 sort" msgid "Enter sort options (see manpage) separated by whitespace:" -msgstr "输入排序选项(查看manpage)，用空格分隔：" +msgstr "输入排序选项(查看 manpage)用空格分隔: " msgid "Sort" msgstr "排序" @@ -1145,19 +1146,19 @@ #, c-format msgid "Sort returned non-zero: %s" -msgstr "Sort 返回非零值：%s" +msgstr "Sort 返回非零值: %s" msgid "Paste output of external command" msgstr "粘贴外部命令的输出" msgid "Enter shell command(s):" -msgstr "输入Shell命令：" +msgstr "输入Shell 命令: " msgid "External command" msgstr "外部命令" msgid "Cannot execute command" -msgstr "不能执行命令" +msgstr "无法执行命令" msgid "mail -s -c " msgstr "mail -s -c " @@ -1178,14 +1179,14 @@ msgstr "插入文字" msgid "Press any key:" -msgstr "按下任意键：" +msgstr "按下任意键: " msgid "" "Current text was modified without a file save.\n" "Continue discards these changes" msgstr "" "当前文本被修改但没有保存文件。\n" -"选择继续将丢失这些修改。" +"选择继续将丢失这些修改" msgid "In se&lection" msgstr "在选择区域(&L)" @@ -1194,10 +1195,10 @@ msgstr "查找全部(&F)" msgid "Enter replacement string:" -msgstr "输入替换字符串：" +msgstr "输入替换字符串: " msgid "Replace with:" -msgstr "替换为：" +msgstr "替换为: " msgid "&Replace" msgstr "替换(&R)" @@ -1222,7 +1223,7 @@ "选择继续将丢失这些修改。" msgid "NoName" -msgstr "" +msgstr "未命名" msgid "&Open file..." msgstr "打开文件(&O)..." @@ -1234,7 +1235,7 @@ msgstr "关闭(&C)" msgid "Save &as..." -msgstr "保存为(&a)...l" +msgstr "另存为(&A)..." msgid "&Insert file..." msgstr "插入文件(&I)..." @@ -1300,7 +1301,7 @@ msgstr "搜索(&S)..." msgid "Search &again" -msgstr "重新搜索(&S)..." +msgstr "重新搜索(&S)" msgid "&Replace..." msgstr "替换(&R)..." @@ -1318,7 +1319,7 @@ msgstr "清理书签(&F)" msgid "&Go to line..." -msgstr "转到行(&G)" +msgstr "转到行(&G)..." msgid "&Toggle line state" msgstr "翻转行状态(&T)" @@ -1342,13 +1343,13 @@ msgstr "编码(&I)..." msgid "&Refresh screen" -msgstr "刷新屏幕(&R) " +msgstr "刷新屏幕(&R)" msgid "&Start/Stop record macro" -msgstr "开始/停止录制宏 (&S)" +msgstr "开始/停止录制宏(&S)" msgid "Delete macr&o..." -msgstr "删除宏(&O),,," +msgstr "删除宏(&O)..." msgid "Record/Repeat &actions" msgstr "录制/重复动作(&A)" @@ -1393,13 +1394,13 @@ msgstr "切换全屏显示(&T)" msgid "&Next" -msgstr "" +msgstr "下一个(&N)" msgid "&Previous" -msgstr "" +msgstr "前一个(&P)" msgid "&List..." -msgstr "" +msgstr "窗口列表(&L)..." msgid "&General..." msgstr "常规(&G)..." @@ -1441,7 +1442,7 @@ msgstr "窗口(&W)" msgid "&Options" -msgstr "选项(&O) " +msgstr "选项(&O)" msgid "&None" msgstr "无(&N)" @@ -1468,7 +1469,7 @@ msgstr "使用空格填充制表位(&S)" msgid "Tab spacing:" -msgstr "制表位间距：" +msgstr "制表位间距: " msgid "Other options" msgstr "其它选项" @@ -1501,10 +1502,10 @@ msgstr "光标不受行尾限制(&Y)" msgid "&Group undo" -msgstr "组撤消 (&G)" +msgstr "组撤消(&G)" msgid "Word wrap line length:" -msgstr "换行位置：" +msgstr "换行位置: " msgid "Editor options" msgstr "编辑器选项" @@ -1526,7 +1527,7 @@ msgstr "打开文件" msgid "Edit: " -msgstr "编辑：" +msgstr "编辑: " msgid "ButtonBar|Mark" msgstr "ButtonBar|标记" @@ -1572,7 +1573,7 @@ "Cannot open file %s\n" "%s" msgstr "" -"无法打开文件 %s \n" +"无法打开文件 %s\n" "%s" #, c-format @@ -1585,9 +1586,9 @@ "deleted your working directory, or given yourself\n" "extra access permissions with the \"su\" command?" msgstr "" -"Commander 无法进入 subshell 声称的您所在的目录。\n" -"也许您删除了工作目录，或者通过\"su\"命令给您的\n" -"进程额外的访问权限？" +"MC 无法进入 subshell 所声称的您的所在的目录。\n" +"也许您已删除了工作目录，或者通过 \"su\" 命令\n" +"给予此进程额外的访问权限?" #, c-format msgid "Cannot fetch a local copy of %s" @@ -1598,7 +1599,7 @@ #, c-format msgid "Type 'exit' to return to the Midnight Commander" -msgstr "输入'exit'返回 Midnight Commander" +msgstr "输入 'exit' 返回 Midnight Commander" msgid "Set &all" msgstr "全部设置(&A)" @@ -1629,16 +1630,16 @@ "Cannot chmod \"%s\"\n" "%s" msgstr "" -"无法 chmod \"%s\"\n" -"%s " +"无法 chmod“%s”\n" +"%s" #, c-format msgid "" "Cannot chown \"%s\"\n" "%s" msgstr "" -"无法 chown \"%s\"\n" -"%s " +"无法 chown“%s”\n" +"%s" msgid "Other 8 bit" msgstr "其它 8 位" @@ -1653,7 +1654,7 @@ msgstr "从不(&N)" msgid "On dum&b terminals" -msgstr "在哑终端上(&b)" +msgstr "在简易终端上(&b)" msgid "Alwa&ys" msgstr "总是(&Y)" @@ -1677,16 +1678,16 @@ msgstr "预分配空间(&P)" msgid "Esc key mode" -msgstr "ESC键模式" +msgstr "ESC 键模式" msgid "S&ingle press" msgstr "按下单个键(&I)" msgid "Timeout:" -msgstr "超时：" +msgstr "超时: " msgid "Pause after run" -msgstr "运行后暂停..." +msgstr "运行后暂停" msgid "Use internal edi&t" msgstr "使用内部编辑器(&T)" @@ -1704,10 +1705,10 @@ msgstr "下拉菜单(&D)" msgid "S&hell patterns" -msgstr "" +msgstr "S&hell 通配符" msgid "Co&mplete: show all" -msgstr "完全：显示全部(&M)" +msgstr "完全: 显示全部(&M)" msgid "Rotating d&ash" msgstr "旋转线(&A)" @@ -1731,7 +1732,7 @@ msgstr "使用面板排序模式(&D)" msgid "Show mi&ni-status" -msgstr "显示最少状态 (&N)" +msgstr "显示最少状态(&N)" msgid "Use SI si&ze units" msgstr "使用SI大小单位(&Z)" @@ -1746,7 +1747,7 @@ msgstr "显示隐藏文件(&H)" msgid "&Fast dir reload" -msgstr "快速重载入目录(&F)" +msgstr "快速重载目录(&F)" msgid "Ma&rk moves down" msgstr "标记文件后光标下移(&R)" @@ -1755,7 +1756,7 @@ msgstr "仅反选文件(&V)" msgid "Simple s&wap" -msgstr "简单交换 (&W)" +msgstr "简单交换(&W)" msgid "A&uto save panels setup" msgstr "自动保存面板设置(&U)" @@ -1796,9 +1797,9 @@ "manual reload of the directory. See the man page for\n" "the details." msgstr "" -"使用快速重载选项可能不能反映目录的真实内容。在这种\n" -"情况下，您需要手工刷新目录的内容。请参考手册获得详细\n" -"的信息。 " +"使用快速重载选项可能无法反映目录的真实内容。\n" +"在这种情况下，您需要手工刷新目录的内容。\n" +"请参考手册获得详细的信息。" msgid "&Full file list" msgstr "完整文件列表(&F)" @@ -1810,7 +1811,7 @@ msgstr "长文件列表(&L)" msgid "&User defined:" -msgstr "用户自定义(&U)：" +msgstr "用户自定义(&U): " msgid "User &mini status" msgstr "用户简要状态(&M)" @@ -1832,7 +1833,7 @@ msgstr "Confirmation|删除(&D)" msgid "Confirmation|O&verwrite" -msgstr "Confirmation|覆盖时(&V) " +msgstr "Confirmation|覆盖时(&V)" msgid "Confirmation|&Execute" msgstr "Confirmation|执行(&E)" @@ -1868,7 +1869,7 @@ msgstr "显示位" msgid "Input / display codepage:" -msgstr "输入/显示代码页：" +msgstr "输入/显示代码页: " msgid "&Select" msgstr "选择(&S)" @@ -1877,19 +1878,19 @@ msgstr "目录树" msgid "Timeout for freeing VFSs (sec):" -msgstr "释放 VFSs 超时(秒)：" +msgstr "释放 VFS 超时(秒): " msgid "FTP anonymous password:" -msgstr "FTP 匿名密码：" +msgstr "FTP 匿名密码: " msgid "FTP directory cache timeout (sec):" -msgstr "FTP 目录缓存超时(秒)：" +msgstr "FTP 目录缓存超时(秒): " msgid "&Always use ftp proxy:" -msgstr "总是使用FTP代理(&A)：" +msgstr "总是使用 FTP 代理(&A): " msgid "&Use ~/.netrc" -msgstr "使用~/.netrc(&U)" +msgstr "使用 ~/.netrc(&U)" msgid "Use &passive mode" msgstr "使用被动模式(&P)" @@ -1907,10 +1908,10 @@ msgstr "快速切换目录" msgid "Existing filename (filename symlink will point to):" -msgstr "已存在文件名(文件名符号链接指向)：" +msgstr "已存在文件名(文件名符号链接指向): " msgid "Symbolic link filename:" -msgstr "符号链接文件名：" +msgstr "符号链接文件名: " msgid "Symbolic link" msgstr "符号链接" @@ -1929,64 +1930,64 @@ #, c-format msgid "Password for \\\\%s\\%s" -msgstr "\\\\%s\\%s 的口令" +msgstr "\\\\%s\\%s 的密码" msgid "Domain:" -msgstr "域：" +msgstr "域: " msgid "Username:" -msgstr "用户名：" +msgstr "用户名: " msgid "SMB authentication" msgstr "SMB 认证" msgid "set &user ID on execution" -msgstr "执行时设置用户ID(&U)" +msgstr "执行时设置用户 ID(&U)" msgid "set &group ID on execution" -msgstr "执行时设置组ID(&G)" +msgstr "执行时设置组 ID(&G)" msgid "stick&y bit" msgstr "防删位(&Y)" msgid "&read by owner" -msgstr "" +msgstr "所有者读取(&R)" msgid "&write by owner" -msgstr "" +msgstr "所有者写入(&W)" msgid "e&xecute/search by owner" -msgstr "" +msgstr "所有者执行/搜索(&X)" msgid "rea&d by group" -msgstr "" +msgstr "用户组读取(&D)" msgid "write by grou&p" -msgstr "" +msgstr "用户组写入(&P)" msgid "execu&te/search by group" -msgstr "" +msgstr "用户组执行/搜索(&T)" msgid "read &by others" -msgstr "" +msgstr "其他人读取(&B)" msgid "wr&ite by others" -msgstr "" +msgstr "其他人写入(&I)" msgid "execute/searc&h by others" -msgstr "" +msgstr "其他人执行/搜索(&H)" msgid "Name:" -msgstr "名字：" +msgstr "名字: " msgid "Permissions (octal):" -msgstr "权限(八进制):" +msgstr "权限(8进制): " msgid "Owner name:" -msgstr "所有者名字：" +msgstr "所有者名字: " msgid "Group name:" -msgstr "组名字：" +msgstr "组名字: " msgid "&Marked all" msgstr "全部标记(&M)" @@ -2025,7 +2026,7 @@ msgstr "大小" msgid "Chown command" -msgstr "Chown命令" +msgstr "Chown 命令" msgid "User name" msgstr "用户名" @@ -2037,10 +2038,10 @@ msgstr "<未知群组>" msgid "Enter machine name (F1 for details):" -msgstr "输入机器名(F1 查看细节)：" +msgstr "输入机器名 (F1 查看细节): " msgid "Files tagged, want to cd?" -msgstr "文件已经标记，要更改目录吗？" +msgstr "文件已经标记，要更改目录吗?" msgid "Cannot change directory" msgstr "无法改变目录" @@ -2062,34 +2063,34 @@ #, c-format msgid "Link %s to:" -msgstr "链接%s到：" +msgstr "链接 %s 到: " msgid "Link" msgstr "链接" #, c-format msgid "link: %s" -msgstr "链接：%s" +msgstr "链接: %s" #, c-format msgid "symlink: %s" -msgstr "符号链接：%s" +msgstr "符号链接: %s" #, c-format msgid "Cannot chdir to \"%s\"" -msgstr "无法进入目录\"%s\"" +msgstr "无法进入目录“%s”" msgid "View file" msgstr "查看文件" msgid "Filename:" -msgstr "文件名：" +msgstr "文件名: " msgid "Filtered view" msgstr "过滤视图" msgid "Filter command and arguments:" -msgstr "过滤命令和参数：" +msgstr "过滤命令和参数: " msgid "Edit file" msgstr "编辑文件" @@ -2098,7 +2099,7 @@ msgstr "创建新目录" msgid "Enter directory name:" -msgstr "输入目录名字：" +msgstr "输入目录名称: " msgid "Select" msgstr "选择" @@ -2110,7 +2111,7 @@ msgstr "扩展文件编辑" msgid "Which extension file you want to edit?" -msgstr "您要编辑哪个扩展文件？" +msgstr "您要编辑哪个扩展文件?" msgid "&System Wide" msgstr "系统范围(&S)" @@ -2119,13 +2120,13 @@ msgstr "突出显示组文件编辑" msgid "Which highlighting file you want to edit?" -msgstr "您要编辑哪个突出显示的文件？" +msgstr "您要编辑哪个突出显示的文件?" msgid "Compare directories" msgstr "比较目录" msgid "Select compare method:" -msgstr "选择比较方法：" +msgstr "选择比较方法: " msgid "&Quick" msgstr "快速(&Q)" @@ -2139,7 +2140,9 @@ msgid "" "Both panels should be in the listing mode\n" "to use this command" -msgstr "要使用该命令，两个面板必需都是列表视图模式" +msgstr "" +"若要使用该命令，\n" +"两个面板必需都处于列表视图模式" msgid "" "Not an xterm or Linux console;\n" @@ -2150,34 +2153,34 @@ #, c-format msgid "Symlink '%s' points to:" -msgstr "符号链接 '%s' 指向：" +msgstr "符号链接“%s”指向: " msgid "Edit symlink" msgstr "编辑符号链接" #, c-format msgid "edit symlink, unable to remove %s: %s" -msgstr "编辑符号链接，无法删除 %s：%s" +msgstr "编辑符号链接，无法删除 %s: %s" #, c-format msgid "edit symlink: %s" -msgstr "编辑符号链接：%s" +msgstr "编辑符号链接: %s" #, c-format msgid "'%s' is not a symbolic link" -msgstr "'%s' 不是一个符号链接" +msgstr "“%s”不是一个符号链接" msgid "FTP to machine" -msgstr "FTP 到机器" +msgstr "FTP 到主机" msgid "SFTP to machine" msgstr "SFTP 到主机" msgid "Shell link to machine" -msgstr "Shell链接到机器" +msgstr "Shell 链接到主机" msgid "SMB link to machine" -msgstr "SMB 链接到机器" +msgstr "SMB 链接到主机" msgid "Undelete files on an ext2 file system" msgstr "反删除 ext2 文件系统上的文件" @@ -2198,7 +2201,7 @@ #, c-format msgid "Unable to save setup to %s" -msgstr "设置不能保存到 %s" +msgstr "无法保存设置到 %s" msgid "Cannot execute commands on non-local filesystems" msgstr "您无法在非本地文件系统上执行命令" @@ -2208,7 +2211,7 @@ "Cannot chdir to \"%s\"\n" "%s" msgstr "" -"无法进入目录\"%s\"\n" +"无法进入目录“%s”\n" "%s" msgid "Cannot read directory contents" @@ -2227,7 +2230,7 @@ #, c-format msgid " %s%s file error" -msgstr " %s%s文件错误 " +msgstr " %s%s 文件错误" #, c-format msgid "" @@ -2235,8 +2238,8 @@ "the installation failed. Please fetch a fresh copy from the Midnight " "Commander package." msgstr "" -"文件%smc.ext的格式在3.0版本时已经被修改。似乎安装有错误。请获取新的Midnight " -"Commander软件包。" +"文件 %smc.ext 的格式在3.0版本时已经被修改。似乎安装有错误。请获取新的" +"Midnight Commander软件包。" #, c-format msgid "%s file error" @@ -2270,7 +2273,7 @@ #, no-c-format msgid "%o %f \"%s\"%m" -msgstr "%o %f \"%s\"%m" +msgstr "%o %f “%s”%m" #, no-c-format msgid "%o %d %f%m" @@ -2293,32 +2296,32 @@ #. TRANSLATORS: keep leading space here to split words in Copy/Move dialog msgid " with source mask:" -msgstr " 源掩码：" +msgstr " 源掩码: " msgid "to:" -msgstr "至：" +msgstr "至: " #, c-format msgid "%s?" msgstr "%s?" msgid "Cannot make the hardlink" -msgstr "无法创建硬链接 " +msgstr "无法创建硬链接" #, c-format msgid "" "Cannot read source link \"%s\"\n" "%s" msgstr "" -"无法读取源链接\"%s\"\n" -"%s " +"无法读取源链接“%s”\n" +"%s" msgid "" "Cannot make stable symlinks acrossnon-local filesystems:\n" "\n" "Option Stable Symlinks will be disabled" msgstr "" -"无法在非本地文件系统上创建稳定的符号链接：\n" +"无法在非本地文件系统上创建稳定的符号链接: \n" "\n" "稳定的符号链接选项将被取消" @@ -2327,14 +2330,14 @@ "Cannot create target symlink \"%s\"\n" "%s" msgstr "" -"无法创建目标符号链接\"%s\"\n" -"%s " +"无法创建目标符号链接“%s”\n" +"%s" msgid "&Abort" msgstr "中止(&A)" msgid "Ski&p all" -msgstr "路过全部 (&I)" +msgstr "路过全部(&I)" msgid "&Retry" msgstr "重试(&R)" @@ -2344,8 +2347,8 @@ "Directory \"%s\" not empty.\n" "Delete it recursively?" msgstr "" -"目录 \"%s\" 不为空。\n" -"递归删除其中内容？" +"目录“%s”不为空。\n" +"递归删除其中内容?" #, c-format msgid "" @@ -2353,9 +2356,9 @@ "Directory \"%s\" not empty.\n" "Delete it recursively?" msgstr "" -"后台进程：\n" -"目录 \"%s\" 不为空。\n" -"递归删除其中内容？" +"后台进程: \n" +"目录“%s”不为空。\n" +"递归删除其中内容?" msgid "Non&e" msgstr "无(&E)" @@ -2365,7 +2368,7 @@ "Cannot stat file \"%s\"\n" "%s" msgstr "" -"无法 stat 文件\"%s\"\n" +"无法 stat 文件“%s”\n" "%s" #, c-format @@ -2375,37 +2378,37 @@ "\"%s\"\n" "are the same file" msgstr "" -"\"%s\"\n" +"“%s”\n" "和\n" -"\"%s\"\n" -"是同一个文件 " +"“%s”\n" +"是同一个文件" #, c-format msgid "Cannot overwrite directory \"%s\"" -msgstr "无法覆盖目录\"%s\"" +msgstr "无法覆盖目录“%s”" #, c-format msgid "" "Cannot move file \"%s\" to \"%s\"\n" "%s" msgstr "" -"无法移动文件\"%s\"到\"%s\"\n" -"%s " +"无法移动文件“%s”到“%s”\n" +"%s" #, c-format msgid "" "Cannot remove file \"%s\"\n" "%s" msgstr "" -"无法删除文件\"%s\"\n" -"%s " +"无法删除文件“%s”\n" +"%s" #, c-format msgid "" "Cannot delete file \"%s\"\n" "%s" msgstr "" -"无法删除文件\"%s\"\n" +"无法删除文件“%s”\n" "%s" #, c-format @@ -2413,7 +2416,7 @@ "Cannot remove directory \"%s\"\n" "%s" msgstr "" -"无法删除目录\"%s\"\n" +"无法删除目录“%s”\n" "%s" #, c-format @@ -2421,7 +2424,7 @@ "Cannot overwrite directory \"%s\"\n" "%s" msgstr "" -"无法覆盖目录\"%s\"\n" +"无法覆盖目录“%s”\n" "%s" #, c-format @@ -2429,7 +2432,7 @@ "Cannot stat source file \"%s\"\n" "%s" msgstr "" -"无法 stat 源文件\"%s\"\n" +"无法 stat 源文件“%s”\n" "%s" #, c-format @@ -2437,7 +2440,7 @@ "Cannot create special file \"%s\"\n" "%s" msgstr "" -"无法创建特殊文件\"%s\"\n" +"无法创建特殊文件“%s”\n" "%s" #, c-format @@ -2445,7 +2448,7 @@ "Cannot chown target file \"%s\"\n" "%s" msgstr "" -"无法 chown 目标文件\"%s\"\n" +"无法 chown 目标文件“%s”\n" "%s" #, c-format @@ -2453,15 +2456,15 @@ "Cannot chmod target file \"%s\"\n" "%s" msgstr "" -"无法 chmod 目标文件\"%s\"\n" -"%s " +"无法 chmod 目标文件“%s”\n" +"%s" #, c-format msgid "" "Cannot open source file \"%s\"\n" "%s" msgstr "" -"无法打开源文件\"%s\"\n" +"无法打开源文件“%s”\n" "%s" msgid "Reget failed, about to overwrite file" @@ -2472,7 +2475,7 @@ "Cannot fstat source file \"%s\"\n" "%s" msgstr "" -"无法 fstat 源文件\"%s\"\n" +"无法 fstat 源文件“%s”\n" "%s" #, c-format @@ -2480,7 +2483,7 @@ "Cannot create target file \"%s\"\n" "%s" msgstr "" -"无法创建目标文件\"%s\"\n" +"无法创建目标文件“%s”\n" "%s" #, c-format @@ -2496,7 +2499,7 @@ "Cannot preallocate space for target file \"%s\"\n" "%s" msgstr "" -"不能预分配空间给目标文件 \"%s\"\n" +"无法预分配空间给目标文件 “%s”\n" "%s" #, c-format @@ -2504,7 +2507,7 @@ "Cannot read source file\"%s\"\n" "%s" msgstr "" -"无法读取源文件\"%s\"\n" +"无法读取源文件“%s”\n" "%s" #, c-format @@ -2512,7 +2515,7 @@ "Cannot write target file \"%s\"\n" "%s" msgstr "" -"无法写入目标文件\"%s\"\n" +"无法写入目标文件“%s”\n" "%s" msgid "(stalled)" @@ -2523,7 +2526,7 @@ "Cannot close source file \"%s\"\n" "%s" msgstr "" -"无法关闭源文件\"%s\"\n" +"无法关闭源文件“%s”\n" "%s" #, c-format @@ -2531,11 +2534,11 @@ "Cannot close target file \"%s\"\n" "%s" msgstr "" -"无法关闭目标文件\"%s\"\n" +"无法关闭目标文件“%s”\n" "%s" msgid "Incomplete file was retrieved. Keep it?" -msgstr "文件没有完整获取。保留它吗？" +msgstr "文件没有完整获取。保留它吗?" msgid "&Keep" msgstr "保留(&K)" @@ -2545,7 +2548,7 @@ "Cannot stat source directory \"%s\"\n" "%s" msgstr "" -"无法 stat 源目录\"%s\"\n" +"无法 stat 源目录“%s”\n" "%s" #, c-format @@ -2553,7 +2556,7 @@ "Source \"%s\" is not a directory\n" "%s" msgstr "" -"源\"%s\"不是一个目录\n" +"源“%s”不是一个目录\n" "%s" #, c-format @@ -2562,22 +2565,22 @@ "\"%s\"" msgstr "" "无法复制循环的符号链接\n" -"\"%s\"" +"“%s”" #, c-format msgid "" "Destination \"%s\" must be a directory\n" "%s" msgstr "" -"目标\"%s\"必需是一个目录\n" -"%s " +"目标“%s”必需是一个目录\n" +"%s" #, c-format msgid "" "Cannot create target directory \"%s\"\n" "%s" msgstr "" -"无法创建目标目录\"%s\"\n" +"无法创建目标目录“%s”\n" "%s" #, c-format @@ -2585,8 +2588,8 @@ "Cannot chown target directory \"%s\"\n" "%s" msgstr "" -"无法 chown 目标目录\"%s\"\n" -"%s " +"无法 chown 目标目录“%s”\n" +"%s" #, c-format msgid "" @@ -2595,9 +2598,9 @@ "\"%s\"\n" "are the same directory" msgstr "" -"\"%s\"\n" +"“%s”\n" "和\n" -"\"%s\"\n" +"“%s”\n" "是同一个目录" #, c-format @@ -2605,7 +2608,7 @@ "Cannot overwrite file \"%s\"\n" "%s" msgstr "" -"无法覆盖文件\"%s\"\n" +"无法覆盖文件“%s”\n" "%s" #, c-format @@ -2613,7 +2616,7 @@ "Cannot move directory \"%s\" to \"%s\"\n" "%s" msgstr "" -"无法移动目录\"%s\"到\"%s\"\n" +"无法移动目录“%s”到“%s”\n" "%s" msgid "Directory scanning" @@ -2625,10 +2628,10 @@ "Directories: %zd, total size: %s" msgstr "" "%s\n" -"目录：%zd, 总体积：%s" +"目录: %zd, 总体积: %s" msgid "Cannot operate on \"..\"!" -msgstr "无法操作\"..\"！" +msgstr "无法操作\"..\"!" msgid "Sorry, I could not put the job in background" msgstr "抱歉，无法将任务放到后台" @@ -2645,7 +2648,7 @@ #, c-format msgid "ETA %s" -msgstr "估计%s" +msgstr "估计完成时间 %s" #, c-format msgid "%.2f MB/s" @@ -2660,18 +2663,18 @@ msgstr "%ld B/s" msgid "Target file already exists!" -msgstr "目标文件已存在！" +msgstr "目标文件已存在!" #, c-format msgid "New : %s, size %s" -msgstr "" +msgstr "新文件: %s，体积 %s" #, c-format msgid "Existing: %s, size %s" -msgstr "" +msgstr "原文件: %s，体积%s" msgid "Overwrite this target?" -msgstr "覆盖该目标？" +msgstr "覆盖该目标?" msgid "A&ppend" msgstr "追加(&P)" @@ -2680,7 +2683,7 @@ msgstr "重新获取(&R)" msgid "Overwrite all targets?" -msgstr "覆盖所有目标？" +msgstr "覆盖所有目标?" msgid "&Update" msgstr "更新(&U)" @@ -2692,42 +2695,42 @@ msgstr "文件已存在" msgid "Background process: File exists" -msgstr "后台进程：文件已存在" +msgstr "后台进程: 文件已存在" #, c-format msgid "Files processed: %zu/%zu" -msgstr "处理的文件：%zu/%zu" +msgstr "已处理文件: %zu/%zu" #, c-format msgid "Files processed: %zu" -msgstr "处理的文件：%zu" +msgstr "已处理文件: %zu" #, c-format msgid "Time: %s %s" -msgstr "时间：%s %s" +msgstr "时间: %s %s" #, c-format msgid "Time: %s %s (%s)" -msgstr "时间：%s %s (%s)" +msgstr "时间: %s %s (%s)" #, c-format msgid "Time: %s" -msgstr "时间：%s" +msgstr "时间: %s" #, c-format msgid "Time: %s (%s)" -msgstr "时间：%s (%s)" +msgstr "时间: %s (%s)" #, c-format msgid " Total: %s " -msgstr "总共：%s" +msgstr " 总共: %s " #, c-format msgid " Total: %s/%s " -msgstr "总共：%s/%s " +msgstr " 总共: %s/%s " msgid "Source" -msgstr "源" +msgstr "来源" msgid "Target" msgstr "目标" @@ -2742,14 +2745,14 @@ msgstr "如果有子目录则进入(&V)" msgid "&Stable symlinks" -msgstr "" +msgstr "简化符号链接(&S)" msgid "&Background" msgstr "后台(&B)" #, c-format msgid "Invalid source pattern '%s'" -msgstr "源模式 '%s' 无效" +msgstr "源模式“%s”无效" msgid "&Chdir" msgstr "改目录(&C)" @@ -2774,7 +2777,7 @@ msgstr "不正确的正规表达式" msgid "File name:" -msgstr "文件名：" +msgstr "文件名: " msgid "&Find recursively" msgstr "递归查找(&F)" @@ -2783,7 +2786,7 @@ msgstr "跳过隐藏(&K)" msgid "Content:" -msgstr "内容：" +msgstr "内容: " msgid "Sea&rch for content" msgstr "搜索内容(&R)" @@ -2804,14 +2807,14 @@ msgstr "搜索文件" msgid "Start at:" -msgstr "开始于：" +msgstr "开始于: " msgid "Ena&ble ignore directories:" -msgstr "启用忽略目录(&B)：" +msgstr "启用忽略目录(&B): " #, c-format msgid "Grepping in %s" -msgstr "在%s中查找字符串" +msgstr "在 %s 中查找字符串" msgid "Finished" msgstr "完成" @@ -2819,7 +2822,7 @@ #, c-format msgid "Finished (ignored %zd directory)" msgid_plural "Finished (ignored %zd directories)" -msgstr[0] "完成 (忽略 %zd 目录\t)" +msgstr[0] "完成 (忽略 %zd 个目录)" #, c-format msgid "Searching %s" @@ -2832,7 +2835,7 @@ msgstr "切换到(&T)" msgid "&Free VFSs now" -msgstr "立刻释放 VFSs (&F)" +msgstr "立刻释放 VFS (&F)" msgid "&Refresh" msgstr "刷新(&R)" @@ -2884,28 +2887,28 @@ msgstr "新建活动表条目" msgid "Directory label:" -msgstr "目录标签：" +msgstr "目录标签: " msgid "Directory path:" -msgstr "目录路径：" +msgstr "目录路径: " msgid "New hotlist group" msgstr "新建活动表组" msgid "Name of new group:" -msgstr "新建组名：" +msgstr "新建组名: " #, c-format msgid "Are you sure you want to remove entry \"%s\"?" -msgstr "你确定要删除 \"%s\"?" +msgstr "您确定要删除“%s”?" #, c-format msgid "" "Group \"%s\" is not empty.\n" "Remove it?" msgstr "" -"组 \"%s\" 不是空的。\n" -"要删除它吗？" +"组“%s”不为空。\n" +"要删除它吗?" msgid "Hotlist Load" msgstr "加载活动表" @@ -2916,11 +2919,11 @@ "your old hotlist entries were not deleted" msgstr "" "MC 无法写文件 %s ，\n" -"你旧的活动表条目被删除了" +"您活动表中的旧条目未被删除" #, c-format msgid "Label for \"%s\":" -msgstr "\"%s\"的标签：" +msgstr "“%s”的标签: " msgid "Add to hotlist" msgstr "添加到活动表" @@ -2931,56 +2934,56 @@ #, c-format msgid "File: %s" -msgstr "文件：%s" +msgstr "文件: %s" msgid "No node information" msgstr "没有节点信息" msgid "Free nodes:" -msgstr "空闲结点：" +msgstr "空闲结点: " msgid "No space information" msgstr "没有空间信息" #, c-format msgid "Free space: %s/%s (%d%%)" -msgstr "空余空间：%s/%s (%d%%)" +msgstr "空余空间: %s/%s (%d%%)" #, c-format msgid "Type: %s" -msgstr "类型： %s" +msgstr "类型: %s" msgid "non-local vfs" msgstr "非本地 vfs" #, c-format msgid "Device: %s" -msgstr "设备： %s" +msgstr "设备: %s" #, c-format msgid "Filesystem: %s" -msgstr "文件系统：%s" +msgstr "文件系统: %s" #, c-format msgid "Accessed: %s" -msgstr "访问： %s" +msgstr "最后访问时间: %s" #, c-format msgid "Modified: %s" -msgstr "修改： %s" +msgstr "最后修改时间: %s" #. TRANSLATORS: Time of last status change as in stat(2) man. #, c-format msgid "Changed: %s" -msgstr "改到：%s" +msgstr "创建时间: %s" #, c-format msgid "Dev. type: major %lu, minor %lu" -msgstr "设备类型：主要%lu，次要%lu" +msgstr "设备类型: 主要%lu，次要%lu" #, c-format msgid "Size: %s" -msgstr "大小： %s" +msgstr "文件大小: %s" #, c-format msgid " (%ld block)" @@ -2989,19 +2992,19 @@ #, c-format msgid "Owner: %s/%s" -msgstr "所有者： %s/%s" +msgstr "所有者: %s/%s" #, c-format msgid "Links: %d" -msgstr "链接： %d" +msgstr "链接: %d" #, c-format msgid "Mode: %s (%04o)" -msgstr "模式： %s (%04o)" +msgstr "模式: %s (%04o)" #, c-format msgid "Location: %Xh:%Xh" -msgstr "位置： %Xh:%Xh" +msgstr "位置: %Xh:%Xh" msgid "&Equal split" msgstr "平分(&E)" @@ -3019,7 +3022,7 @@ msgstr "显示提示栏(&I)" msgid "&XTerm window title" -msgstr "Xterm窗口标题(&X)" +msgstr "Xterm 窗口标题(&X)" msgid "&Show free space" msgstr "显示剩余空间(&S)" @@ -3037,7 +3040,7 @@ msgstr "水平(&H)" msgid "Output lines:" -msgstr "输出行：" +msgstr "输出行: " msgid "Layout" msgstr "布局" @@ -3067,7 +3070,7 @@ msgstr "FTP 链接(&P)..." msgid "S&hell link..." -msgstr "S&hell链接..." +msgstr "S&hell 链接..." msgid "S&FTP link..." msgstr "SFTP 链接(&S)..." @@ -3088,7 +3091,7 @@ msgstr "查看文件(&W)..." msgid "&Filtered view" -msgstr " 过滤视图(&F)" +msgstr "过滤视图(&F)" msgid "&Copy" msgstr "复制(&C)" @@ -3106,13 +3109,13 @@ msgstr "相关符号链接(&K)" msgid "Edit s&ymlink" -msgstr " 编辑符号链接 (&Y)" +msgstr "编辑符号链接(&Y)" msgid "Ch&own" msgstr "更改文件所有者(&O)" msgid "&Advanced chown" -msgstr "高级chown(&A) " +msgstr "高级 chown (&A)" msgid "&Rename/Move" msgstr "更名/移动(&R)" @@ -3130,7 +3133,7 @@ msgstr "取消选择组(&U)" msgid "&Invert selection" -msgstr "反选 (&I)" +msgstr "反选(&I)" msgid "E&xit" msgstr "退出(&X)" @@ -3154,7 +3157,7 @@ msgstr "比较目录(&C)" msgid "C&ompare files" -msgstr "比较文件 (&O)" +msgstr "比较文件(&O)" msgid "E&xternal panelize" msgstr "外部面板(&X)" @@ -3169,10 +3172,10 @@ msgstr "目录活动列表(&R)" msgid "&Active VFS list" -msgstr "活动的VFS列表(&A)" +msgstr "活动的 VFS 列表(&A)" msgid "&Background jobs" -msgstr "后台任务（——B）" +msgstr "后台任务(&B)" msgid "Screen lis&t" msgstr "屏幕列表(&T)" @@ -3211,18 +3214,18 @@ msgstr "虚拟文件系统(&V)..." msgid "Panels:" -msgstr "面板：" +msgstr "面板: " #, c-format msgid "You have %zd opened screen. Quit anyway?" msgid_plural "You have %zd opened screens. Quit anyway?" -msgstr[0] "你有 %zd 个打开的屏幕。真的要需要吗？" +msgstr[0] "您有 %zd 个屏幕已打开。确定要退出吗?" msgid "The Midnight Commander" msgstr "Midnight Commander" msgid "Do you really want to quit the Midnight Commander?" -msgstr "您真的要退出 Midnight Commander吗？" +msgstr "您真的要退出 Midnight Commander吗?" msgid "&Above" msgstr "上(&A)" @@ -3249,7 +3252,7 @@ msgstr "ButtonBar|建目录" msgid "Memory exhausted!" -msgstr "内存耗尽！" +msgstr "内存已耗尽!" #. TRANSLATORS: one single character to represent 'unsorted' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix @@ -3292,7 +3295,7 @@ msgstr "大小(&S)" msgid "Block Size" -msgstr "块大小 " +msgstr "块大小" #. TRANSLATORS: one single character to represent 'Modify time' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix @@ -3367,16 +3370,16 @@ #, c-format msgid "%s in %d file" msgid_plural "%s in %d files" -msgstr[0] "%s in %d file" +msgstr[0] "%s 共 %d 个文件" msgid "Panelize" msgstr "面板化" msgid "Unknown tag on display format:" -msgstr "显示格式中未知的标记：" +msgstr "显示格式中未知的标记: " msgid "Do you really want to execute?" -msgstr "您真的要执行吗？" +msgstr "您真的要执行吗?" msgid "User supplied format looks invalid, reverting to default." msgstr "用户提供的格式无效，回复到默认设置。" @@ -3397,7 +3400,7 @@ msgstr "添加到外部面板" msgid "Enter command label:" -msgstr "输入命令标签：" +msgstr "输入命令标签: " msgid "Cannot invoke command." msgstr "无法调用命令。" @@ -3406,10 +3409,10 @@ msgstr "关闭管道失败" msgid "Cannot run external panelize in a non-local directory" -msgstr "在非本地目录不能运行外部面板化" +msgstr "在非本地目录无法执行外部面板" msgid "Modified git files" -msgstr "修改过的git 文件" +msgstr "修改过的 git 文件" msgid "Find rejects after patching" msgstr "应用补丁后查找被拒绝的补丁" @@ -3425,16 +3428,16 @@ "Cannot open the %s file for writing:\n" "%s\n" msgstr "" -"无法打开文件 %s 来写入：\n" +"无法打开文件 %s 来写入: \n" "%s\n" #, c-format msgid "Copy \"%s\" directory to:" -msgstr "复制目录\"%s\"到：" +msgstr "复制目录“%s”到: " #, c-format msgid "Move \"%s\" directory to:" -msgstr "移动目录\"%s\"到：" +msgstr "移动目录“%s”到: " #, c-format msgid "" @@ -3446,7 +3449,7 @@ #, c-format msgid "Delete %s?" -msgstr "删除 %s？ " +msgstr "删除 %s?" msgid "ButtonBar|Static" msgstr "ButtonBar|静态" @@ -3468,20 +3471,20 @@ "Cannot write to the %s file:\n" "%s\n" msgstr "" -"无法写入 %s 文件：\n" +"无法写入 %s 文件: \n" "%s\n" msgid "Debug" msgstr "调试" msgid "ERROR:" -msgstr "错误：" +msgstr "错误: " msgid "True:" -msgstr "正确：" +msgstr "正确: " msgid "False:" -msgstr "错误：" +msgstr "错误: " msgid "Error calling program" msgstr "调用程序错误" @@ -3513,7 +3516,7 @@ "Cannot open file%s\n" "%s" msgstr "" -"无法打开文件%s\n" +"无法打开文件 %s\n" "%s" #, c-format @@ -3527,7 +3530,7 @@ msgstr "帮助文件格式错误\n" msgid "Internal bug: Double start of link area" -msgstr "内部缺陷：链接区域双向开始" +msgstr "内部缺陷: 链接区域双向开始" #, c-format msgid "Cannot find node %s in help file" @@ -3559,7 +3562,7 @@ "If you want to escape, press a single Escape key\n" "and wait as well." msgstr "" -"按下%s\n" +"按下 %s\n" "并等待这个消息消失。\n" "\n" "然后再次按下它并看确认是否出现\n" @@ -3573,7 +3576,7 @@ #, c-format msgid "You have entered \"%s\"" -msgstr "您输入了\"%s\"" +msgstr "您输入了“%s”" #. TRANSLATORS: This label appears near learned keys. Keep it short. msgid "OK" @@ -3593,7 +3596,7 @@ "Great! You have a complete terminal database!\n" "All your keys work well." msgstr "" -"非常好！您有一个完整的终端数据库！\n" +"非常好! 您有一个完整的终端数据库!\n" "您的所有按键都工作。" msgid "" @@ -3601,7 +3604,7 @@ "which keys are not marked with OK. Press space on the missing\n" "key, or click with the mouse to define it. Move around with Tab." msgstr "" -"请将这里提到的所有键都按一遍。按完之后。请检查：\n" +"请将这里提到的所有键都按一遍。按完之后。请检查: \n" "哪些键没有标记为OK。在缺失的键位上按空格\n" "或单击鼠标定义它。移动请使用空格键。" @@ -3610,7 +3613,7 @@ "Failed to run:\n" "%s\n" msgstr "" -"运行失败：\n" +"运行失败: \n" "%s\n" msgid "Home directory path is not absolute" @@ -3623,7 +3626,7 @@ "%s\n" msgstr "" "\n" -"关闭失败：\n" +"关闭时失败: \n" "%s\n" msgid "Choose codepage" @@ -3643,7 +3646,7 @@ "Cannot save file %s:\n" "%s" msgstr "" -"不能保存文件%s:\n" +"无法保存文件 %s:\n" "%s" msgid "" @@ -3651,23 +3654,23 @@ "running on this terminal.\n" "Subshell support will be disabled." msgstr "" -"GNU Midnight Commander正在\n" -"该终端运行。\n" -"Subshell支持被禁止." +"GNU Midnight Commander 已在\n" +"该终端上运行。\n" +"SubShell支持将被禁用。" #, c-format msgid "Cannot open named pipe %s\n" msgstr "无法打开有名管道 %s\n" msgid "The shell is still active. Quit anyway?" -msgstr "shell 仍然活动。依然退出？" +msgstr "Shell 仍在运行中。依然退出?" #, c-format msgid "Warning: Cannot change to %s.\n" -msgstr "警告：无法换到 %s。\n" +msgstr "警告: 无法切换至 %s。\n" msgid "Using the S-Lang library with terminfo database\n" -msgstr "与terminfo数据库一起使用S-Lang程序库\n" +msgstr "使用 S-Lang 库和 terminfo 数据库\n" msgid "Using the ncurses library\n" msgstr "使用 ncurses 库\n" @@ -3676,74 +3679,74 @@ msgstr "使用 ncursesw 库\n" msgid "With builtin Editor\n" -msgstr "内建编辑器\n" +msgstr "使用内建编辑器\n" msgid "With optional subshell support\n" -msgstr "可选的子 shell 支持\n" +msgstr "启用子 shell 支持作为可选项\n" msgid "With subshell support as default\n" -msgstr "默认支持子 shell\n" +msgstr "启用子 shell 支持作为默认项\n" msgid "With support for background operations\n" -msgstr "后台操作支持\n" +msgstr "启用后台操作支持\n" msgid "With mouse support on xterm and Linux console\n" -msgstr "xterm 和 Linux 控制台里的鼠标支持\n" +msgstr "启用 xterm 和 Linux 控制台里的鼠标支持\n" msgid "With mouse support on xterm\n" -msgstr "xterm 里鼠标支持\n" +msgstr "启用 xterm 里鼠标支持\n" msgid "With support for X11 events\n" -msgstr "X11 事件支持\n" +msgstr "启用 X11 事件支持\n" msgid "With internationalization support\n" -msgstr "国际化支持\n" +msgstr "启用国际化支持\n" msgid "With multiple codepages support\n" -msgstr "多代码页支持\n" +msgstr "启用多代码页支持\n" #, c-format msgid "Built with GLib %d.%d.%d\n" -msgstr "由 GLib %d.%d.%d 构建\n" +msgstr "编译使用了 GLib %d.%d.%d\n" #, c-format msgid "Virtual File Systems:" -msgstr "虚拟文件系统:" +msgstr "虚拟文件系统: " #, c-format msgid "Data types:" -msgstr "数据类型" +msgstr "数据类型: " msgid "Root directory:" -msgstr "根目录：" +msgstr "根目录: " msgid "System data" msgstr "系统数据" msgid "Config directory:" -msgstr "配置目录" +msgstr "配置目录: " msgid "Data directory:" -msgstr "数据目录" +msgstr "数据目录: " msgid "File extension handlers:" -msgstr "文件扩展名处理程序：" +msgstr "文件扩展名处理程序: " msgid "VFS plugins and scripts:" -msgstr "VFS 插件和脚本：" +msgstr "VFS 插件和脚本: " msgid "User data" msgstr "用户数据" msgid "Cache directory:" -msgstr "缓存目录" +msgstr "缓存目录: " #, c-format msgid "" "Cannot open cpio archive\n" "%s" msgstr "" -"无法打开 cpio 归档\n" +"无法打开 cpio 档案\n" "%s" #, c-format @@ -3751,7 +3754,7 @@ "Premature end of cpio archive\n" "%s" msgstr "" -"过早结束的cpio 归档\n" +"过早结束的 cpio 档案\n" "%s" #, c-format @@ -3761,15 +3764,14 @@ "in cpio archive\n" "%s" msgstr "" -"在 cpio 归档\n" +"cpio 档案\n" "%2$s\n" -"中有不一致的\n" -"%1$s\n" -"的硬链接" +"中发现不一致的硬链接\n" +"%1$s" #, c-format msgid "%s contains duplicate entries! Skipping!" -msgstr "%s 含有重复的项！正在跳过！" +msgstr "%s 含有重复的项! 正在跳过!" #, c-format msgid "" @@ -3792,106 +3794,106 @@ "Cannot open %s archive\n" "%s" msgstr "" -"无法打开 %s 归档\n" +"无法打开 %s 档案\n" "%s" msgid "Inconsistent extfs archive" -msgstr "不完整的 extfs 归档" +msgstr "不完整的 extfs 档案" #, c-format msgid "Warning: cannot open %s directory\n" -msgstr "警告：无法打开目录%s\n" +msgstr "警告: 无法打开目录 %s\n" #, c-format msgid "fish: Disconnecting from %s" -msgstr "fish：正在从 %s 断开连接" +msgstr "fish: 正在从 %s 断开连接" msgid "fish: Waiting for initial line..." -msgstr "fish：正在等待初始化行..." +msgstr "fish: 正在等待初始化行..." msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "抱歉，目前无法创建口令验证连接。" +msgstr "抱歉，目前无法建立密码验证的连接。" #, c-format msgid "fish: Password is required for %s" -msgstr "fish：%s 需要口令" +msgstr "fish: %s 需要密码" msgid "fish: Sending password..." -msgstr "fish：正在发送口令..." +msgstr "fish: 正在发送密码..." msgid "fish: Sending initial line..." -msgstr "fish：正在发送初始化行..." +msgstr "fish: 正在发送初始化行..." msgid "fish: Handshaking version..." -msgstr "fish：正在握手版本..." +msgstr "fish: 正在握手，协商版本..." msgid "fish: Getting host info..." -msgstr "fish：获取主机信息..." +msgstr "fish: 正在获取主机信息..." #, c-format msgid "fish: Reading directory %s..." -msgstr "fish：正在读取目录 %s..." +msgstr "fish: 正在读取目录 %s..." #, c-format msgid "%s: done." -msgstr "%s：完成" +msgstr "%s: 完成。" #, c-format msgid "%s: failure" -msgstr "%s：失败" +msgstr "%s: 失败" #, c-format msgid "fish: store %s: sending command..." -msgstr "fish：保存 %s：正在发送命令..." +msgstr "fish: 保存 %s: 正在发送命令..." msgid "fish: Local read failed, sending zeros" -msgstr "fish：本地读取失败，正在发送零" +msgstr "fish: 本地读取失败，正在发送零" msgid "fish: storing file" -msgstr "fish: 保存文件中" +msgstr "fish: 正在保存文件" msgid "Aborting transfer..." msgstr "正在中止传输..." msgid "Error reported after abort." -msgstr "中止后有错误。" +msgstr "中止后发生错误。" msgid "Aborted transfer would be successful." msgstr "被中止的传输可能成功完成了。" #, c-format msgid "ftpfs: Disconnecting from %s" -msgstr "ftpfs：正在断开到 %s 的连接" +msgstr "ftpfs: 正在断开到 %s 的连接" #, c-format msgid "FTP: Password required for %s" -msgstr "FTP：%s 需要口令 " +msgstr "FTP: %s 需要密码" msgid "ftpfs: sending login name" -msgstr "ftpfs：正在发送用户登录名" +msgstr "ftpfs: 正在发送用户登录名" msgid "ftpfs: sending user password" -msgstr "ftpfs：正在发送用户口令" +msgstr "ftpfs: 正在发送用户密码" #, c-format msgid "FTP: Account required for user %s" -msgstr "FTP：用户%s需要账户 " +msgstr "FTP: 用户 %s 需要账户" msgid "Account:" msgstr "账户" msgid "ftpfs: sending user account" -msgstr "ftpfs：正在发送用户账户" +msgstr "ftpfs: 正在发送用户账户" msgid "ftpfs: logged in" -msgstr "ftpfs：已登录" +msgstr "ftpfs: 已登录" #, c-format msgid "ftpfs: Login incorrect for user %s " -msgstr "ftpfs：用户 %s 登录不正确" +msgstr "ftpfs: 用户 %s 登录不正确" msgid "ftpfs: Invalid host name." -msgstr "ftpfs：无效的主机名。" +msgstr "ftpfs: 无效的主机名。" #, c-format msgid "ftpfs: %s" @@ -3899,51 +3901,51 @@ #, c-format msgid "ftpfs: making connection to %s" -msgstr "ftpfs：正在连接 %s" +msgstr "ftpfs: 正在连接 %s" msgid "ftpfs: connection interrupted by user" -msgstr "ftpfs：连接被用户中断" +msgstr "ftpfs: 连接被用户中断" #, c-format msgid "ftpfs: connection to server failed: %s" -msgstr "ftpfs：连接服务器失败：%s" +msgstr "ftpfs: 连接服务器失败: %s" #, c-format msgid "Waiting to retry... %d (Control-G to cancel)" msgstr "等待重试... %d (Ctrl-G 取消)" msgid "ftpfs: invalid address family" -msgstr "ftpfs：无效的地址族" +msgstr "ftpfs: 无效的地址族" #, c-format msgid "ftpfs: could not create socket: %s" -msgstr "ftpfs: 无法创建套接字：%s " +msgstr "ftpfs: 无法创建套接字: %s" msgid "ftpfs: could not setup passive mode" -msgstr "ftpfs：无法设置为被动模式" +msgstr "ftpfs: 无法设置为被动模式" msgid "ftpfs: aborting transfer." -msgstr "ftpfs：正在中止传输。" +msgstr "ftpfs: 正在中止传输。" #, c-format msgid "ftpfs: abort error: %s" -msgstr "ftpfs：中止错误：%s" +msgstr "ftpfs: 中止错误: %s" msgid "ftpfs: abort failed" -msgstr "ftpfs：终止失败" +msgstr "ftpfs: 终止失败" msgid "ftpfs: CWD failed." -msgstr "ftpfs：CWD 失败。" +msgstr "ftpfs: CWD 失败。" msgid "ftpfs: couldn't resolve symlink" -msgstr "ftpfs：无法解析符号链接" +msgstr "ftpfs: 无法解析符号链接" msgid "Resolving symlink..." msgstr "正在解析符号链接..." #, c-format msgid "ftpfs: Reading FTP directory %s... %s%s" -msgstr "ftpfs：正在读取 FTP 目录 %s... %s%s" +msgstr "ftpfs: 正在读取 FTP 目录 %s... %s%s" msgid "(strict rfc959)" msgstr "(严格遵循 rfc959)" @@ -3952,7 +3954,7 @@ msgstr "(先改变目录)" msgid "ftpfs: failed; nowhere to fallback to" -msgstr "ftpfs：失败；没有后备" +msgstr "ftpfs: 失败；没有后备" msgid "ftpfs: storing file" msgstr "ftpfs: 保存文件中" @@ -3961,19 +3963,19 @@ "~/.netrc file has incorrect mode\n" "Remove password or correct mode" msgstr "" -"~/.netrc 文件权限不正确。\n" -"删除口令或者改正权限。" +"~/.netrc 文件权限不正确\n" +"删除密码或者改正权限" #, c-format msgid "%s: Warning: file %s not found\n" -msgstr "%s: 警告：文件 %s 没有找到\n" +msgstr "%s: 警告: 文件 %s 没有找到\n" #, c-format msgid "" "Warning: Invalid line in %s:\n" "%s\n" msgstr "" -"警告：%s 中有无效的行：\n" +"警告: %s 中有无效的行: \n" "%s\n" #, c-format @@ -3981,64 +3983,64 @@ "Warning: Invalid flag %c in %s:\n" "%s\n" msgstr "" -"警告：%2$s 中有无效的标志 %1$c\n" +"警告: %2$s 中有无效的标志 %1$c\n" "%3$s\n" #, c-format msgid "sftp: an error occurred while reading %s: %s" -msgstr "sftp：读取 %s 时出错：%s" +msgstr "sftp: 读取 %s 时出错: %s" msgid "sftp: Unable to get current user name." -msgstr "sftp：无法获取当前用户的用户名。" +msgstr "sftp: 无法获取当前用户的用户名。" msgid "sftp: Invalid host name." -msgstr "sftp：无效的主机名。" +msgstr "sftp: 无效的主机名。" msgid "sftp: Invalid port value." -msgstr "sftp：无效的端口值。" +msgstr "sftp: 无效的端口值。" #, c-format msgid "sftp: %s" -msgstr "sftp：%s" +msgstr "sftp: %s" #, c-format msgid "sftp: making connection to %s" -msgstr "sftp：正在连接 %s" +msgstr "sftp: 正在连接 %s" msgid "sftp: connection interrupted by user" -msgstr "sftp：连接被用户中断" +msgstr "sftp: 连接被用户中断" #, c-format msgid "sftp: connection to server failed: %s" -msgstr "sftp：连接服务器失败：%s" +msgstr "sftp: 连接服务器失败: %s" #, c-format msgid "sftp: Enter passphrase for %s " -msgstr "" +msgstr "sftp: 请输入 %s 的密码" msgid "sftp: Passphrase is empty." -msgstr "" +msgstr "sftp: 密码为空。" #, c-format msgid "sftp: Enter password for %s " -msgstr "sftp：请输入 %s 的密码" +msgstr "sftp: 请输入 %s 的密码 " msgid "sftp: Password is empty." -msgstr "sftp：密码为空。" +msgstr "sftp: 密码为空。" #, c-format msgid "sftp: Failure establishing SSH session: (%d)" -msgstr "sftp：SSH 会话建立失败：(%d)" +msgstr "sftp: SSH 会话建立失败: (%d)" msgid "sftp: No file handler data present for reading file" -msgstr "sftp：读取的文件没有指定处理程序" +msgstr "sftp: 读取的文件没有指定处理程序" #, c-format msgid "sftp: (Ctrl-G break) Listing... %s" -msgstr "sftp：(Ctrl-G 终止) 正在列出... %s" +msgstr "sftp: (Ctrl-G 终止) 正在列出... %s" msgid "sftp: Listing done." -msgstr "sftp：列出完毕。" +msgstr "sftp: 列出完毕。" #, c-format msgid "reconnect to %s failed" @@ -4049,11 +4051,11 @@ #, c-format msgid "Error %s creating directory %s" -msgstr "创建目录%s时出错%s" +msgstr "创建目录 %s 时出错 %s" #, c-format msgid "Error %s removing directory %s" -msgstr "删除目录%s时出错%s" +msgstr "删除目录 %s 时出错 %s" #, c-format msgid "%s opening remote file %s" @@ -4072,14 +4074,14 @@ "Cannot open tar archive\n" "%s" msgstr "" -"无法打开 tar 归档文件\n" +"无法打开 tar 档案文件\n" "%s" msgid "Inconsistent tar archive" -msgstr "不完整的 tar 归档文件" +msgstr "不完整的 tar 档案文件" msgid "Unexpected EOF on archive file" -msgstr "归档文件出现异常 EOF" +msgstr "档案文件出现不可预料的文件末端" #, c-format msgid "" @@ -4087,10 +4089,10 @@ "doesn't look like a tar archive." msgstr "" "%s\n" -"不是一个 tar 归档文件。" +"不是 tar 档案文件。" msgid "undelfs: error" -msgstr "undelfs：错误" +msgstr "undelfs: 错误" msgid "not enough memory" msgstr "内存不足" @@ -4100,7 +4102,7 @@ #, c-format msgid "open_inode_scan: %d" -msgstr "open_inode_scan：%d" +msgstr "open_inode_scan: %d" #, c-format msgid "while starting inode scan %d" @@ -4108,7 +4110,7 @@ #, c-format msgid "undelfs: loading deleted files information %d inodes" -msgstr "undelfs：正在载入被删除文件的信息 %d inode" +msgstr "undelfs: 正在载入被删除文件的信息 %d inode" #, c-format msgid "while calling ext2_block_iterate %d" @@ -4126,29 +4128,29 @@ msgstr "无法打开文件 %s" msgid "undelfs: reading inode bitmap..." -msgstr "undelfs：正在读取 inode bitmap..." +msgstr "undelfs: 正在读取 inode bitmap..." #, c-format msgid "" "Cannot load inode bitmap from:\n" "%s" msgstr "" -"无法载入 inode位图自：\n" -" %s" +"无法载入 inode位图自: \n" +"%s" msgid "undelfs: reading block bitmap..." -msgstr "undelfs：正在读取 block bitmap..." +msgstr "undelfs: 正在读取 block bitmap..." #, c-format msgid "" "Cannot load block bitmap from:\n" "%s" msgstr "" -"无法载入块位图自：\n" -" %s" +"无法载入块位图自: \n" +"%s" msgid "vfs_info is not fs!" -msgstr "vfs_info 不是文件系统！" +msgstr "vfs_info 不是文件系统!" msgid "You have to chdir to extract files first" msgstr "您必须先更改目录来解开文件" @@ -4158,7 +4160,7 @@ #, c-format msgid "Cannot open file \"%s\"" -msgstr "无法打开文件\"%s\"" +msgstr "无法打开文件“%s”" msgid "Ext2lib error" msgstr "Ext2lib 错误" @@ -4167,7 +4169,7 @@ msgstr "无效的值" msgid "File was modified. Save with exit?" -msgstr "文件被修改，保存并退出？" +msgstr "文件已被修改。保存并退出?" msgid "&Cancel quit" msgstr "取消退出(&C)" @@ -4176,7 +4178,7 @@ "Midnight Commander is being shut down.\n" "Save modified file?" msgstr "" -"Midnight Commander就要被关闭了，\n" +"Midnight Commander 即将被关闭。\n" "要保存修改过的文件吗?" msgid "Cannot spawn child process" @@ -4236,37 +4238,39 @@ "%s\n" "Data may have been written or not" msgstr "" -"关闭文件时出错：\n" +"关闭文件时出错: \n" "%s\n" -"数据可能未能写入磁盘。" +"无法确定数据是否已写入磁盘" #, c-format msgid "" "Cannot save file:\n" "%s" msgstr "" -"不能保存文件:\n" +"无法保存文件:\n" "%s" msgid "View: " -msgstr "查看：" +msgstr "查看: " #, c-format msgid "" "Cannot open \"%s\"\n" "%s" msgstr "" -"无法打开\"%s\"\n" -"%s " +"无法打开“%s”\n" +"%s" msgid "Cannot view: not a regular file" -msgstr "无法查看：不是常规文件" +msgstr "无法查看: 不是常规文件" #, c-format msgid "" "Cannot open \"%s\" in parse mode\n" "%s" msgstr "" +"无法打开“%s”，当前解析模式\n" +"%s" msgid "Seeking to search result" msgstr "查询搜索结果" @@ -4275,10 +4279,7 @@ msgstr "搜索完成" msgid "Continue from beginning?" -msgstr "从头继续？" +msgstr "从头继续搜索?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "无法获取 /ftp://some.host/editme.txt 的本地副本" - -#~ msgid "Deleting" -#~ msgstr "正在删除" Binary files /tmp/ncEbXAXlDo/mc-4.8.10/po/zh_TW.gmo and /tmp/a7jtnT1mfp/mc-4.8.11/po/zh_TW.gmo differ diff -Nru mc-4.8.10/po/zh_TW.po mc-4.8.11/po/zh_TW.po --- mc-4.8.10/po/zh_TW.po 2013-08-02 19:06:23.000000000 +0000 +++ mc-4.8.11/po/zh_TW.po 2013-11-29 18:47:00.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2013-08-02 22:06+0300\n" -"PO-Revision-Date: 2013-07-05 08:44+0000\n" +"POT-Creation-Date: 2013-11-29 21:46+0300\n" +"PO-Revision-Date: 2013-11-20 12:28+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mc/" "language/zh_TW/)\n" @@ -4064,6 +4064,3 @@ msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" - -#~ msgid "Deleting" -#~ msgstr "刪除中" diff -Nru mc-4.8.10/src/Makefile.in mc-4.8.11/src/Makefile.in --- mc-4.8.10/src/Makefile.in 2013-08-02 18:56:45.000000000 +0000 +++ mc-4.8.11/src/Makefile.in 2013-11-29 18:45:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,9 +90,9 @@ @ENABLE_SUBSHELL_TRUE@am__append_7 = subshell.c subshell.h @ENABLE_BACKGROUND_TRUE@am__append_8 = background.c background.h subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -188,13 +216,14 @@ am__v_CCLD_1 = SOURCES = $(libinternal_la_SOURCES) $(mc_SOURCES) DIST_SOURCES = $(am__libinternal_la_SOURCES_DIST) $(mc_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -202,9 +231,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = filemanager man2hlp vfs viewer editor diffviewer \ @@ -520,6 +569,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libinternal.la: $(libinternal_la_OBJECTS) $(libinternal_la_DEPENDENCIES) $(EXTRA_libinternal_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libinternal_la_OBJECTS) $(libinternal_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @@ -531,10 +581,12 @@ 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; \ + 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|.*|.|' \ + 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 } \ @@ -555,7 +607,8 @@ @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)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -568,6 +621,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + mc$(EXEEXT): $(mc_OBJECTS) $(mc_DEPENDENCIES) $(EXTRA_mc_DEPENDENCIES) @rm -f mc$(EXEEXT) $(AM_V_CCLD)$(LINK) $(mc_OBJECTS) $(mc_LDADD) $(LIBS) @@ -627,14 +681,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -655,31 +708,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -695,12 +730,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -712,15 +742,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -729,9 +755,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -913,14 +940,12 @@ uninstall-am: uninstall-binPROGRAMS @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am \ - install-exec-am install-strip tags-recursive uninstall-am - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool clean-noinstLTLIBRARIES cscopelist \ - cscopelist-recursive ctags ctags-recursive distclean \ +.MAKE: $(am__recursive_targets) install-am install-exec-am \ + install-strip uninstall-am + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-binPROGRAMS clean-generic clean-libtool \ + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-binPROGRAMS install-data \ @@ -931,7 +956,7 @@ installcheck installcheck-am installdirs installdirs-am \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-hook diff -Nru mc-4.8.10/src/background.c mc-4.8.11/src/background.c --- mc-4.8.10/src/background.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/background.c 2013-11-29 18:27:07.000000000 +0000 @@ -51,7 +51,7 @@ #include "lib/widget.h" /* message() */ #include "lib/event-types.h" -#include "filemanager/fileopctx.h" /* FileOpContext */ +#include "filemanager/fileopctx.h" /* file_op_context_t */ #include "background.h" @@ -85,7 +85,7 @@ /* --------------------------------------------------------------------------------------------- */ static void -register_task_running (FileOpContext * ctx, pid_t pid, int fd, int to_child, char *info) +register_task_running (file_op_context_t * ctx, pid_t pid, int fd, int to_child, char *info) { TaskList *new; @@ -173,7 +173,7 @@ static int background_attention (int fd, void *closure) { - FileOpContext *ctx; + file_op_context_t *ctx; int have_ctx; union { @@ -183,11 +183,11 @@ int (*have_ctx3) (int, char *, char *, char *); int (*have_ctx4) (int, char *, char *, char *, char *); - int (*non_have_ctx0) (FileOpContext *, int); - int (*non_have_ctx1) (FileOpContext *, int, char *); - int (*non_have_ctx2) (FileOpContext *, int, char *, char *); - int (*non_have_ctx3) (FileOpContext *, int, char *, char *, char *); - int (*non_have_ctx4) (FileOpContext *, int, char *, char *, char *, char *); + int (*non_have_ctx0) (file_op_context_t *, int); + int (*non_have_ctx1) (file_op_context_t *, int, char *); + int (*non_have_ctx2) (file_op_context_t *, int, char *, char *); + int (*non_have_ctx3) (file_op_context_t *, int, char *, char *, char *); + int (*non_have_ctx4) (file_op_context_t *, int, char *, char *, char *, char *); char *(*ret_str0) (); char *(*ret_str1) (char *); @@ -247,7 +247,7 @@ if (have_ctx) { - if (read (fd, ctx, sizeof (FileOpContext)) != sizeof (FileOpContext)) + if (read (fd, ctx, sizeof (file_op_context_t)) != sizeof (file_op_context_t)) { message (D_ERROR, _("Background protocol error"), _("Reading failed")); return 0; @@ -332,7 +332,7 @@ /* Send the result code and the value for shared variables */ ret = write (to_child_fd, &result, sizeof (int)); if (have_ctx && to_child_fd != -1) - ret = write (to_child_fd, ctx, sizeof (FileOpContext)); + ret = write (to_child_fd, ctx, sizeof (file_op_context_t)); } else if (type == Return_String) { @@ -396,7 +396,7 @@ */ static void -parent_call_header (void *routine, int argc, enum ReturnType type, FileOpContext * ctx) +parent_call_header (void *routine, int argc, enum ReturnType type, file_op_context_t * ctx) { int have_ctx; ssize_t ret; @@ -409,7 +409,7 @@ ret = write (parent_fd, &have_ctx, sizeof (have_ctx)); if (have_ctx) - ret = write (parent_fd, ctx, sizeof (FileOpContext)); + ret = write (parent_fd, ctx, sizeof (file_op_context_t)); (void) ret; } @@ -420,7 +420,7 @@ { int i; ssize_t ret; - struct FileOpContext *ctx = (struct FileOpContext *) data; + file_op_context_t *ctx = (file_op_context_t *) data; parent_call_header (routine, argc, Return_Integer, ctx); for (i = 0; i < argc; i++) @@ -436,7 +436,7 @@ ret = read (from_parent_fd, &i, sizeof (int)); if (ctx) - ret = read (from_parent_fd, ctx, sizeof (FileOpContext)); + ret = read (from_parent_fd, ctx, sizeof (file_op_context_t)); (void) ret; return i; @@ -511,7 +511,7 @@ * -1 on failure */ int -do_background (struct FileOpContext *ctx, char *info) +do_background (file_op_context_t * ctx, char *info) { int comm[2]; /* control connection stream */ int back_comm[2]; /* back connection */ @@ -575,7 +575,7 @@ /* --------------------------------------------------------------------------------------------- */ int -parent_call (void *routine, struct FileOpContext *ctx, int argc, ...) +parent_call (void *routine, file_op_context_t * ctx, int argc, ...) { int ret; va_list ap; diff -Nru mc-4.8.10/src/background.h mc-4.8.11/src/background.h --- mc-4.8.10/src/background.h 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/background.h 2013-11-29 18:27:07.000000000 +0000 @@ -6,7 +6,7 @@ #define MC__BACKGROUND_H #include /* pid_t */ - +#include "filemanager/fileopctx.h" /*** typedefs(not structures) and defined constants **********************************************/ enum TaskState @@ -25,8 +25,6 @@ struct TaskList *next; } TaskList; -struct FileOpContext; - /*** enums ***************************************************************************************/ /*** structures declarations (and typedefs of structures)*****************************************/ @@ -37,8 +35,8 @@ /*** declarations of public functions ************************************************************/ -int do_background (struct FileOpContext *ctx, char *info); -int parent_call (void *routine, struct FileOpContext *ctx, int argc, ...); +int do_background (file_op_context_t * ctx, char *info); +int parent_call (void *routine, file_op_context_t * ctx, int argc, ...); char *parent_call_string (void *routine, int argc, ...); void unregister_task_running (pid_t pid, int fd); diff -Nru mc-4.8.10/src/cons.handler.c mc-4.8.11/src/cons.handler.c --- mc-4.8.10/src/cons.handler.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/cons.handler.c 2013-11-29 18:27:07.000000000 +0000 @@ -138,8 +138,6 @@ static void handle_console_linux (console_action_t action) { - char *tty_name; - char *mc_conssaver; int status; switch (action) @@ -186,6 +184,8 @@ else { /* Child */ + char *tty_name; + /* Close the extra pipe ends */ status = close (pipefd1[1]); status = close (pipefd2[0]); @@ -206,8 +206,10 @@ if (dup2 (status, 2) == -1) break; status = close (status); - if (tty_name) + if (tty_name != NULL) { + char *mc_conssaver; + /* Exec the console save/restore handler */ mc_conssaver = mc_build_filename (SAVERDIR, "cons.saver", NULL); execl (mc_conssaver, "cons.saver", tty_name, (char *) NULL); @@ -248,8 +250,8 @@ close (pipefd1[1]); close (pipefd2[0]); ret = waitpid (cons_saver_pid, &status, 0); - mc_global.tty.console_flag = '\0'; (void) ret; + mc_global.tty.console_flag = '\0'; } break; default: diff -Nru mc-4.8.10/src/consaver/Makefile.in mc-4.8.11/src/consaver/Makefile.in --- mc-4.8.10/src/consaver/Makefile.in 2013-08-02 18:56:46.000000000 +0000 +++ mc-4.8.11/src/consaver/Makefile.in 2013-11-29 18:45:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ host_triplet = @host@ pkglibexec_PROGRAMS = cons.saver$(EXEEXT) subdir = src/consaver -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -163,6 +191,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -422,10 +467,12 @@ 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; \ + 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|.*|.|' \ + 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 } \ @@ -446,7 +493,8 @@ @list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(pkglibexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(pkglibexecdir)" && rm -f $$files @@ -459,6 +507,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + cons.saver$(EXEEXT): $(cons_saver_OBJECTS) $(cons_saver_DEPENDENCIES) $(EXTRA_cons_saver_DEPENDENCIES) @rm -f cons.saver$(EXEEXT) $(AM_V_CCLD)$(LINK) $(cons_saver_OBJECTS) $(cons_saver_LDADD) $(LIBS) @@ -498,26 +547,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -529,15 +567,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -546,9 +580,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -704,9 +739,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pkglibexecPROGRAMS cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibexecPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -716,7 +751,7 @@ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ uninstall-pkglibexecPROGRAMS diff -Nru mc-4.8.10/src/diffviewer/Makefile.in mc-4.8.11/src/diffviewer/Makefile.in --- mc-4.8.10/src/diffviewer/Makefile.in 2013-08-02 18:56:46.000000000 +0000 +++ mc-4.8.11/src/diffviewer/Makefile.in 2013-11-29 18:45:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/diffviewer -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -162,6 +190,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -428,6 +473,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libdiffviewer.la: $(libdiffviewer_la_OBJECTS) $(libdiffviewer_la_DEPENDENCIES) $(EXTRA_libdiffviewer_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libdiffviewer_la_OBJECTS) $(libdiffviewer_la_LIBADD) $(LIBS) @@ -467,26 +513,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -498,15 +533,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -515,9 +546,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -670,9 +702,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -682,7 +714,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/src/diffviewer/search.c mc-4.8.11/src/diffviewer/search.c --- mc-4.8.10/src/diffviewer/search.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/diffviewer/search.c 2013-11-29 18:27:07.000000000 +0000 @@ -143,7 +143,6 @@ mcdiffview_do_search_backward (WDiff * dview) { ssize_t ind; - DIFFLN *p; if (dview->search.last_accessed_num_line < 0) { @@ -156,6 +155,8 @@ for (ind = --dview->search.last_accessed_num_line; ind >= 0; ind--) { + DIFFLN *p; + p = (DIFFLN *) & g_array_index (dview->a[dview->ord], DIFFLN, (size_t) ind); if (p->u.len == 0) continue; @@ -177,7 +178,6 @@ mcdiffview_do_search_forward (WDiff * dview) { size_t ind; - DIFFLN *p; if (dview->search.last_accessed_num_line < 0) dview->search.last_accessed_num_line = -1; @@ -190,6 +190,8 @@ for (ind = (size_t)++ dview->search.last_accessed_num_line; ind < dview->a[dview->ord]->len; ind++) { + DIFFLN *p; + p = (DIFFLN *) & g_array_index (dview->a[dview->ord], DIFFLN, ind); if (p->u.len == 0) continue; @@ -248,13 +250,19 @@ return; mc_search_free (dview->search.handle); - dview->search.handle = mc_search_new (dview->search.last_string, -1); +#ifdef HAVE_CHARSET + dview->search.handle = mc_search_new (dview->search.last_string, -1, cp_source); +#else + dview->search.handle = mc_search_new (dview->search.last_string, -1, NULL); +#endif if (dview->search.handle == NULL) return; dview->search.handle->search_type = mcdiffview_search_options.type; +#ifdef HAVE_CHARSET dview->search.handle->is_all_charsets = mcdiffview_search_options.all_codepages; +#endif dview->search.handle->is_case_sensitive = mcdiffview_search_options.case_sens; dview->search.handle->whole_words = mcdiffview_search_options.whole_words; diff -Nru mc-4.8.10/src/diffviewer/ydiff.c mc-4.8.11/src/diffviewer/ydiff.c --- mc-4.8.10/src/diffviewer/ydiff.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/diffviewer/ydiff.c 2013-11-29 18:27:07.000000000 +0000 @@ -70,9 +70,11 @@ #define g_array_foreach(a, TP, cbf) \ do { \ size_t g_array_foreach_i;\ - TP *g_array_foreach_var = NULL; \ + \ for (g_array_foreach_i = 0; g_array_foreach_i < a->len; g_array_foreach_i++) \ { \ + TP *g_array_foreach_var; \ + \ g_array_foreach_var = &g_array_index (a, TP, g_array_foreach_i); \ (*cbf) (g_array_foreach_var); \ } \ @@ -1109,8 +1111,8 @@ } } - free (Lcurr); - free (Lprev); + g_free (Lcurr); + g_free (Lprev); return z; } @@ -1419,8 +1421,7 @@ utf_ch = dview_get_utf ((char *) src, &w, &res); if (w > 1) skip += w - 1; - if (!g_unichar_isprint (utf_ch)) - utf_ch = '.'; + (void) utf_ch; } else { @@ -1521,8 +1522,7 @@ utf_ch = dview_get_utf ((char *) src, &w, &res); if (w > 1) skip += w - 1; - if (!g_unichar_isprint (utf_ch)) - utf_ch = '.'; + (void) utf_ch; } else { @@ -1799,12 +1799,12 @@ if (dview->hdiff != NULL) { size_t i; - const DIFFLN *p; - const DIFFLN *q; for (i = 0; i < dview->a[DIFF_LEFT]->len; i++) { GArray *h = NULL; + const DIFFLN *p; + const DIFFLN *q; p = &g_array_index (dview->a[DIFF_LEFT], DIFFLN, i); q = &g_array_index (dview->a[DIFF_RIGHT], DIFFLN, i); @@ -2921,10 +2921,10 @@ if (newline > 0) { - const DIFFLN *p; - for (; i < dview->a[ord]->len; i++) { + const DIFFLN *p; + p = &g_array_index (dview->a[ord], DIFFLN, i); if (p->line == newline) break; diff -Nru mc-4.8.10/src/editor/Makefile.in mc-4.8.11/src/editor/Makefile.in --- mc-4.8.10/src/editor/Makefile.in 2013-08-02 18:56:46.000000000 +0000 +++ mc-4.8.11/src/editor/Makefile.in 2013-11-29 18:45:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,9 +83,9 @@ @HAVE_GMODULE_TRUE@@USE_ASPELL_TRUE@ spell_dialogs.c spell_dialogs.h subdir = src/editor -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -178,6 +206,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -445,6 +490,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libedit.la: $(libedit_la_OBJECTS) $(libedit_la_DEPENDENCIES) $(EXTRA_libedit_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_libedit_la_rpath) $(libedit_la_OBJECTS) $(libedit_la_LIBADD) $(LIBS) @@ -497,26 +543,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -528,15 +563,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -545,9 +576,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -700,9 +732,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -712,7 +744,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/src/editor/edit.c mc-4.8.11/src/editor/edit.c --- mc-4.8.10/src/editor/edit.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/editor/edit.c 2013-11-29 18:27:07.000000000 +0000 @@ -167,9 +167,7 @@ } ret = (edit_buffer_read_file (buf, file, buf->size) == buf->size); - if (ret) - buf->lines = edit_buffer_count_lines (buf, 0, buf->size); - else + if (!ret) { gchar *errmsg; @@ -188,7 +186,7 @@ static int edit_find_filter (const vfs_path_t * filename_vpath) { - size_t i, l, e; + size_t i, l; if (filename_vpath == NULL) return -1; @@ -196,6 +194,8 @@ l = strlen (vfs_path_as_str (filename_vpath)); for (i = 0; i < G_N_ELEMENTS (all_filters); i++) { + size_t e; + e = strlen (all_filters[i].extension); if (l > e) if (!strcmp (all_filters[i].extension, vfs_path_as_str (filename_vpath) + l - e)) @@ -320,7 +320,7 @@ g_free (errmsg); errmsg = NULL; - if (act == 1) + if (act != 0) ret = FALSE; } @@ -1338,7 +1338,6 @@ edit_auto_indent (WEdit * edit) { off_t p; - char c; p = edit->buffer.curs1; /* use the previous line as a template */ @@ -1346,6 +1345,8 @@ /* copy the leading whitespace of the line */ while (TRUE) { /* no range check - the line _is_ \n-terminated */ + char c; + c = edit_buffer_get_byte (&edit->buffer, p++); if (c != ' ' && c != '\t') break; @@ -1421,7 +1422,6 @@ check_and_wrap_line (WEdit * edit) { off_t curs; - int c; if (!option_typewriter_wrap) return; @@ -1431,6 +1431,8 @@ curs = edit->buffer.curs1; while (TRUE) { + int c; + curs--; c = edit_buffer_get_byte (&edit->buffer, curs); if (c == '\n' || curs <= 0) @@ -1463,7 +1465,7 @@ edit_get_bracket (WEdit * edit, gboolean in_screen, unsigned long furthest_bracket_search) { const char *const b = "{}{[][()(", *p; - int i = 1, a, inc = -1, c, d, n = 0; + int i = 1, inc = -1, c, d, n = 0; unsigned long j = 0; off_t q; @@ -1483,6 +1485,8 @@ inc = 1; for (q = edit->buffer.curs1 + inc;; q += inc) { + int a; + /* out of buffer? */ if (q >= edit->buffer.size || q < 0) break; @@ -3299,7 +3303,7 @@ #ifdef HAVE_CHARSET if (char_for_insertion > 255 && !mc_global.utf8_display) { - unsigned char str[6 + 1]; + unsigned char str[UTF8_CHAR_LEN + 1]; size_t i = 0; int res; @@ -3313,7 +3317,7 @@ { str[res] = '\0'; } - while (str[i] != 0 && i <= 6) + while (i <= UTF8_CHAR_LEN && str[i] != '\0') { char_for_insertion = str[i]; edit_insert (edit, char_for_insertion); @@ -3457,14 +3461,14 @@ if (option_auto_para_formatting) { edit_double_newline (edit); - if (option_return_does_auto_indent) + if (option_return_does_auto_indent && !bracketed_pasting_in_progress) edit_auto_indent (edit); format_paragraph (edit, FALSE); } else { edit_insert (edit, '\n'); - if (option_return_does_auto_indent) + if (option_return_does_auto_indent && !bracketed_pasting_in_progress) edit_auto_indent (edit); } break; diff -Nru mc-4.8.10/src/editor/editbuffer.c mc-4.8.11/src/editor/editbuffer.c --- mc-4.8.10/src/editor/editbuffer.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/editor/editbuffer.c 2013-11-29 18:27:07.000000000 +0000 @@ -584,8 +584,6 @@ off_t edit_buffer_move_forward (const edit_buffer_t * buf, off_t current, long lines, off_t upto) { - long next; - if (upto != 0) return (off_t) edit_buffer_count_lines (buf, current, upto); @@ -593,6 +591,8 @@ while (lines-- != 0) { + long next; + next = edit_buffer_get_eol (buf, current) + 1; if (next > buf->size) break; @@ -640,10 +640,11 @@ edit_buffer_read_file (edit_buffer_t * buf, int fd, off_t size) { off_t ret = 0; - off_t i; + off_t i, j; off_t data_size; void *b; + buf->lines = 0; buf->curs2 = size; i = buf->curs2 >> S_EDIT_BUF_SIZE; @@ -653,10 +654,16 @@ { b = g_malloc0 (EDIT_BUF_SIZE); g_ptr_array_add (buf->b2, b); - ret = mc_read (fd, (char *) b + EDIT_BUF_SIZE - data_size, data_size); + b = (char *) b + EDIT_BUF_SIZE - data_size; + ret = mc_read (fd, b, data_size); + + /* count lines */ + for (j = 0; j < ret; j++) + if (*((char *) b + j) == '\n') + buf->lines++; + if (ret < 0 || ret != data_size) return ret; - } /* fulfill other parts of b2 from end to begin */ @@ -670,6 +677,12 @@ sz = mc_read (fd, b, data_size); if (sz >= 0) ret += sz; + + /* count lines */ + for (j = 0; j < sz; j++) + if (*((char *) b + j) == '\n') + buf->lines++; + if (sz != data_size) break; } diff -Nru mc-4.8.10/src/editor/editcmd.c mc-4.8.11/src/editor/editcmd.c --- mc-4.8.10/src/editor/editcmd.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/editor/editcmd.c 2013-11-29 18:27:07.000000000 +0000 @@ -1177,7 +1177,11 @@ off_t last_byte, start = -1; char *current_word; - srch = mc_search_new (match_expr, -1); +#ifdef HAVE_CHARSET + srch = mc_search_new (match_expr, -1, cp_source); +#else + srch = mc_search_new (match_expr, -1, NULL); +#endif if (srch == NULL) return 0; @@ -1562,7 +1566,7 @@ void edit_save_mode_cmd (void) { - char *str_result; + char *str_result = NULL; const char *str[] = { N_("&Quick save"), @@ -1920,7 +1924,6 @@ gsize len, values_len; const char *section_name = "editor"; gchar *macros_fname; - int hotkey; (void) edit; @@ -1931,26 +1934,24 @@ if (macros_config == NULL || macros_list == NULL || macros_list->len != 0) return FALSE; - profile_keys = keys = mc_config_get_keys (macros_config, section_name, &len); - while (*profile_keys != NULL) + keys = mc_config_get_keys (macros_config, section_name, &len); + for (profile_keys = keys; *profile_keys != NULL; profile_keys++) { - gboolean have_macro; + int hotkey; + gboolean have_macro = FALSE; GArray *macros; macros_t macro; macros = g_array_new (TRUE, FALSE, sizeof (macro_action_t)); - - curr_values = values = mc_config_get_string_list (macros_config, section_name, - *profile_keys, &values_len); + values = + mc_config_get_string_list (macros_config, section_name, *profile_keys, &values_len); hotkey = lookup_key (*profile_keys, NULL); - have_macro = FALSE; - while (*curr_values != NULL && *curr_values[0] != '\0') + for (curr_values = values; *curr_values != NULL && *curr_values[0] != '\0'; curr_values++) { char **macro_pair = NULL; macro_pair = g_strsplit (*curr_values, ":", 2); - if (macro_pair != NULL) { macro_action_t m_act; @@ -1984,7 +1985,6 @@ g_strfreev (macro_pair); macro_pair = NULL; } - curr_values++; } if (have_macro) { @@ -1992,7 +1992,6 @@ macro.macro = macros; g_array_append_val (macros_list, macro); } - profile_keys++; g_strfreev (values); } g_strfreev (keys); @@ -2009,8 +2008,6 @@ gboolean edit_save_confirm_cmd (WEdit * edit) { - char *f = NULL; - if (edit->filename_vpath == NULL) return edit_save_as_cmd (edit); @@ -2019,6 +2016,7 @@ if (edit_confirm_save) { + char *f; gboolean ok; f = g_strdup_printf (_("Confirm save file: \"%s\""), @@ -2279,7 +2277,6 @@ edit_block_copy_cmd (WEdit * edit) { off_t start_mark, end_mark, current = edit->buffer.curs1; - long col_delta = 0; off_t mark1, mark2; long c1, c2; off_t size; @@ -2297,6 +2294,8 @@ if (edit->column_highlight) { + long col_delta; + col_delta = abs (edit->column2 - edit->column1); edit_insert_column_of_text (edit, copy_buf, size, col_delta, &mark1, &mark2, &c1, &c2); } @@ -2510,16 +2509,22 @@ input2_str = g_string_new (input2); - if (!edit->search) + if (edit->search == NULL) { - edit->search = mc_search_new (input1, -1); +#ifdef HAVE_CHARSET + edit->search = mc_search_new (input1, -1, cp_source); +#else + edit->search = mc_search_new (input1, -1, NULL); +#endif if (edit->search == NULL) { edit->search_start = edit->buffer.curs1; goto cleanup; } edit->search->search_type = edit_search_options.type; +#ifdef HAVE_CHARSET edit->search->is_all_charsets = edit_search_options.all_codepages; +#endif edit->search->is_case_sensitive = edit_search_options.case_sens; edit->search->whole_words = edit_search_options.whole_words; edit->search->search_fn = edit_search_cmd_callback; @@ -2703,10 +2708,13 @@ edit->last_search_string = (char *) history->data; history->data = NULL; history = g_list_first (history); - g_list_foreach (history, (GFunc) g_free, NULL); - g_list_free (history); + g_list_free_full (history, g_free); - edit->search = mc_search_new (edit->last_search_string, -1); +#ifdef HAVE_CHARSET + edit->search = mc_search_new (edit->last_search_string, -1, cp_source); +#else + edit->search = mc_search_new (edit->last_search_string, -1, NULL); +#endif if (edit->search == NULL) { /* if not... then ask for an expression */ @@ -2717,7 +2725,9 @@ else { edit->search->search_type = edit_search_options.type; +#ifdef HAVE_CHARSET edit->search->is_all_charsets = edit_search_options.all_codepages; +#endif edit->search->is_case_sensitive = edit_search_options.case_sens; edit->search->whole_words = edit_search_options.whole_words; edit->search->search_fn = edit_search_cmd_callback; @@ -2746,7 +2756,7 @@ gboolean edit_ok_to_exit (WEdit * edit) { - char *fname = (char *) N_("[NoName]"); + const char *fname = N_("[NoName]"); char *msg; int act; @@ -2754,22 +2764,16 @@ return TRUE; if (edit->filename_vpath != NULL) - fname = g_strdup (vfs_path_as_str (edit->filename_vpath)); + fname = vfs_path_as_str (edit->filename_vpath); #ifdef ENABLE_NLS else - fname = g_strdup (_(fname)); -#else - else - fname = g_strdup (fname); + fname = _(fname); #endif if (!mc_global.midnight_shutdown) { if (!edit_check_newline (&edit->buffer)) - { - g_free (fname); return FALSE; - } query_set_sel (2); @@ -2788,7 +2792,6 @@ } g_free (msg); - g_free (fname); switch (act) { @@ -3197,9 +3200,9 @@ void edit_mail_dialog (WEdit * edit) { - char *tmail_to; - char *tmail_subject; - char *tmail_cc; + char *tmail_to = NULL; + char *tmail_subject = NULL; + char *tmail_cc = NULL; static char *mail_cc_last = 0; static char *mail_subject_last = 0; diff -Nru mc-4.8.10/src/editor/editcmd_dialogs.c mc-4.8.11/src/editor/editcmd_dialogs.c --- mc-4.8.10/src/editor/editcmd_dialogs.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/editor/editcmd_dialogs.c 2013-11-29 18:27:07.000000000 +0000 @@ -162,11 +162,17 @@ edit->last_search_string = search_text; mc_search_free (edit->search); - edit->search = mc_search_new (edit->last_search_string, -1); +#ifdef HAVE_CHARSET + edit->search = mc_search_new (edit->last_search_string, -1, cp_source); +#else + edit->search = mc_search_new (edit->last_search_string, -1, NULL); +#endif if (edit->search != NULL) { edit->search->search_type = edit_search_options.type; +#ifdef HAVE_CHARSET edit->search->is_all_charsets = edit_search_options.all_codepages; +#endif edit->search->is_case_sensitive = edit_search_options.case_sens; edit->search->whole_words = edit_search_options.whole_words; edit->search->search_fn = edit_search_cmd_callback; @@ -413,7 +419,6 @@ WListbox *def_list; int def_dlg_h; /* dialog height */ int def_dlg_w; /* dialog width */ - char *label_def = NULL; (void) word_len; /* calculate the dialog metrics */ @@ -450,6 +455,8 @@ /* fill the listbox with the completions */ for (i = 0; i < num_lines; i++) { + char *label_def; + label_def = g_strdup_printf ("%s -> %s:%ld", def_hash[i].short_define, def_hash[i].filename, def_hash[i].line); diff -Nru mc-4.8.10/src/editor/editdraw.c mc-4.8.11/src/editor/editdraw.c --- mc-4.8.10/src/editor/editdraw.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/editor/editdraw.c 2013-11-29 18:27:07.000000000 +0000 @@ -510,13 +510,9 @@ struct line_s *p = line; off_t m1 = 0, m2 = 0, q; - long c1, c2; int col, start_col_real; - unsigned int c; int color; int abn_style; - int i; - unsigned int cur_line = 0; int book_mark = 0; char line_stat[LINE_STATE_WIDTH + 1] = "\0"; @@ -547,6 +543,8 @@ if (option_line_state) { + unsigned int cur_line; + cur_line = edit->start_line + row; if (cur_line <= (unsigned int) edit->buffer.lines) { @@ -572,6 +570,8 @@ off_t tws = 0; if (tty_use_colors () && visible_tws) { + unsigned int c; + tws = edit_buffer_get_eol (&edit->buffer, b); while (tws > b && ((c = edit_buffer_get_byte (&edit->buffer, tws - 1)) == ' ' || c == '\t')) @@ -581,7 +581,7 @@ while (col <= end_col - edit->start_col) { int cw = 1; - int tab_over = 0; + unsigned int c; gboolean wide_width_char = FALSE; gboolean control_char = FALSE; @@ -594,6 +594,7 @@ if (edit->column_highlight) { long x; + long c1, c2; x = (long) edit_move_forward3 (edit, b, 0, q); c1 = min (edit->column1, edit->column2); @@ -632,74 +633,80 @@ col = end_col - edit->start_col + 1; /* quit */ break; case '\t': - i = TAB_SIZE - ((int) col % TAB_SIZE); - tab_over = (end_col - edit->start_col) - (col + i - 1); - if (tab_over < 0) - i += tab_over; - col += i; - if (tty_use_colors () && - ((visible_tabs || (visible_tws && q >= tws)) && enable_show_tabs_tws)) { - if (p->style & MOD_MARKED) - c = p->style; - else if (book_mark) - c |= book_mark << 16; - else - c = p->style | MOD_WHITESPACE; - if (i > 2) + int tab_over; + int i; + + i = TAB_SIZE - ((int) col % TAB_SIZE); + tab_over = (end_col - edit->start_col) - (col + i - 1); + if (tab_over < 0) + i += tab_over; + col += i; + if (tty_use_colors () && + ((visible_tabs || (visible_tws && q >= tws)) && enable_show_tabs_tws)) { - p->ch = '<'; - p->style = c; - p++; - while (--i > 1) + if (p->style & MOD_MARKED) + c = p->style; + else if (book_mark) + c |= book_mark << 16; + else + c = p->style | MOD_WHITESPACE; + if (i > 2) { - p->ch = '-'; + p->ch = '<'; + p->style = c; + p++; + while (--i > 1) + { + p->ch = '-'; + p->style = c; + p++; + } + p->ch = '>'; + p->style = c; + p++; + } + else if (i > 1) + { + p->ch = '<'; + p->style = c; + p++; + p->ch = '>'; + p->style = c; + p++; + } + else + { + p->ch = '>'; p->style = c; p++; } - p->ch = '>'; - p->style = c; - p++; } - else if (i > 1) + else if (tty_use_colors () && visible_tws && q >= tws + && enable_show_tabs_tws) { - p->ch = '<'; - p->style = c; - p++; - p->ch = '>'; - p->style = c; + p->ch = '.'; + p->style |= MOD_WHITESPACE; + c = p->style & ~MOD_CURSOR; p++; + while (--i) + { + p->ch = ' '; + p->style = c; + p++; + } } else { - p->ch = '>'; - p->style = c; - p++; - } - } - else if (tty_use_colors () && visible_tws && q >= tws && enable_show_tabs_tws) - { - p->ch = '.'; - p->style |= MOD_WHITESPACE; - c = p->style & ~MOD_CURSOR; - p++; - while (--i) - { - p->ch = ' '; - p->style = c; - p++; - } - } - else - { - p->ch |= ' '; - c = p->style & ~MOD_CURSOR; - p++; - while (--i) - { - p->ch = ' '; - p->style = c; + p->ch |= ' '; + c = p->style & ~MOD_CURSOR; p++; + while (--i) + { + p->ch = ' '; + p->style = c; + p++; + } } } break; @@ -847,9 +854,7 @@ Widget *w = WIDGET (edit); Widget *wh = WIDGET (w->owner); - long row = 0, curs_row; int force = edit->force; - long b; int y1, x1, y2, x2; int last_line; @@ -903,6 +908,8 @@ */ if ((force & REDRAW_CHAR_ONLY) == 0 || (force & REDRAW_PAGE) != 0) { + long row, b; + if ((force & REDRAW_PAGE) != 0) { row = start_row; @@ -918,7 +925,7 @@ } else { - curs_row = edit->curs_row; + long curs_row = edit->curs_row; if ((force & REDRAW_BEFORE_CURSOR) != 0 && start_row < curs_row) { diff -Nru mc-4.8.10/src/editor/editwidget.c mc-4.8.11/src/editor/editwidget.c --- mc-4.8.10/src/editor/editwidget.c 2013-08-02 18:02:40.000000000 +0000 +++ mc-4.8.11/src/editor/editwidget.c 2013-11-29 18:27:07.000000000 +0000 @@ -1065,6 +1065,15 @@ ret = edit_dialog_command_execute (h, command); } + /* + * Due to the "end of bracket" escape the editor sees input with is_idle() == false + * (expects more characters) and hence doesn't yet refresh the screen, but then + * no further characters arrive (there's only an "end of bracket" which is swallowed + * by tty_get_event()), so you end up with a screen that's not refreshed after pasting. + * So let's trigger an IDLE signal. + */ + if (!is_idle ()) + widget_want_idle (w, TRUE); return ret; } @@ -1080,6 +1089,10 @@ edit_dlg_deinit (); return MSG_HANDLED; + case MSG_IDLE: + widget_want_idle (w, FALSE); + return send_message (h->current->data, NULL, MSG_IDLE, 0, NULL); + default: return dlg_default_callback (w, sender, msg, parm, data); } @@ -1147,6 +1160,10 @@ return MSG_HANDLED; } + case MSG_IDLE: + edit_update_screen (e); + return MSG_HANDLED; + case MSG_DESTROY: edit_clean (e); return MSG_HANDLED; diff -Nru mc-4.8.10/src/editor/syntax.c mc-4.8.11/src/editor/syntax.c --- mc-4.8.10/src/editor/syntax.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/editor/syntax.c 2013-11-29 18:27:07.000000000 +0000 @@ -888,8 +888,6 @@ struct context_rule **r, *c = NULL; int num_words = -1, num_contexts = -1; int result = 0; - int argc; - int i, j; int alloc_contexts = MAX_CONTEXTS, alloc_words_per_context = MAX_WORDS_PER_CONTEXT, max_alloc_words_per_context = MAX_WORDS_PER_CONTEXT; @@ -909,6 +907,7 @@ { char **a; size_t len; + int argc; line++; l = 0; @@ -1200,7 +1199,8 @@ if (result == 0) { - char *first_chars, *p; + int i; + char *first_chars; if (num_contexts == -1) return line; @@ -1209,6 +1209,9 @@ for (i = 0; edit->rules[i] != NULL; i++) { + char *p; + int j; + c = edit->rules[i]; p = first_chars; *p++ = (char) 1; @@ -1314,12 +1317,12 @@ /* 3: auto-detect rule set from regular expressions */ int q; - q = mc_search (args[1], editor_file, MC_SEARCH_T_REGEX); + q = mc_search (args[1], DEFAULT_CHARSET, editor_file, MC_SEARCH_T_REGEX); /* does filename match arg 1 ? */ if (!q && args[3]) { /* does first line match arg 3 ? */ - q = mc_search (args[3], first_line, MC_SEARCH_T_REGEX); + q = mc_search (args[3], DEFAULT_CHARSET, first_line, MC_SEARCH_T_REGEX); } if (q) { @@ -1447,8 +1450,7 @@ MC_PTR_FREE (edit->rules[i]); } - g_slist_foreach (edit->syntax_marker, (GFunc) g_free, NULL); - g_slist_free (edit->syntax_marker); + g_slist_free_full (edit->syntax_marker, g_free); edit->syntax_marker = NULL; MC_PTR_FREE (edit->rules); tty_color_free_all_tmp (); diff -Nru mc-4.8.10/src/execute.c mc-4.8.11/src/execute.c --- mc-4.8.10/src/execute.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/execute.c 2013-11-29 18:27:07.000000000 +0000 @@ -88,6 +88,7 @@ tty_raw_mode (); channels_up (); enable_mouse (); + enable_bracketed_paste (); if (mc_global.tty.alternate_plus_minus) application_keypad_mode (); } @@ -107,6 +108,7 @@ channels_down (); disable_mouse (); + disable_bracketed_paste (); tty_reset_shell_mode (); tty_keypad (FALSE); @@ -152,6 +154,7 @@ { struct sigaction sigtstp_action; + memset (&sigtstp_action, 0, sizeof (sigtstp_action)); /* Make sure that the SIGTSTP below will suspend us directly, without calling ncurses' SIGTSTP handler; we *don't* want ncurses to redraw the screen immediately after the SIGCONT */ @@ -448,13 +451,13 @@ { #ifdef ENABLE_SUBSHELL vfs_path_t *new_dir_vpath = NULL; - vfs_path_t **new_dir_p; #endif /* ENABLE_SUBSHELL */ SIG_ATOMIC_VOLATILE_T was_sigwinch = 0; channels_down (); disable_mouse (); + disable_bracketed_paste (); if (clear_before_exec) clr_scr (); if (mc_global.tty.alternate_plus_minus) @@ -476,6 +479,8 @@ #ifdef ENABLE_SUBSHELL if (mc_global.tty.use_subshell) { + vfs_path_t **new_dir_p; + new_dir_p = vfs_current_is_local ()? &new_dir_vpath : NULL; invoke_subshell (NULL, VISIBLY, new_dir_p); } @@ -518,6 +523,7 @@ } enable_mouse (); + enable_bracketed_paste (); channels_up (); if (mc_global.tty.alternate_plus_minus) application_keypad_mode (); diff -Nru mc-4.8.10/src/filemanager/Makefile.in mc-4.8.11/src/filemanager/Makefile.in --- mc-4.8.10/src/filemanager/Makefile.in 2013-08-02 18:56:47.000000000 +0000 +++ mc-4.8.11/src/filemanager/Makefile.in 2013-11-29 18:45:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/filemanager -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -166,6 +194,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -455,6 +500,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libmcfilemanager.la: $(libmcfilemanager_la_OBJECTS) $(libmcfilemanager_la_DEPENDENCIES) $(EXTRA_libmcfilemanager_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libmcfilemanager_la_OBJECTS) $(libmcfilemanager_la_LIBADD) $(LIBS) @@ -515,26 +561,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -546,15 +581,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -563,9 +594,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -718,9 +750,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -730,7 +762,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/src/filemanager/achown.c mc-4.8.11/src/filemanager/achown.c --- mc-4.8.10/src/filemanager/achown.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/filemanager/achown.c 2013-11-29 18:27:07.000000000 +0000 @@ -316,18 +316,19 @@ static void do_enter_key (WDialog * h, int f_pos) { - WDialog *chl_dlg; WListbox *chl_list; struct passwd *chl_pass; struct group *chl_grp; int fe; - int lxx, lyy, b_pos; gboolean chl_end, is_owner; - const char *title; - int result; do { + int result; + WDialog *chl_dlg; + const char *title; + int lxx, lyy, b_pos; + is_owner = (f_pos == 3); title = is_owner ? _("owner") : _("group"); diff -Nru mc-4.8.10/src/filemanager/boxes.c mc-4.8.11/src/filemanager/boxes.c --- mc-4.8.10/src/filemanager/boxes.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/filemanager/boxes.c 2013-11-29 18:27:07.000000000 +0000 @@ -519,18 +519,17 @@ void panel_options_box (void) { - const char *qsearch_options[] = { - N_("Case &insensitive"), - N_("Cas&e sensitive"), - N_("Use panel sort mo&de") - }; - int simple_swap; simple_swap = mc_config_get_bool (mc_main_config, CONFIG_PANELS_SECTION, "simple_swap", FALSE) ? 1 : 0; - { + const char *qsearch_options[] = { + N_("Case &insensitive"), + N_("Cas&e sensitive"), + N_("Use panel sort mo&de") + }; + quick_widget_t quick_widgets[] = { /* *INDENT-OFF* */ QUICK_START_COLUMNS, @@ -630,8 +629,8 @@ { int mini_user_status; - char *panel_user_format; - char *mini_user_format; + char *panel_user_format = NULL; + char *mini_user_format = NULL; const char *cp; /* Controls whether the array strings have been translated */ @@ -703,17 +702,17 @@ /* --------------------------------------------------------------------------------------------- */ const panel_field_t * -sort_box (panel_sort_info_t * info) +sort_box (dir_sort_options_t * op, const panel_field_t * sort_field) { const char **sort_orders_names; gsize sort_names_num, i; int sort_idx = 0; - const panel_field_t *result = info->sort_field; + const panel_field_t *result = NULL; sort_orders_names = panel_get_sortable_fields (&sort_names_num); for (i = 0; i < sort_names_num; i++) - if (strcmp (sort_orders_names[i], _(info->sort_field->title_hotkey)) == 0) + if (strcmp (sort_orders_names[i], _(sort_field->title_hotkey)) == 0) { sort_idx = i; break; @@ -725,9 +724,9 @@ QUICK_START_COLUMNS, QUICK_RADIO (sort_names_num, sort_orders_names, &sort_idx, NULL), QUICK_NEXT_COLUMN, - QUICK_CHECKBOX (N_("Executable &first"), &info->exec_first, NULL), - QUICK_CHECKBOX (N_("Cas&e sensitive"), &info->case_sensitive, NULL), - QUICK_CHECKBOX (N_("&Reverse"), &info->reverse, NULL), + QUICK_CHECKBOX (N_("Executable &first"), &op->exec_first, NULL), + QUICK_CHECKBOX (N_("Cas&e sensitive"), &op->case_sensitive, NULL), + QUICK_CHECKBOX (N_("&Reverse"), &op->reverse, NULL), QUICK_STOP_COLUMNS, QUICK_BUTTONS_OK_CANCEL, QUICK_END @@ -744,7 +743,7 @@ result = panel_get_field_by_title_hotkey (sort_orders_names[sort_idx]); if (result == NULL) - result = info->sort_field; + result = sort_field; } g_strfreev ((gchar **) sort_orders_names); @@ -760,13 +759,13 @@ quick_widget_t quick_widgets[] = { /* *INDENT-OFF* */ /* TRANSLATORS: no need to translate 'Confirmation', it's just a context prefix */ - QUICK_CHECKBOX (N_("Confirmation|&Delete"), &confirm_delete, NULL), - QUICK_CHECKBOX (N_("Confirmation|O&verwrite"), &confirm_overwrite, NULL), - QUICK_CHECKBOX (N_("Confirmation|&Execute"), &confirm_execute, NULL), - QUICK_CHECKBOX (N_("Confirmation|E&xit"), &confirm_exit, NULL), - QUICK_CHECKBOX (N_("Confirmation|Di&rectory hotlist delete"), + QUICK_CHECKBOX (Q_("Confirmation|&Delete"), &confirm_delete, NULL), + QUICK_CHECKBOX (Q_("Confirmation|O&verwrite"), &confirm_overwrite, NULL), + QUICK_CHECKBOX (Q_("Confirmation|&Execute"), &confirm_execute, NULL), + QUICK_CHECKBOX (Q_("Confirmation|E&xit"), &confirm_exit, NULL), + QUICK_CHECKBOX (Q_("Confirmation|Di&rectory hotlist delete"), &confirm_directory_hotlist_delete, NULL), - QUICK_CHECKBOX (N_("Confirmation|&History cleanup"), + QUICK_CHECKBOX (Q_("Confirmation|&History cleanup"), &mc_global.widget.confirm_history_cleanup, NULL), QUICK_BUTTONS_OK_CANCEL, QUICK_END @@ -1013,6 +1012,7 @@ if (quick_dialog (&qdlg) != B_CANCEL) { + /* cppcheck-suppress uninitvar */ vfs_timeout = atoi (ret_timeout); g_free (ret_timeout); @@ -1020,9 +1020,12 @@ vfs_timeout = 10; #ifdef ENABLE_VFS_FTP g_free (ftpfs_anonymous_passwd); + /* cppcheck-suppress uninitvar */ ftpfs_anonymous_passwd = ret_passwd; g_free (ftpfs_proxy_host); + /* cppcheck-suppress uninitvar */ ftpfs_proxy_host = ret_ftp_proxy; + /* cppcheck-suppress uninitvar */ ftpfs_directory_timeout = atoi (ret_directory_timeout); g_free (ret_directory_timeout); #endif diff -Nru mc-4.8.10/src/filemanager/boxes.h mc-4.8.11/src/filemanager/boxes.h --- mc-4.8.10/src/filemanager/boxes.h 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/filemanager/boxes.h 2013-10-15 09:52:41.000000000 +0000 @@ -21,7 +21,7 @@ void configure_box (void); void panel_options_box (void); int panel_listing_box (WPanel * p, char **user, char **mini, int *use_msformat, int num); -const panel_field_t *sort_box (panel_sort_info_t * info); +const panel_field_t *sort_box (dir_sort_options_t * op, const panel_field_t * sort_field); void confirm_box (void); void display_bits_box (void); void configure_vfs (void); diff -Nru mc-4.8.10/src/filemanager/chown.c mc-4.8.11/src/filemanager/chown.c --- mc-4.8.10/src/filemanager/chown.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/filemanager/chown.c 2013-11-29 18:27:07.000000000 +0000 @@ -332,7 +332,6 @@ { char *fname; struct stat sf_stat; - WDialog *ch_dlg; uid_t new_user; gid_t new_group; char buffer[BUF_TINY]; @@ -342,6 +341,7 @@ do { /* do while any files remaining */ vfs_path_t *vpath; + WDialog *ch_dlg; ch_dlg = init_chown (); new_user = new_group = -1; diff -Nru mc-4.8.10/src/filemanager/cmd.c mc-4.8.11/src/filemanager/cmd.c --- mc-4.8.10/src/filemanager/cmd.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/filemanager/cmd.c 2013-11-29 18:27:07.000000000 +0000 @@ -259,12 +259,12 @@ return; } - search = mc_search_new (reg_exp, -1); + search = mc_search_new (reg_exp, -1, NULL); search->search_type = (shell_patterns != 0) ? MC_SEARCH_T_GLOB : MC_SEARCH_T_REGEX; search->is_entire_line = TRUE; search->is_case_sensitive = case_sens != 0; - for (i = 0; i < current_panel->count; i++) + for (i = 0; i < current_panel->dir.len; i++) { if (DIR_IS_DOTDOT (current_panel->dir.list[i].fname)) continue; @@ -294,7 +294,7 @@ static int compare_files (const vfs_path_t * vpath1, const vfs_path_t * vpath2, off_t size) { - int file1, file2; + int file1; int result = -1; /* Different by default */ if (size == 0) @@ -303,15 +303,20 @@ file1 = open (vfs_path_as_str (vpath1), O_RDONLY); if (file1 >= 0) { + int file2; + file2 = open (vfs_path_as_str (vpath2), O_RDONLY); if (file2 >= 0) { #ifdef HAVE_MMAP - char *data1, *data2; + char *data1; + /* Ugly if jungle */ data1 = mmap (0, size, PROT_READ, MAP_FILE | MAP_PRIVATE, file1, 0); if (data1 != (char *) -1) { + char *data2; + data2 = mmap (0, size, PROT_READ, MAP_FILE | MAP_PRIVATE, file2, 0); if (data2 != (char *) -1) { @@ -356,9 +361,9 @@ panel->dirs_marked = 0; /* Handle all files in the panel */ - for (i = 0; i < panel->count; i++) + for (i = 0; i < panel->dir.len; i++) { - file_entry *source = &panel->dir.list[i]; + file_entry_t *source = &panel->dir.list[i]; /* Default: unmarked */ file_mark (panel, i, 0); @@ -368,18 +373,18 @@ continue; /* Search the corresponding entry from the other panel */ - for (j = 0; j < other->count; j++) + for (j = 0; j < other->dir.len; j++) { if (strcmp (source->fname, other->dir.list[j].fname) == 0) break; } - if (j >= other->count) + if (j >= other->dir.len) /* Not found -> mark */ do_file_mark (panel, i, 1); else { /* Found */ - file_entry *target = &other->dir.list[j]; + file_entry_t *target = &other->dir.list[j]; if (mode != compare_size_only) { @@ -583,7 +588,7 @@ { WPanel *p; - p = (WPanel *) get_panel_widget (panel_index); + p = PANEL (get_panel_widget (panel_index)); if (p->is_panelized) { p->is_panelized = FALSE; @@ -598,9 +603,10 @@ static gboolean set_basic_panel_listing_to (int panel_index, int listing_mode) { - WPanel *p = (WPanel *) get_panel_widget (panel_index); + WPanel *p; gboolean ok; + p = PANEL (get_panel_widget (panel_index)); switch_to_listing (panel_index); p->list_type = listing_mode; @@ -619,7 +625,6 @@ gboolean view_file_at_line (const vfs_path_t * filename_vpath, int plain_view, int internal, long start_line) { - static const char *viewer = NULL; gboolean ret = TRUE; if (plain_view) @@ -670,6 +675,8 @@ } else { + static const char *viewer = NULL; + if (viewer == NULL) { viewer = getenv ("VIEWER"); @@ -784,7 +791,6 @@ void do_edit_at_line (const vfs_path_t * what_vpath, gboolean internal, long start_line) { - static const char *editor = NULL; #ifdef USE_INTERNAL_EDIT if (internal) @@ -792,6 +798,8 @@ else #endif /* USE_INTERNAL_EDIT */ { + static const char *editor = NULL; + (void) internal; if (editor == NULL) @@ -949,7 +957,7 @@ _("Enter directory name:"), MC_HISTORY_FM_MKDIR, name, INPUT_COMPLETE_FILENAMES); - if (dir != NULL && dir != '\0') + if (dir != NULL && *dir != '\0') { vfs_path_t *absdir; @@ -1056,11 +1064,11 @@ select_invert_cmd (void) { int i; - file_entry *file; - for (i = 0; i < current_panel->count; i++) + for (i = 0; i < current_panel->dir.len; i++) { - file = ¤t_panel->dir.list[i]; + file_entry_t *file = ¤t_panel->dir.list[i]; + if (!panels_options.reverse_files_only || !S_ISDIR (file->st.st_mode)) do_file_mark (current_panel, i, !file->f.marked); } @@ -1087,7 +1095,6 @@ void ext_cmd (void) { - vfs_path_t *buffer_vpath; vfs_path_t *extdir_vpath; int dir; @@ -1102,6 +1109,8 @@ if (dir == 0) { + vfs_path_t *buffer_vpath; + buffer_vpath = mc_config_get_full_vpath (MC_FILEBIND_FILE); check_for_default (extdir_vpath, buffer_vpath); do_edit (buffer_vpath); @@ -1180,7 +1189,6 @@ void edit_fhl_cmd (void) { - vfs_path_t *buffer_vpath = NULL; vfs_path_t *fhlfile_vpath = NULL; int dir; @@ -1196,6 +1204,8 @@ if (dir == 0) { + vfs_path_t *buffer_vpath; + buffer_vpath = mc_config_get_full_vpath (MC_FHL_INI_FILE); check_for_default (fhlfile_vpath, buffer_vpath); do_edit (buffer_vpath); @@ -1369,7 +1379,7 @@ char buffer[MC_MAXPATHLEN]; char *p = NULL; int i; - char *dest, *q; + char *q; vfs_path_t *p_vpath; p = selection (current_panel)->fname; @@ -1380,6 +1390,8 @@ i = readlink (p, buffer, MC_MAXPATHLEN - 1); if (i > 0) { + char *dest; + buffer[i] = 0; dest = input_expand_dialog (_("Edit symlink"), q, MC_HISTORY_FM_EDIT_LINK, buffer, @@ -1604,7 +1616,7 @@ smart_dirsize_cmd (void) { WPanel *panel = current_panel; - file_entry *entry; + file_entry_t *entry; entry = &(panel->dir.list[panel->selected]); if ((S_ISDIR (entry->st.st_mode) && DIR_IS_DOTDOT (entry->fname)) || panel->dirs_marked) @@ -1619,12 +1631,13 @@ single_dirsize_cmd (void) { WPanel *panel = current_panel; - file_entry *entry; + file_entry_t *entry; entry = &(panel->dir.list[panel->selected]); if (S_ISDIR (entry->st.st_mode) && !DIR_IS_DOTDOT (entry->fname)) { - size_t marked = 0; + size_t dir_count = 0; + size_t count = 0; uintmax_t total = 0; ComputeDirSizeUI *ui; vfs_path_t *p; @@ -1632,8 +1645,8 @@ ui = compute_dir_size_create_ui (FALSE); p = vfs_path_from_str (entry->fname); - if (compute_dir_size (p, ui, compute_dir_size_update_ui, &marked, &total, TRUE) == - FILE_CONT) + if (compute_dir_size (p, ui, compute_dir_size_update_ui, &dir_count, &count, &total, TRUE) + == FILE_CONT) { entry->st.st_size = (off_t) total; entry->f.dir_size_computed = 1; @@ -1648,7 +1661,7 @@ recalculate_panel_summary (panel); - if (current_panel->sort_info.sort_field->sort_routine == (sortfn *) sort_size) + if (current_panel->sort_field->sort_routine == (GCompareFunc) sort_size) panel_re_sort (panel); panel->dirty = 1; @@ -1665,18 +1678,19 @@ ui = compute_dir_size_create_ui (FALSE); - for (i = 0; i < panel->count; i++) + for (i = 0; i < panel->dir.len; i++) if (S_ISDIR (panel->dir.list[i].st.st_mode) && ((panel->dirs_marked && panel->dir.list[i].f.marked) || !panel->dirs_marked) && !DIR_IS_DOTDOT (panel->dir.list[i].fname)) { vfs_path_t *p; - size_t marked = 0; + size_t dir_count = 0; + size_t count = 0; uintmax_t total = 0; gboolean ok; p = vfs_path_from_str (panel->dir.list[i].fname); - ok = compute_dir_size (p, ui, compute_dir_size_update_ui, &marked, &total, + ok = compute_dir_size (p, ui, compute_dir_size_update_ui, &dir_count, &count, &total, TRUE) != FILE_CONT; vfs_path_free (p); @@ -1691,7 +1705,7 @@ recalculate_panel_summary (panel); - if (current_panel->sort_info.sort_field->sort_routine == (sortfn *) sort_size) + if (current_panel->sort_field->sort_routine == (GCompareFunc) sort_size) panel_re_sort (panel); panel->dirty = 1; @@ -1703,17 +1717,17 @@ save_setup_cmd (void) { vfs_path_t *vpath; - char *path; + const char *path; - vpath = mc_config_get_full_vpath (MC_CONFIG_FILE); - path = vfs_path_to_str_flags (vpath, 0, VPF_STRIP_HOME); - vfs_path_free (vpath); + vpath = vfs_path_from_str_flags (mc_config_get_path (), VPF_STRIP_HOME); + path = vfs_path_as_str (vpath); if (save_setup (TRUE, TRUE)) message (D_NORMAL, _("Setup"), _("Setup saved to %s"), path); else message (D_ERROR, _("Setup"), _("Unable to save setup to %s"), path); - g_free (path); + + vfs_path_free (vpath); } /* --------------------------------------------------------------------------------------------- */ @@ -1793,7 +1807,7 @@ void quick_view_cmd (void) { - if ((WPanel *) get_panel_widget (MENU_PANEL_IDX) == current_panel) + if (PANEL (get_panel_widget (MENU_PANEL_IDX)) == current_panel) change_panel (); set_display_type (MENU_PANEL_IDX, view_quick); } @@ -1803,8 +1817,11 @@ void toggle_listing_cmd (void) { - int current = get_current_index (); - WPanel *p = (WPanel *) get_panel_widget (current); + int current; + WPanel *p; + + current = get_current_index (); + p = PANEL (get_panel_widget (current)); set_basic_panel_listing_to (current, (p->list_type + 1) % LIST_TYPES); } diff -Nru mc-4.8.10/src/filemanager/dir.c mc-4.8.11/src/filemanager/dir.c --- mc-4.8.10/src/filemanager/dir.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/filemanager/dir.c 2013-11-29 18:27:07.000000000 +0000 @@ -7,6 +7,7 @@ Written by: Slava Zanko , 2013 + Andrew Borodin , 2013 This file is part of the Midnight Commander. @@ -72,7 +73,7 @@ /* Are the exec_bit files top in list */ static gboolean exec_first = TRUE; -static dir_list dir_copy = { 0, 0 }; +static dir_list dir_copy = { NULL, 0, 0 }; /*** file scope functions ************************************************************************/ /* --------------------------------------------------------------------------------------------- */ @@ -129,55 +130,34 @@ for (i = 0; i < count; i++) { - str_release_key (list->list[i + start].sort_key, case_sensitive); - list->list[i + start].sort_key = NULL; - str_release_key (list->list[i + start].second_sort_key, case_sensitive); - list->list[i + start].second_sort_key = NULL; - } -} - -/* --------------------------------------------------------------------------------------------- */ -/** - * Increase directory list by RESIZE_STEPS - * - * @param list directory list - * @return FALSE on failure, TRUE on success - */ - -static gboolean -grow_list (dir_list * list) -{ - if (list == NULL) - return FALSE; - - list->list = g_try_realloc (list->list, sizeof (file_entry) * (list->size + RESIZE_STEPS)); + file_entry_t *fentry; - if (list->list == NULL) - return FALSE; - - list->size += RESIZE_STEPS; - - return TRUE; + fentry = &list->list[i + start]; + str_release_key (fentry->sort_key, case_sensitive); + fentry->sort_key = NULL; + str_release_key (fentry->second_sort_key, case_sensitive); + fentry->second_sort_key = NULL; + } } /* --------------------------------------------------------------------------------------------- */ /** * If you change handle_dirent then check also handle_path. - * @return -1 = failure, 0 = don't add, 1 = add to the list + * @return FALSE = don't add, TRUE = add to the list */ -static int -handle_dirent (dir_list * list, const char *fltr, struct dirent *dp, - struct stat *buf1, int next_free, int *link_to_dir, int *stale_link) +static gboolean +handle_dirent (struct dirent *dp, const char *fltr, struct stat *buf1, int *link_to_dir, + int *stale_link) { vfs_path_t *vpath; if (DIR_IS_DOT (dp->d_name) || DIR_IS_DOTDOT (dp->d_name)) - return 0; + return FALSE; if (!panels_options.show_dot_files && (dp->d_name[0] == '.')) - return 0; - if (!panels_options.show_backups && dp->d_name[NLENGTH (dp) - 1] == '~') - return 0; + return FALSE; + if (!panels_options.show_backups && dp->d_name[strlen (dp->d_name) - 1] == '~') + return FALSE; vpath = vfs_path_from_str (dp->d_name); if (mc_lstat (vpath, buf1) == -1) @@ -199,28 +179,24 @@ if (S_ISLNK (buf1->st_mode)) { struct stat buf2; + if (mc_stat (vpath, &buf2) == 0) *link_to_dir = S_ISDIR (buf2.st_mode) != 0; else *stale_link = 1; } - vfs_path_free (vpath); - if (!(S_ISDIR (buf1->st_mode) || *link_to_dir) && (fltr != NULL) - && !mc_search (fltr, dp->d_name, MC_SEARCH_T_GLOB)) - return 0; - /* Need to grow the *list? */ - if (next_free == list->size && !grow_list (list)) - return -1; + vfs_path_free (vpath); - return 1; + return (S_ISDIR (buf1->st_mode) || *link_to_dir != 0 || fltr == NULL + || mc_search (fltr, NULL, dp->d_name, MC_SEARCH_T_GLOB)); } /* --------------------------------------------------------------------------------------------- */ /** get info about ".." */ static gboolean -get_dotdot_dir_stat (const vfs_path_t * vpath, struct stat *st) +dir_get_dotdot_stat (const vfs_path_t * vpath, struct stat *st) { gboolean ret = FALSE; @@ -232,12 +208,10 @@ if (path != NULL && *path != '\0') { vfs_path_t *tmp_vpath; - struct stat s; tmp_vpath = vfs_path_append_new (vpath, "..", NULL); - ret = mc_stat (tmp_vpath, &s) == 0; + ret = mc_stat (tmp_vpath, st) == 0; vfs_path_free (tmp_vpath); - *st = s; } } @@ -251,25 +225,117 @@ { if (dir_copy.size < size) { - if (dir_copy.list) + if (dir_copy.list != NULL) { int i; - for (i = 0; i < dir_copy.size; i++) - g_free (dir_copy.list[i].fname); + + for (i = 0; i < dir_copy.len; i++) + { + file_entry_t *fentry; + + fentry = &(dir_copy.list)[i]; + g_free (fentry->fname); + } g_free (dir_copy.list); } - dir_copy.list = g_new0 (file_entry, size); + dir_copy.list = g_new0 (file_entry_t, size); dir_copy.size = size; + dir_copy.len = 0; } } /* --------------------------------------------------------------------------------------------- */ /*** public functions ****************************************************************************/ /* --------------------------------------------------------------------------------------------- */ +/** + * Increase or decrease directory list size. + * + * @param list directory list + * @param delta value by increase (if positive) or decrease (if negative) list size + * + * @return FALSE on failure, TRUE on success + */ + +gboolean +dir_list_grow (dir_list * list, int delta) +{ + int size; + gboolean clear = FALSE; + + if (list == NULL) + return FALSE; + + if (delta == 0) + return TRUE; + + size = list->size + delta; + if (size <= 0) + { + size = DIR_LIST_MIN_SIZE; + clear = TRUE; + } + + if (size != list->size) + { + file_entry_t *fe; + + fe = g_try_renew (file_entry_t, list->list, size); + if (fe == NULL) + return FALSE; + + list->list = fe; + list->size = size; + } + + list->len = clear ? 0 : min (list->len, size); + + return TRUE; +} + +/* --------------------------------------------------------------------------------------------- */ +/** + * Append file info to the directory list. + * + * @param list directory list + * @param fname file name + * @param st file stat info + * @param link_to_dir is file link to directory + * @param stale_link is file stale elink + * + * @return FALSE on failure, TRUE on success + */ + +gboolean +dir_list_append (dir_list * list, const char *fname, const struct stat * st, + gboolean link_to_dir, gboolean stale_link) +{ + file_entry_t *fentry; + + /* Need to grow the *list? */ + if (list->len == list->size && !dir_list_grow (list, DIR_LIST_RESIZE_STEP)) + return FALSE; + + fentry = &list->list[list->len]; + fentry->fnamelen = strlen (fname); + fentry->fname = g_strndup (fname, fentry->fnamelen); + fentry->f.marked = 0; + fentry->f.link_to_dir = link_to_dir ? 1 : 0; + fentry->f.stale_link = stale_link ? 1 : 0; + fentry->f.dir_size_computed = 0; + fentry->st = *st; + fentry->sort_key = NULL; + fentry->second_sort_key = NULL; + + list->len++; + + return TRUE; +} + +/* --------------------------------------------------------------------------------------------- */ int -unsorted (file_entry * a, file_entry * b) +unsorted (file_entry_t * a, file_entry_t * b) { (void) a; (void) b; @@ -279,7 +345,7 @@ /* --------------------------------------------------------------------------------------------- */ int -sort_name (file_entry * a, file_entry * b) +sort_name (file_entry_t * a, file_entry_t * b) { int ad = MY_ISDIR (a); int bd = MY_ISDIR (b); @@ -300,7 +366,7 @@ /* --------------------------------------------------------------------------------------------- */ int -sort_vers (file_entry * a, file_entry * b) +sort_vers (file_entry_t * a, file_entry_t * b) { int ad = MY_ISDIR (a); int bd = MY_ISDIR (b); @@ -318,14 +384,15 @@ /* --------------------------------------------------------------------------------------------- */ int -sort_ext (file_entry * a, file_entry * b) +sort_ext (file_entry_t * a, file_entry_t * b) { - int r; int ad = MY_ISDIR (a); int bd = MY_ISDIR (b); if (ad == bd || panels_options.mix_all_files) { + int r; + if (a->second_sort_key == NULL) a->second_sort_key = str_create_key (extension (a->fname), case_sensitive); if (b->second_sort_key == NULL) @@ -344,7 +411,7 @@ /* --------------------------------------------------------------------------------------------- */ int -sort_time (file_entry * a, file_entry * b) +sort_time (file_entry_t * a, file_entry_t * b) { int ad = MY_ISDIR (a); int bd = MY_ISDIR (b); @@ -364,7 +431,7 @@ /* --------------------------------------------------------------------------------------------- */ int -sort_ctime (file_entry * a, file_entry * b) +sort_ctime (file_entry_t * a, file_entry_t * b) { int ad = MY_ISDIR (a); int bd = MY_ISDIR (b); @@ -384,7 +451,7 @@ /* --------------------------------------------------------------------------------------------- */ int -sort_atime (file_entry * a, file_entry * b) +sort_atime (file_entry_t * a, file_entry_t * b) { int ad = MY_ISDIR (a); int bd = MY_ISDIR (b); @@ -404,7 +471,7 @@ /* --------------------------------------------------------------------------------------------- */ int -sort_inode (file_entry * a, file_entry * b) +sort_inode (file_entry_t * a, file_entry_t * b) { int ad = MY_ISDIR (a); int bd = MY_ISDIR (b); @@ -418,7 +485,7 @@ /* --------------------------------------------------------------------------------------------- */ int -sort_size (file_entry * a, file_entry * b) +sort_size (file_entry_t * a, file_entry_t * b) { int ad = MY_ISDIR (a); int bd = MY_ISDIR (b); @@ -437,59 +504,74 @@ /* --------------------------------------------------------------------------------------------- */ void -do_sort (dir_list * list, sortfn * sort, int top, gboolean reverse_f, gboolean case_sensitive_f, - gboolean exec_first_f) +dir_list_sort (dir_list * list, GCompareFunc sort, const dir_sort_options_t * sort_op) { + file_entry_t *fentry; int dot_dot_found = 0; - if (top == 0) + if (list->len < 2) return; /* If there is an ".." entry the caller must take care to ensure that it occupies the first list element. */ - if (DIR_IS_DOTDOT (list->list[0].fname)) + fentry = &list->list[0]; + if (DIR_IS_DOTDOT (fentry->fname)) dot_dot_found = 1; - reverse = reverse_f ? -1 : 1; - case_sensitive = case_sensitive_f ? 1 : 0; - exec_first = exec_first_f; - qsort (&(list->list)[dot_dot_found], top + 1 - dot_dot_found, sizeof (file_entry), sort); + reverse = sort_op->reverse ? -1 : 1; + case_sensitive = sort_op->case_sensitive ? 1 : 0; + exec_first = sort_op->exec_first; + qsort (&(list->list)[dot_dot_found], list->len - dot_dot_found, sizeof (file_entry_t), sort); - clean_sort_keys (list, dot_dot_found, top + 1 - dot_dot_found); + clean_sort_keys (list, dot_dot_found, list->len - dot_dot_found); } /* --------------------------------------------------------------------------------------------- */ void -clean_dir (dir_list * list, int count) +dir_list_clean (dir_list * list) { int i; - for (i = 0; i < count; i++) + for (i = 0; i < list->len; i++) { - g_free (list->list[i].fname); - list->list[i].fname = NULL; + file_entry_t *fentry; + + fentry = &list->list[i]; + g_free (fentry->fname); + fentry->fname = NULL; } + + list->len = 0; + /* reduce memory usage */ + dir_list_grow (list, DIR_LIST_MIN_SIZE - list->size); } /* --------------------------------------------------------------------------------------------- */ /** Used to set up a directory list when there is no access to a directory */ gboolean -set_zero_dir (dir_list * list) +dir_list_init (dir_list * list) { + file_entry_t *fentry; + /* Need to grow the *list? */ - if (list->size == 0 && !grow_list (list)) + if (list->size == 0 && !dir_list_grow (list, DIR_LIST_RESIZE_STEP)) + { + list->len = 0; return FALSE; + } - memset (&(list->list)[0], 0, sizeof (file_entry)); - list->list[0].fnamelen = 2; - list->list[0].fname = g_strndup ("..", list->list[0].fnamelen); - list->list[0].f.link_to_dir = 0; - list->list[0].f.stale_link = 0; - list->list[0].f.dir_size_computed = 0; - list->list[0].f.marked = 0; - list->list[0].st.st_mode = 040755; + fentry = &list->list[0]; + memset (fentry, 0, sizeof (file_entry_t)); + fentry->fnamelen = 2; + fentry->fname = g_strndup ("..", fentry->fnamelen); + fentry->f.link_to_dir = 0; + fentry->f.stale_link = 0; + fentry->f.dir_size_computed = 0; + fentry->f.marked = 0; + fentry->st.st_mode = 040755; + list->len = 1; return TRUE; } @@ -500,22 +582,21 @@ and panels_options.show_backups. Moreover handle_path can't be used with a filemask. If you change handle_path then check also handle_dirent. */ -/* Return values: -1 = failure, 0 = don't add, 1 = add to the list */ +/* Return values: FALSE = don't add, TRUE = add to the list */ -int -handle_path (dir_list * list, const char *path, - struct stat *buf1, int next_free, int *link_to_dir, int *stale_link) +gboolean +handle_path (const char *path, struct stat * buf1, int *link_to_dir, int *stale_link) { vfs_path_t *vpath; if (DIR_IS_DOT (path) || DIR_IS_DOTDOT (path)) - return 0; + return FALSE; vpath = vfs_path_from_str (path); if (mc_lstat (vpath, buf1) == -1) { vfs_path_free (vpath); - return 0; + return FALSE; } if (S_ISDIR (buf1->st_mode)) @@ -527,6 +608,7 @@ if (S_ISLNK (buf1->st_mode)) { struct stat buf2; + if (mc_stat (vpath, &buf2) == 0) *link_to_dir = S_ISDIR (buf2.st_mode) != 0; else @@ -535,38 +617,34 @@ vfs_path_free (vpath); - /* Need to grow the *list? */ - if (next_free == list->size && !grow_list (list)) - return -1; - - return 1; + return TRUE; } /* --------------------------------------------------------------------------------------------- */ -int -do_load_dir (const vfs_path_t * vpath, dir_list * list, sortfn * sort, gboolean lc_reverse, - gboolean lc_case_sensitive, gboolean exec_ff, const char *fltr) +void +dir_list_load (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, + const dir_sort_options_t * sort_op, const char *fltr) { DIR *dirp; struct dirent *dp; - int status, link_to_dir, stale_link; - int next_free = 0; + int link_to_dir, stale_link; struct stat st; + file_entry_t *fentry; /* ".." (if any) must be the first entry in the list */ - if (!set_zero_dir (list)) - return next_free; + if (!dir_list_init (list)) + return; - if (get_dotdot_dir_stat (vpath, &st)) - list->list[next_free].st = st; - next_free++; + fentry = &list->list[0]; + if (dir_get_dotdot_stat (vpath, &st)) + fentry->st = st; dirp = mc_opendir (vpath); if (dirp == NULL) { message (D_ERROR, MSG_ERROR, _("Cannot read directory contents")); - return next_free; + return; } tree_store_start_check (vpath); @@ -577,47 +655,33 @@ vpath_str = vfs_path_as_str (vpath); /* Do not add a ".." entry to the root directory */ if ((vpath_str[0] == PATH_SEP) && (vpath_str[1] == '\0')) - next_free--; + list->len--; } while ((dp = mc_readdir (dirp)) != NULL) { - status = handle_dirent (list, fltr, dp, &st, next_free, &link_to_dir, &stale_link); - if (status == 0) + if (!handle_dirent (dp, fltr, &st, &link_to_dir, &stale_link)) continue; - if (status == -1) - goto ret; - list->list[next_free].fnamelen = NLENGTH (dp); - list->list[next_free].fname = g_strndup (dp->d_name, list->list[next_free].fnamelen); - list->list[next_free].f.marked = 0; - list->list[next_free].f.link_to_dir = link_to_dir; - list->list[next_free].f.stale_link = stale_link; - list->list[next_free].f.dir_size_computed = 0; - list->list[next_free].st = st; - list->list[next_free].sort_key = NULL; - list->list[next_free].second_sort_key = NULL; - next_free++; + if (!dir_list_append (list, dp->d_name, &st, link_to_dir != 0, stale_link != 0)) + goto ret; - if ((next_free & 31) == 0) + if ((list->len & 31) == 0) rotate_dash (TRUE); } - if (next_free != 0) - do_sort (list, sort, next_free - 1, lc_reverse, lc_case_sensitive, exec_ff); + dir_list_sort (list, sort, sort_op); ret: mc_closedir (dirp); tree_store_end_check (); rotate_dash (FALSE); - return next_free; } - /* --------------------------------------------------------------------------------------------- */ gboolean -if_link_is_exe (const vfs_path_t * full_name_vpath, const file_entry * file) +if_link_is_exe (const vfs_path_t * full_name_vpath, const file_entry_t * file) { struct stat b; @@ -629,14 +693,13 @@ /* --------------------------------------------------------------------------------------------- */ /** If fltr is null, then it is a match */ -int -do_reload_dir (const vfs_path_t * vpath, dir_list * list, sortfn * sort, int count, - gboolean lc_reverse, gboolean lc_case_sensitive, gboolean exec_ff, const char *fltr) +void +dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, + const dir_sort_options_t * sort_op, const char *fltr) { DIR *dirp; struct dirent *dp; - int next_free = 0; - int i, status, link_to_dir, stale_link; + int i, link_to_dir, stale_link; struct stat st; int marked_cnt; GHashTable *marked_files; @@ -646,27 +709,33 @@ if (dirp == NULL) { message (D_ERROR, MSG_ERROR, _("Cannot read directory contents")); - clean_dir (list, count); - return set_zero_dir (list) ? 1 : 0; + dir_list_clean (list); + dir_list_init (list); + return; } tree_store_start_check (vpath); marked_files = g_hash_table_new (g_str_hash, g_str_equal); - alloc_dir_copy (list->size); - for (marked_cnt = i = 0; i < count; i++) + alloc_dir_copy (list->len); + for (marked_cnt = i = 0; i < list->len; i++) { - dir_copy.list[i].fnamelen = list->list[i].fnamelen; - dir_copy.list[i].fname = list->list[i].fname; - dir_copy.list[i].f.marked = list->list[i].f.marked; - dir_copy.list[i].f.dir_size_computed = list->list[i].f.dir_size_computed; - dir_copy.list[i].f.link_to_dir = list->list[i].f.link_to_dir; - dir_copy.list[i].f.stale_link = list->list[i].f.stale_link; - dir_copy.list[i].sort_key = NULL; - dir_copy.list[i].second_sort_key = NULL; - if (list->list[i].f.marked) + file_entry_t *fentry, *dfentry; + + fentry = &list->list[i]; + dfentry = &dir_copy.list[i]; + + dfentry->fnamelen = fentry->fnamelen; + dfentry->fname = fentry->fname; + dfentry->f.marked = fentry->f.marked; + dfentry->f.dir_size_computed = fentry->f.dir_size_computed; + dfentry->f.link_to_dir = fentry->f.link_to_dir; + dfentry->f.stale_link = fentry->f.stale_link; + dfentry->sort_key = NULL; + dfentry->second_sort_key = NULL; + if (fentry->f.marked) { - g_hash_table_insert (marked_files, dir_copy.list[i].fname, &dir_copy.list[i]); + g_hash_table_insert (marked_files, dfentry->fname, dfentry); marked_cnt++; } } @@ -674,29 +743,36 @@ /* Add ".." except to the root directory. The ".." entry (if any) must be the first in the list. */ tmp_path = vfs_path_get_by_index (vpath, 0)->path; - if (! - (vfs_path_elements_count (vpath) == 1 && (tmp_path[0] == PATH_SEP) - && (tmp_path[1] == '\0'))) + if (vfs_path_elements_count (vpath) == 1 && tmp_path[0] == PATH_SEP && tmp_path[1] == '\0') { - if (!set_zero_dir (list)) + /* root directory */ + dir_list_clean (list); + } + else + { + if (!dir_list_init (list)) { - clean_dir (list, count); - clean_dir (&dir_copy, count); - return next_free; + dir_list_clean (&dir_copy); + return; } - if (get_dotdot_dir_stat (vpath, &st)) - list->list[next_free].st = st; + if (dir_get_dotdot_stat (vpath, &st)) + { + file_entry_t *fentry; - next_free++; + fentry = &list->list[0]; + fentry->st = st; + } } - while ((dp = mc_readdir (dirp))) + while ((dp = mc_readdir (dirp)) != NULL) { - status = handle_dirent (list, fltr, dp, &st, next_free, &link_to_dir, &stale_link); - if (status == 0) + file_entry_t *fentry; + + if (!handle_dirent (dp, fltr, &st, &link_to_dir, &stale_link)) continue; - if (status == -1) + + if (!dir_list_append (list, dp->d_name, &st, link_to_dir != 0, stale_link != 0)) { mc_closedir (dirp); /* Norbert (Feb 12, 1997): @@ -704,55 +780,41 @@ -1 means big trouble (at the moment no memory left), I don't bother with further cleanup because if one gets to this point he will have more problems than a few memory - leaks and because one 'clean_dir' would not be enough (and + leaks and because one 'dir_list_clean' would not be enough (and because I don't want to spent the time to make it working, IMHO it's not worthwhile). - clean_dir (&dir_copy, count); + dir_list_clean (&dir_copy); */ tree_store_end_check (); g_hash_table_destroy (marked_files); - return next_free; + return; } + fentry = &list->list[list->len - 1]; - list->list[next_free].f.marked = 0; + fentry->f.marked = 0; /* * If we have marked files in the copy, scan through the copy * to find matching file. Decrease number of remaining marks if * we copied one. */ - if (marked_cnt > 0) + if (marked_cnt > 0 && g_hash_table_lookup (marked_files, dp->d_name) != NULL) { - if ((g_hash_table_lookup (marked_files, dp->d_name))) - { - list->list[next_free].f.marked = 1; - marked_cnt--; - } + fentry->f.marked = 1; + marked_cnt--; } - list->list[next_free].fnamelen = NLENGTH (dp); - list->list[next_free].fname = g_strndup (dp->d_name, list->list[next_free].fnamelen); - list->list[next_free].f.link_to_dir = link_to_dir; - list->list[next_free].f.stale_link = stale_link; - list->list[next_free].f.dir_size_computed = 0; - list->list[next_free].st = st; - list->list[next_free].sort_key = NULL; - list->list[next_free].second_sort_key = NULL; - next_free++; - if ((next_free % 16) == 0) + if ((list->len & 15) == 0) rotate_dash (TRUE); } mc_closedir (dirp); tree_store_end_check (); g_hash_table_destroy (marked_files); - if (next_free) - { - do_sort (list, sort, next_free - 1, lc_reverse, lc_case_sensitive, exec_ff); - } - clean_dir (&dir_copy, count); - rotate_dash (FALSE); - return next_free; + dir_list_sort (list, sort, sort_op); + + dir_list_clean (&dir_copy); + rotate_dash (FALSE); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.10/src/filemanager/dir.h mc-4.8.11/src/filemanager/dir.h --- mc-4.8.10/src/filemanager/dir.h 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/filemanager/dir.h 2013-10-15 09:52:41.000000000 +0000 @@ -13,53 +13,67 @@ /*** typedefs(not structures) and defined constants **********************************************/ -#define MIN_FILES 128 -#define RESIZE_STEPS 128 - -typedef int sortfn (const void *, const void *); +#define DIR_LIST_MIN_SIZE 128 +#define DIR_LIST_RESIZE_STEP 128 /*** enums ***************************************************************************************/ /*** structures declarations (and typedefs of structures)*****************************************/ +/** + * A structure to represent directory content + */ typedef struct { - file_entry *list; - int size; + file_entry_t *list; /**< list of file_entry_t objects */ + int size; /**< number of allocated elements in list (capacity) */ + int len; /**< number of used elements in list */ } dir_list; +/** + * A structure to represent sort options for directory content + */ +typedef struct dir_sort_options_struct +{ + gboolean reverse; /**< sort is reverse */ + gboolean case_sensitive; /**< sort is case sensitive */ + gboolean exec_first; /**< executables are at top of list */ +} dir_sort_options_t; + /*** global variables defined in .c file *********************************************************/ /*** declarations of public functions ************************************************************/ -int do_load_dir (const vfs_path_t * vpath, dir_list * list, sortfn * sort, gboolean reverse, - gboolean case_sensitive, gboolean exec_ff, const char *fltr); -void do_sort (dir_list * list, sortfn * sort, int top, gboolean reverse, - gboolean case_sensitive, gboolean exec_ff); -int do_reload_dir (const vfs_path_t * vpath, dir_list * list, sortfn * sort, int count, - gboolean reverse, gboolean case_sensitive, gboolean exec_ff, const char *fltr); -void clean_dir (dir_list * list, int count); -gboolean set_zero_dir (dir_list * list); -int handle_path (dir_list * list, const char *path, struct stat *buf1, - int next_free, int *link_to_dir, int *stale_link); +gboolean dir_list_grow (dir_list * list, int delta); +gboolean dir_list_append (dir_list * list, const char *fname, const struct stat *st, + gboolean link_to_dir, gboolean stale_link); + +void dir_list_load (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, + const dir_sort_options_t * sort_op, const char *fltr); +void dir_list_reload (dir_list * list, const vfs_path_t * vpath, GCompareFunc sort, + const dir_sort_options_t * sort_op, const char *fltr); +void dir_list_sort (dir_list * list, GCompareFunc sort, const dir_sort_options_t * sort_op); +gboolean dir_list_init (dir_list * list); +void dir_list_clean (dir_list * list); +gboolean handle_path (const char *path, struct stat *buf1, int *link_to_dir, int *stale_link); /* Sorting functions */ -int unsorted (file_entry * a, file_entry * b); -int sort_name (file_entry * a, file_entry * b); -int sort_vers (file_entry * a, file_entry * b); -int sort_ext (file_entry * a, file_entry * b); -int sort_time (file_entry * a, file_entry * b); -int sort_atime (file_entry * a, file_entry * b); -int sort_ctime (file_entry * a, file_entry * b); -int sort_size (file_entry * a, file_entry * b); -int sort_inode (file_entry * a, file_entry * b); +int unsorted (file_entry_t * a, file_entry_t * b); +int sort_name (file_entry_t * a, file_entry_t * b); +int sort_vers (file_entry_t * a, file_entry_t * b); +int sort_ext (file_entry_t * a, file_entry_t * b); +int sort_time (file_entry_t * a, file_entry_t * b); +int sort_atime (file_entry_t * a, file_entry_t * b); +int sort_ctime (file_entry_t * a, file_entry_t * b); +int sort_size (file_entry_t * a, file_entry_t * b); +int sort_inode (file_entry_t * a, file_entry_t * b); -gboolean if_link_is_exe (const vfs_path_t * full_name, const file_entry * file); +gboolean if_link_is_exe (const vfs_path_t * full_name, const file_entry_t * file); /*** inline functions ****************************************************************************/ static inline gboolean -link_isdir (const file_entry * file) +link_isdir (const file_entry_t * file) { return (gboolean) file->f.link_to_dir; } diff -Nru mc-4.8.10/src/filemanager/ext.c mc-4.8.11/src/filemanager/ext.c --- mc-4.8.10/src/filemanager/ext.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/filemanager/ext.c 2013-11-29 18:27:07.000000000 +0000 @@ -625,9 +625,6 @@ /* Following variables are valid if *have_type is TRUE */ static char content_string[2048]; -#ifdef HAVE_CHARSET - static char encoding_id[21]; /* CSISO51INISCYRILLIC -- 20 */ -#endif static size_t content_shift = 0; static int got_data = 0; @@ -640,6 +637,7 @@ const char *realname; /* name used with "file" */ #ifdef HAVE_CHARSET + static char encoding_id[21]; /* CSISO51INISCYRILLIC -- 20 */ int got_encoding_data; #endif /* HAVE_CHARSET */ @@ -726,7 +724,7 @@ { mc_search_t *search; - search = mc_search_new (ptr, -1); + search = mc_search_new (ptr, -1, DEFAULT_CHARSET); if (search != NULL) { search->search_type = MC_SEARCH_T_REGEX; @@ -917,7 +915,7 @@ if (case_insense) p += 2; - search = mc_search_new (p, -1); + search = mc_search_new (p, -1, DEFAULT_CHARSET); if (search != NULL) { search->search_type = MC_SEARCH_T_REGEX; @@ -930,7 +928,8 @@ else if (strncmp (p, "directory/", 10) == 0) { if (S_ISDIR (mystat.st_mode) - && mc_search (p + 10, vfs_path_as_str (filename_vpath), MC_SEARCH_T_REGEX)) + && mc_search (p + 10, DEFAULT_CHARSET, vfs_path_as_str (filename_vpath), + MC_SEARCH_T_REGEX)) found = TRUE; } else if (strncmp (p, "shell/", 6) == 0) diff -Nru mc-4.8.10/src/filemanager/file.c mc-4.8.11/src/filemanager/file.c --- mc-4.8.10/src/filemanager/file.c 2013-08-02 18:02:40.000000000 +0000 +++ mc-4.8.11/src/filemanager/file.c 2013-11-29 18:27:07.000000000 +0000 @@ -196,7 +196,7 @@ /* --------------------------------------------------------------------------------------------- */ static char * -transform_source (FileOpContext * ctx, const vfs_path_t * source_vpath) +transform_source (file_op_context_t * ctx, const vfs_path_t * source_vpath) { char *s, *q; char *fnsource; @@ -245,11 +245,10 @@ /* --------------------------------------------------------------------------------------------- */ -static void * +static inline void * free_linklist (GSList * lp) { - g_slist_foreach (lp, (GFunc) free_link, NULL); - g_slist_free (lp); + g_slist_free_full (lp, free_link); return NULL; } @@ -354,7 +353,7 @@ */ static FileProgressStatus -make_symlink (FileOpContext * ctx, const char *src_path, const char *dst_path) +make_symlink (file_op_context_t * ctx, const char *src_path, const char *dst_path) { char link_target[MC_MAXPATHLEN]; int len; @@ -401,13 +400,13 @@ if (ctx->stable_symlinks && !g_path_is_absolute (link_target)) { - char *p, *s; - vfs_path_t *q; - const char *r = strrchr (src_path, PATH_SEP); if (r) { + char *p; + vfs_path_t *q; + p = g_strndup (src_path, r - src_path + 1); if (g_path_is_absolute (dst_path)) q = vfs_path_from_str_flags (dst_path, VPF_NO_CANON); @@ -416,6 +415,7 @@ if (vfs_path_tokens_count (q) > 1) { + char *s; vfs_path_t *tmp_vpath1, *tmp_vpath2; tmp_vpath1 = vfs_path_vtokens_get (q, -1, 1); @@ -549,7 +549,8 @@ update_ui_count++; if ((update_ui_count & 31) == 0) ret = - (cback == NULL) ? FILE_CONT : cback (ui, tmp_vpath, *dir_count, *ret_total); + (cback == NULL) ? FILE_CONT : cback (ui, dirname_vpath, *dir_count, + *ret_total); } } @@ -563,7 +564,7 @@ /* --------------------------------------------------------------------------------------------- */ static FileProgressStatus -progress_update_one (FileOpTotalContext * tctx, FileOpContext * ctx, off_t add) +progress_update_one (FileOpTotalContext * tctx, file_op_context_t * ctx, off_t add) { struct timeval tv_current; static struct timeval tv_start = { }; @@ -667,7 +668,7 @@ /* --------------------------------------------------------------------------------------------- */ static FileProgressStatus -real_query_recursive (FileOpContext * ctx, enum OperationMode mode, const char *s) +real_query_recursive (file_op_context_t * ctx, enum OperationMode mode, const char *s) { if (ctx->recursive_result < RECURSIVE_ALWAYS) @@ -731,12 +732,12 @@ /* --------------------------------------------------------------------------------------------- */ static FileProgressStatus -query_recursive (FileOpContext * ctx, const char *s) +query_recursive (file_op_context_t * ctx, const char *s) { union { void *p; - FileProgressStatus (*f) (FileOpContext *, enum OperationMode, const char *); + FileProgressStatus (*f) (file_op_context_t *, enum OperationMode, const char *); } pntr; pntr.f = real_query_recursive; @@ -749,13 +750,13 @@ /* --------------------------------------------------------------------------------------------- */ static FileProgressStatus -query_replace (FileOpContext * ctx, const char *destname, struct stat *_s_stat, +query_replace (file_op_context_t * ctx, const char *destname, struct stat *_s_stat, struct stat *_d_stat) { union { void *p; - FileProgressStatus (*f) (FileOpContext *, enum OperationMode, const char *, + FileProgressStatus (*f) (file_op_context_t *, enum OperationMode, const char *, struct stat *, struct stat *); } pntr; pntr.f = file_progress_real_query_replace; @@ -779,7 +780,7 @@ /* --------------------------------------------------------------------------------------------- */ static FileProgressStatus -query_recursive (FileOpContext * ctx, const char *s) +query_recursive (file_op_context_t * ctx, const char *s) { return real_query_recursive (ctx, Foreground, s); } @@ -787,7 +788,7 @@ /* --------------------------------------------------------------------------------------------- */ static FileProgressStatus -query_replace (FileOpContext * ctx, const char *destname, struct stat *_s_stat, +query_replace (file_op_context_t * ctx, const char *destname, struct stat *_s_stat, struct stat *_d_stat) { return file_progress_real_query_replace (ctx, Foreground, destname, _s_stat, _d_stat); @@ -818,7 +819,7 @@ /* --------------------------------------------------------------------------------------------- */ static void -copy_file_file_display_progress (FileOpTotalContext * tctx, FileOpContext * ctx, +copy_file_file_display_progress (FileOpTotalContext * tctx, file_op_context_t * ctx, struct timeval tv_current, struct timeval tv_transfer_start, off_t file_size, off_t n_read_total) { @@ -873,7 +874,7 @@ /* {{{ Move routines */ static FileProgressStatus -move_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, const char *d) +move_file_file (FileOpTotalContext * tctx, file_op_context_t * ctx, const char *s, const char *d) { struct stat src_stats, dst_stats; FileProgressStatus return_status = FILE_CONT; @@ -1023,9 +1024,8 @@ /** Don't update progress status if progress_count==NULL */ static FileProgressStatus -erase_file (FileOpTotalContext * tctx, FileOpContext * ctx, const vfs_path_t * vpath) +erase_file (FileOpTotalContext * tctx, file_op_context_t * ctx, const vfs_path_t * vpath) { - int return_status; struct stat buf; file_progress_show_deleting (ctx, vfs_path_as_str (vpath), &tctx->progress_count); @@ -1043,6 +1043,8 @@ while (mc_unlink (vpath) != 0 && !ctx->skip_all) { + int return_status; + return_status = file_error (_("Cannot delete file \"%s\"\n%s"), vfs_path_as_str (vpath)); if (return_status == FILE_ABORT) return return_status; @@ -1068,7 +1070,7 @@ skipall->remove as much as possible */ static FileProgressStatus -recursive_erase (FileOpTotalContext * tctx, FileOpContext * ctx, const vfs_path_t * vpath) +recursive_erase (FileOpTotalContext * tctx, file_op_context_t * ctx, const vfs_path_t * vpath) { struct dirent *next; DIR *reading; @@ -1158,7 +1160,7 @@ /* --------------------------------------------------------------------------------------------- */ static FileProgressStatus -erase_dir_iff_empty (FileOpContext * ctx, const vfs_path_t * vpath, size_t count) +erase_dir_iff_empty (file_op_context_t * ctx, const vfs_path_t * vpath, size_t count) { FileProgressStatus error = FILE_CONT; const char *s; @@ -1214,7 +1216,7 @@ { int i; - for (i = 0; i < panel->count; i++) + for (i = 0; i < panel->dir.len; i++) if (panel->dir.list[i].f.marked) return g_strdup (panel->dir.list[i].fname); } @@ -1233,11 +1235,13 @@ static FileProgressStatus panel_compute_totals (const WPanel * panel, void *ui, compute_dir_size_callback cback, - size_t * ret_marked, uintmax_t * ret_total, gboolean compute_symlinks) + size_t * ret_count, uintmax_t * ret_total, gboolean compute_symlinks) { int i; + size_t lc_count = 0; + uintmax_t lc_total = 0; - for (i = 0; i < panel->count; i++) + for (i = 0; i < panel->dir.len; i++) { struct stat *s; @@ -1250,21 +1254,31 @@ { vfs_path_t *p; FileProgressStatus status; + size_t lc_dir_count = 0; + size_t lc_marked = 0; + uintmax_t lc_total2 = 0; p = vfs_path_append_new (panel->cwd_vpath, panel->dir.list[i].fname, NULL); - status = compute_dir_size (p, ui, cback, ret_marked, ret_total, compute_symlinks); + status = compute_dir_size (p, ui, cback, &lc_dir_count, &lc_marked, &lc_total2, + compute_symlinks); vfs_path_free (p); if (status != FILE_CONT) return status; + + lc_count += lc_marked; + lc_total += lc_total2; } else { - (*ret_marked)++; - *ret_total += (uintmax_t) s->st_size; + lc_count++; + lc_total += (uintmax_t) s->st_size; } } + *ret_count = lc_count; + *ret_total = lc_total; + return FILE_CONT; } @@ -1272,8 +1286,8 @@ /** Initialize variables for progress bars */ static FileProgressStatus -panel_operate_init_totals (FileOperation operation, const WPanel * panel, const char *source, - FileOpContext * ctx, filegui_dialog_type_t dialog_type) +panel_operate_init_totals (const WPanel * panel, const char *source, file_op_context_t * ctx, + filegui_dialog_type_t dialog_type) { FileProgressStatus status; @@ -1282,7 +1296,7 @@ return FILE_CONT; #endif - if (operation != OP_MOVE && verbose && file_op_compute_totals) + if (verbose && file_op_compute_totals) { ComputeDirSizeUI *ui; @@ -1298,9 +1312,10 @@ else { vfs_path_t *p; + size_t dir_count = 0; p = vfs_path_from_str (source); - status = compute_dir_size (p, ui, compute_dir_size_update_ui, + status = compute_dir_size (p, ui, compute_dir_size_update_ui, &dir_count, &ctx->progress_count, &ctx->progress_bytes, ctx->follow_links); vfs_path_free (p); @@ -1443,7 +1458,7 @@ #ifdef ENABLE_BACKGROUND static int -end_bg_process (FileOpContext * ctx, enum OperationMode mode) +end_bg_process (file_op_context_t * ctx, enum OperationMode mode) { int pid = ctx->pid; @@ -1462,7 +1477,7 @@ /* --------------------------------------------------------------------------------------------- */ FileProgressStatus -copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, +copy_file_file (FileOpTotalContext * tctx, file_op_context_t * ctx, const char *src_path, const char *dst_path) { uid_t src_uid = (uid_t) (-1); @@ -1998,7 +2013,7 @@ function calls */ FileProgressStatus -copy_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, const char *d, +copy_dir_dir (FileOpTotalContext * tctx, file_op_context_t * ctx, const char *s, const char *d, gboolean toplevel, gboolean move_over, gboolean do_delete, GSList * parent_dirs) { struct dirent *next; @@ -2268,7 +2283,7 @@ /* {{{ Move routines */ FileProgressStatus -move_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, const char *d) +move_dir_dir (FileOpTotalContext * tctx, file_op_context_t * ctx, const char *s, const char *d) { struct stat sbuf, dbuf, destbuf; FileProgressStatus return_status; @@ -2378,13 +2393,6 @@ mc_refresh (); if (ctx->erase_at_end) { - /* remove files after move */ - if (erase_list != NULL) - { - file_op_context_destroy_ui (ctx); - file_op_context_create_ui (ctx, FALSE, FILEGUI_DIALOG_DELETE_ITEM); - } - while (erase_list != NULL && return_status != FILE_ABORT) { struct link *lp = (struct link *) erase_list->data; @@ -2414,7 +2422,7 @@ /* {{{ Erase routines */ FileProgressStatus -erase_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const vfs_path_t * s_vpath) +erase_dir (FileOpTotalContext * tctx, file_op_context_t * ctx, const vfs_path_t * s_vpath) { FileProgressStatus error; @@ -2572,12 +2580,11 @@ FileProgressStatus compute_dir_size (const vfs_path_t * dirname_vpath, void *ui, compute_dir_size_callback cback, - size_t * ret_marked, uintmax_t * ret_total, gboolean compute_symlinks) + size_t * ret_dir_count, size_t * ret_marked_count, uintmax_t * ret_total, + gboolean compute_symlinks) { - size_t dir_count = 0; - - return do_compute_dir_size (dirname_vpath, ui, cback, &dir_count, ret_marked, ret_total, - compute_symlinks); + return do_compute_dir_size (dirname_vpath, ui, cback, ret_dir_count, ret_marked_count, + ret_total, compute_symlinks); } /* --------------------------------------------------------------------------------------------- */ @@ -2597,7 +2604,7 @@ gboolean panel_operate (void *source_panel, FileOperation operation, gboolean force_single) { - WPanel *panel = (WPanel *) source_panel; + WPanel *panel = PANEL (source_panel); const gboolean single_entry = force_single || (panel->marked <= 1) || (get_current_type () == view_tree); @@ -2615,7 +2622,7 @@ gboolean ret_val = TRUE; int i; FileProgressStatus value; - FileOpContext *ctx; + file_op_context_t *ctx; FileOpTotalContext *tctx; vfs_path_t *tmp_vpath; filegui_dialog_type_t dialog_type = FILEGUI_DIALOG_ONE_ITEM; @@ -2792,14 +2799,12 @@ { if (operation == OP_DELETE) dialog_type = FILEGUI_DIALOG_DELETE_ITEM; + else if (single_entry && S_ISDIR (selection (panel)->st.st_mode)) + dialog_type = FILEGUI_DIALOG_MULTI_ITEM; + else if (single_entry || force_single) + dialog_type = FILEGUI_DIALOG_ONE_ITEM; else - { - dialog_type = ((operation != OP_COPY) || single_entry || force_single) - ? FILEGUI_DIALOG_ONE_ITEM : FILEGUI_DIALOG_MULTI_ITEM; - - if (single_entry && (operation == OP_COPY) && S_ISDIR (selection (panel)->st.st_mode)) - dialog_type = FILEGUI_DIALOG_MULTI_ITEM; - } + dialog_type = FILEGUI_DIALOG_MULTI_ITEM; } /* Initialize things */ @@ -2844,8 +2849,8 @@ else source_with_vpath = vfs_path_append_new (panel->cwd_vpath, source, (char *) NULL); #endif /* WITH_FULL_PATHS */ - if (panel_operate_init_totals - (operation, panel, vfs_path_as_str (source_with_vpath), ctx, dialog_type) == FILE_CONT) + if (panel_operate_init_totals (panel, vfs_path_as_str (source_with_vpath), ctx, dialog_type) + == FILE_CONT) { if (operation == OP_DELETE) { @@ -2936,10 +2941,10 @@ goto clean_up; } - if (panel_operate_init_totals (operation, panel, NULL, ctx, dialog_type) == FILE_CONT) + if (panel_operate_init_totals (panel, NULL, ctx, dialog_type) == FILE_CONT) { /* Loop for every file, perform the actual copy operation */ - for (i = 0; i < panel->count; i++) + for (i = 0; i < panel->dir.len; i++) { const char *source2; diff -Nru mc-4.8.10/src/filemanager/file.h mc-4.8.11/src/filemanager/file.h --- mc-4.8.10/src/filemanager/file.h 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/filemanager/file.h 2013-11-29 18:27:07.000000000 +0000 @@ -34,15 +34,15 @@ /*** declarations of public functions ************************************************************/ -FileProgressStatus copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, +FileProgressStatus copy_file_file (FileOpTotalContext * tctx, file_op_context_t * ctx, const char *src_path, const char *dst_path); -FileProgressStatus move_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, +FileProgressStatus move_dir_dir (FileOpTotalContext * tctx, file_op_context_t * ctx, const char *s, const char *d); -FileProgressStatus copy_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, +FileProgressStatus copy_dir_dir (FileOpTotalContext * tctx, file_op_context_t * ctx, const char *s, const char *d, gboolean toplevel, gboolean move_over, gboolean do_delete, GSList * parent_dirs); -FileProgressStatus erase_dir (FileOpTotalContext * tctx, FileOpContext * ctx, +FileProgressStatus erase_dir (FileOpTotalContext * tctx, file_op_context_t * ctx, const vfs_path_t * vpath); gboolean panel_operate (void *source_panel, FileOperation op, gboolean force_single); @@ -55,8 +55,8 @@ /* return value is FILE_CONT or FILE_ABORT */ FileProgressStatus compute_dir_size (const vfs_path_t * dirname_vpath, void *ui, compute_dir_size_callback cback, - size_t * ret_marked, uintmax_t * ret_total, - gboolean compute_symlinks); + size_t * ret_dir_count, size_t * ret_marked_count, + uintmax_t * ret_total, gboolean compute_symlinks); ComputeDirSizeUI *compute_dir_size_create_ui (gboolean allow_skip); void compute_dir_size_destroy_ui (ComputeDirSizeUI * ui); diff -Nru mc-4.8.10/src/filemanager/filegui.c mc-4.8.11/src/filemanager/filegui.c --- mc-4.8.10/src/filemanager/filegui.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/filemanager/filegui.c 2013-11-29 18:27:07.000000000 +0000 @@ -241,7 +241,7 @@ replace_action_t replace_result; struct stat *s_stat, *d_stat; -} FileOpContextUI; +} file_op_context_ui_t; /*** file scope variables ************************************************************************/ @@ -284,8 +284,8 @@ if (statvfs_works_cache < 0) statvfs_works_cache = (uname (&name) == 0 && 0 <= str_verscmp (name.release, "2.6.36")); return statvfs_works_cache; -} #endif +} #endif /* --------------------------------------------------------------------------------------------- */ @@ -396,7 +396,7 @@ * alex */ static replace_action_t -overwrite_query_dialog (FileOpContext * ctx, enum OperationMode mode) +overwrite_query_dialog (file_op_context_t * ctx, enum OperationMode mode) { #define ADD_RD_BUTTON(i, ypos) \ add_widget_autopos (ui->replace_dlg, \ @@ -461,7 +461,7 @@ const size_t num = G_N_ELEMENTS (rd_widgets); int *widgets_len; - FileOpContextUI *ui = ctx->ui; + file_op_context_ui_t *ui = ctx->ui; char buffer[BUF_SMALL]; char fsize_buffer[BUF_SMALL]; @@ -658,11 +658,11 @@ /* --------------------------------------------------------------------------------------------- */ FileProgressStatus -check_progress_buttons (FileOpContext * ctx) +check_progress_buttons (file_op_context_t * ctx) { int c; Gpm_Event event; - FileOpContextUI *ui; + file_op_context_ui_t *ui; if (ctx == NULL || ctx->ui == NULL) return FILE_CONT; @@ -710,10 +710,10 @@ /* {{{ File progress display routines */ void -file_op_context_create_ui (FileOpContext * ctx, gboolean with_eta, +file_op_context_create_ui (file_op_context_t * ctx, gboolean with_eta, filegui_dialog_type_t dialog_type) { - FileOpContextUI *ui; + file_op_context_ui_t *ui; int buttons_width; int dlg_width = 58, dlg_height = 17; int y = 2, x = 3; @@ -733,7 +733,7 @@ ctx->dialog_type = dialog_type; ctx->recursive_result = RECURSIVE_YES; - ctx->ui = g_new0 (FileOpContextUI, 1); + ctx->ui = g_new0 (file_op_context_ui_t, 1); ui = ctx->ui; ui->replace_result = REPLACE_YES; @@ -855,11 +855,11 @@ /* --------------------------------------------------------------------------------------------- */ void -file_op_context_destroy_ui (FileOpContext * ctx) +file_op_context_destroy_ui (file_op_context_t * ctx) { if (ctx != NULL && ctx->ui != NULL) { - FileOpContextUI *ui = (FileOpContextUI *) ctx->ui; + file_op_context_ui_t *ui = (file_op_context_ui_t *) ctx->ui; dlg_run_done (ui->op_dlg); dlg_destroy (ui->op_dlg); @@ -874,13 +874,11 @@ */ void -file_progress_show (FileOpContext * ctx, off_t done, off_t total, +file_progress_show (file_op_context_t * ctx, off_t done, off_t total, const char *stalled_msg, gboolean force_update) { - FileOpContextUI *ui; + file_op_context_ui_t *ui; char buffer[BUF_TINY]; - char buffer2[BUF_TINY]; - char buffer3[BUF_TINY]; if (!verbose || ctx == NULL || ctx->ui == NULL) return; @@ -901,11 +899,15 @@ if (ui->showing_eta && ctx->eta_secs > 0.5) { + char buffer2[BUF_TINY]; + file_eta_prepare_for_show (buffer2, ctx->eta_secs, FALSE); if (ctx->bps == 0) g_snprintf (buffer, BUF_TINY, "%s %s", buffer2, stalled_msg); else { + char buffer3[BUF_TINY]; + file_bps_prepare_for_show (buffer3, ctx->bps); g_snprintf (buffer, BUF_TINY, "%s (%s) %s", buffer2, buffer3, stalled_msg); } @@ -921,15 +923,18 @@ /* --------------------------------------------------------------------------------------------- */ void -file_progress_show_count (FileOpContext * ctx, size_t done, size_t total) +file_progress_show_count (file_op_context_t * ctx, size_t done, size_t total) { char buffer[BUF_TINY]; - FileOpContextUI *ui; + file_op_context_ui_t *ui; if (ctx == NULL || ctx->ui == NULL) return; ui = ctx->ui; + if (ui->total_files_processed_label == NULL) + return; + if (ctx->progress_totals_computed) g_snprintf (buffer, BUF_TINY, _("Files processed: %zu/%zu"), done, total); else @@ -940,22 +945,20 @@ /* --------------------------------------------------------------------------------------------- */ void -file_progress_show_total (FileOpTotalContext * tctx, FileOpContext * ctx, uintmax_t copied_bytes, - gboolean show_summary) +file_progress_show_total (FileOpTotalContext * tctx, file_op_context_t * ctx, + uintmax_t copied_bytes, gboolean show_summary) { char buffer[BUF_TINY]; char buffer2[BUF_TINY]; char buffer3[BUF_TINY]; - char buffer4[BUF_TINY]; - struct timeval tv_current; - FileOpContextUI *ui; + file_op_context_ui_t *ui; if (ctx == NULL || ctx->ui == NULL) return; ui = ctx->ui; - if (ctx->progress_totals_computed) + if (ui->progress_total_gauge != NULL) { if (ctx->progress_bytes == 0) gauge_show (ui->progress_total_gauge, 0); @@ -970,43 +973,53 @@ if (!show_summary && tctx->bps == 0) return; - gettimeofday (&tv_current, NULL); - file_frmt_time (buffer2, tv_current.tv_sec - tctx->transfer_start.tv_sec); - - if (ctx->progress_totals_computed) + if (ui->time_label != NULL) { - file_eta_prepare_for_show (buffer3, tctx->eta_secs, TRUE); - if (tctx->bps == 0) - g_snprintf (buffer, BUF_TINY, _("Time: %s %s"), buffer2, buffer3); + struct timeval tv_current; + char buffer4[BUF_TINY]; + + gettimeofday (&tv_current, NULL); + file_frmt_time (buffer2, tv_current.tv_sec - tctx->transfer_start.tv_sec); + + if (ctx->progress_totals_computed) + { + file_eta_prepare_for_show (buffer3, tctx->eta_secs, TRUE); + if (tctx->bps == 0) + g_snprintf (buffer, BUF_TINY, _("Time: %s %s"), buffer2, buffer3); + else + { + + file_bps_prepare_for_show (buffer4, (long) tctx->bps); + g_snprintf (buffer, BUF_TINY, _("Time: %s %s (%s)"), buffer2, buffer3, buffer4); + } + } else { - file_bps_prepare_for_show (buffer4, (long) tctx->bps); - g_snprintf (buffer, BUF_TINY, _("Time: %s %s (%s)"), buffer2, buffer3, buffer4); + if (tctx->bps == 0) + g_snprintf (buffer, BUF_TINY, _("Time: %s"), buffer2); + else + { + file_bps_prepare_for_show (buffer4, (long) tctx->bps); + g_snprintf (buffer, BUF_TINY, _("Time: %s (%s)"), buffer2, buffer4); + } } + + label_set_text (ui->time_label, buffer); } - else + + if (ui->total_bytes_label != NULL) { - if (tctx->bps == 0) - g_snprintf (buffer, BUF_TINY, _("Time: %s"), buffer2); + size_trunc_len (buffer2, 5, tctx->copied_bytes, 0, panels_options.kilobyte_si); + if (!ctx->progress_totals_computed) + g_snprintf (buffer, BUF_TINY, _(" Total: %s "), buffer2); else { - file_bps_prepare_for_show (buffer4, (long) tctx->bps); - g_snprintf (buffer, BUF_TINY, _("Time: %s (%s)"), buffer2, buffer4); + size_trunc_len (buffer3, 5, ctx->progress_bytes, 0, panels_options.kilobyte_si); + g_snprintf (buffer, BUF_TINY, _(" Total: %s/%s "), buffer2, buffer3); } - } - - label_set_text (ui->time_label, buffer); - size_trunc_len (buffer2, 5, tctx->copied_bytes, 0, panels_options.kilobyte_si); - if (!ctx->progress_totals_computed) - g_snprintf (buffer, BUF_TINY, _(" Total: %s "), buffer2); - else - { - size_trunc_len (buffer3, 5, ctx->progress_bytes, 0, panels_options.kilobyte_si); - g_snprintf (buffer, BUF_TINY, _(" Total: %s/%s "), buffer2, buffer3); + hline_set_text (ui->total_bytes_label, buffer); } - - hline_set_text (ui->total_bytes_label, buffer); } /* }}} */ @@ -1014,9 +1027,9 @@ /* --------------------------------------------------------------------------------------------- */ void -file_progress_show_source (FileOpContext * ctx, const vfs_path_t * s_vpath) +file_progress_show_source (file_op_context_t * ctx, const vfs_path_t * s_vpath) { - FileOpContextUI *ui; + file_op_context_ui_t *ui; if (ctx == NULL || ctx->ui == NULL) return; @@ -1042,9 +1055,9 @@ /* --------------------------------------------------------------------------------------------- */ void -file_progress_show_target (FileOpContext * ctx, const vfs_path_t * s_vpath) +file_progress_show_target (file_op_context_t * ctx, const vfs_path_t * s_vpath) { - FileOpContextUI *ui; + file_op_context_ui_t *ui; if (ctx == NULL || ctx->ui == NULL) return; @@ -1067,9 +1080,9 @@ /* --------------------------------------------------------------------------------------------- */ void -file_progress_show_deleting (FileOpContext * ctx, const char *s, size_t * count) +file_progress_show_deleting (file_op_context_t * ctx, const char *s, size_t * count) { - FileOpContextUI *ui; + file_op_context_ui_t *ui; if (ctx == NULL || ctx->ui == NULL) return; @@ -1084,11 +1097,11 @@ /* --------------------------------------------------------------------------------------------- */ FileProgressStatus -file_progress_real_query_replace (FileOpContext * ctx, +file_progress_real_query_replace (file_op_context_t * ctx, enum OperationMode mode, const char *destname, struct stat *_s_stat, struct stat *_d_stat) { - FileOpContextUI *ui; + file_op_context_ui_t *ui; if (ctx == NULL || ctx->ui == NULL) return FILE_CONT; @@ -1143,7 +1156,7 @@ /* --------------------------------------------------------------------------------------------- */ char * -file_mask_dialog (FileOpContext * ctx, FileOperation operation, +file_mask_dialog (file_op_context_t * ctx, FileOperation operation, gboolean only_one, const char *format, const void *text, const char *def_text, gboolean * do_bg) { @@ -1280,7 +1293,7 @@ return dest_dir; } - ctx->search_handle = mc_search_new (source_mask, -1); + ctx->search_handle = mc_search_new (source_mask, -1, NULL); if (ctx->search_handle == NULL) { @@ -1299,9 +1312,6 @@ else ctx->search_handle->search_type = MC_SEARCH_T_REGEX; - tmp = dest_dir; - dest_dir = tilde_expand (tmp); - g_free (tmp); vpath = vfs_path_from_str (dest_dir); ctx->dest_mask = strrchr (dest_dir, PATH_SEP); diff -Nru mc-4.8.10/src/filemanager/filegui.h mc-4.8.11/src/filemanager/filegui.h --- mc-4.8.10/src/filemanager/filegui.h 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/filemanager/filegui.h 2013-11-29 18:27:07.000000000 +0000 @@ -18,25 +18,25 @@ /*** declarations of public functions ************************************************************/ -void file_op_context_create_ui (FileOpContext * ctx, gboolean with_eta, +void file_op_context_create_ui (file_op_context_t * ctx, gboolean with_eta, filegui_dialog_type_t dialog_type); -void file_op_context_destroy_ui (FileOpContext * ctx); +void file_op_context_destroy_ui (file_op_context_t * ctx); -char *file_mask_dialog (FileOpContext * ctx, FileOperation operation, +char *file_mask_dialog (file_op_context_t * ctx, FileOperation operation, gboolean only_one, const char *format, const void *text, const char *def_text, gboolean * do_bg); -FileProgressStatus check_progress_buttons (FileOpContext * ctx); +FileProgressStatus check_progress_buttons (file_op_context_t * ctx); -void file_progress_show (FileOpContext * ctx, off_t done, off_t total, +void file_progress_show (file_op_context_t * ctx, off_t done, off_t total, const char *stalled_msg, gboolean force_update); -void file_progress_show_count (FileOpContext * ctx, size_t done, size_t total); -void file_progress_show_total (FileOpTotalContext * tctx, FileOpContext * ctx, +void file_progress_show_count (file_op_context_t * ctx, size_t done, size_t total); +void file_progress_show_total (FileOpTotalContext * tctx, file_op_context_t * ctx, uintmax_t copied_bytes, gboolean show_summary); -void file_progress_show_source (FileOpContext * ctx, const vfs_path_t * s_vpath); -void file_progress_show_target (FileOpContext * ctx, const vfs_path_t * path); -void file_progress_show_deleting (FileOpContext * ctx, const char *path, size_t * count); +void file_progress_show_source (file_op_context_t * ctx, const vfs_path_t * s_vpath); +void file_progress_show_target (file_op_context_t * ctx, const vfs_path_t * path); +void file_progress_show_deleting (file_op_context_t * ctx, const char *path, size_t * count); /*** inline functions ****************************************************************************/ #endif /* MC__FILEGUI_H */ diff -Nru mc-4.8.10/src/filemanager/filenot.c mc-4.8.11/src/filemanager/filenot.c --- mc-4.8.10/src/filemanager/filenot.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/filemanager/filenot.c 2013-11-29 18:27:07.000000000 +0000 @@ -117,9 +117,6 @@ vfs_path_t *my_s; my_s = get_absolute_name (s_vpath); -#ifdef FIXME - tree_add_entry (tree, my_s); -#endif vfs_path_free (my_s); } return result; @@ -132,9 +129,6 @@ { int result; vfs_path_t *vpath; -#ifdef FIXME - WTree *tree = 0; -#endif vpath = vfs_path_from_str_flags (s, VPF_NO_CANON); /* FIXME: Should receive a Wtree! */ @@ -144,9 +138,6 @@ vfs_path_t *my_s; my_s = get_absolute_name (vpath); -#ifdef FIXME - tree_remove_entry (tree, my_s); -#endif vfs_path_free (my_s); } vfs_path_free (vpath); diff -Nru mc-4.8.10/src/filemanager/fileopctx.c mc-4.8.11/src/filemanager/fileopctx.c --- mc-4.8.10/src/filemanager/fileopctx.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/filemanager/fileopctx.c 2013-11-29 18:27:07.000000000 +0000 @@ -57,7 +57,7 @@ /* --------------------------------------------------------------------------------------------- */ /** - * \fn FileOpContext * file_op_context_new (FileOperation op) + * \fn file_op_context_t * file_op_context_new (FileOperation op) * \param op file operation struct * \return The newly-created context, filled with the default file mask values. * @@ -65,12 +65,12 @@ * to have a user interface for this, call file_op_context_create_ui(). */ -FileOpContext * +file_op_context_t * file_op_context_new (FileOperation op) { - FileOpContext *ctx; + file_op_context_t *ctx; - ctx = g_new0 (FileOpContext, 1); + ctx = g_new0 (file_op_context_t, 1); ctx->operation = op; ctx->eta_secs = 0.0; ctx->progress_bytes = 0; @@ -88,7 +88,7 @@ /* --------------------------------------------------------------------------------------------- */ /** - * \fn void file_op_context_destroy (FileOpContext *ctx) + * \fn void file_op_context_destroy (file_op_context_t *ctx) * \param ctx The file operation context to destroy. * * Destroys the specified file operation context and its associated UI data, if @@ -96,7 +96,7 @@ */ void -file_op_context_destroy (FileOpContext * ctx) +file_op_context_destroy (file_op_context_t * ctx) { if (ctx != NULL) { diff -Nru mc-4.8.10/src/filemanager/fileopctx.h mc-4.8.11/src/filemanager/fileopctx.h --- mc-4.8.10/src/filemanager/fileopctx.h 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/filemanager/fileopctx.h 2013-11-29 18:27:07.000000000 +0000 @@ -76,7 +76,7 @@ /* This structure describes a context for file operations. It is used to update * the progress windows and pass around options. */ -typedef struct FileOpContext +typedef struct { /* Operation type (copy, move, delete) */ FileOperation operation; @@ -166,7 +166,7 @@ /* User interface data goes here */ void *ui; -} FileOpContext; +} file_op_context_t; typedef struct { @@ -187,14 +187,14 @@ /*** declarations of public functions ************************************************************/ -FileOpContext *file_op_context_new (FileOperation op); -void file_op_context_destroy (FileOpContext * ctx); +file_op_context_t *file_op_context_new (FileOperation op); +void file_op_context_destroy (file_op_context_t * ctx); FileOpTotalContext *file_op_total_context_new (void); void file_op_total_context_destroy (FileOpTotalContext * tctx); /* The following functions are implemented separately by each port */ -FileProgressStatus file_progress_real_query_replace (FileOpContext * ctx, +FileProgressStatus file_progress_real_query_replace (file_op_context_t * ctx, enum OperationMode mode, const char *destname, struct stat *_s_stat, struct stat *_d_stat); diff -Nru mc-4.8.10/src/filemanager/find.c mc-4.8.11/src/filemanager/find.c --- mc-4.8.10/src/filemanager/find.c 2013-08-02 18:02:40.000000000 +0000 +++ mc-4.8.11/src/filemanager/find.c 2013-11-29 18:27:07.000000000 +0000 @@ -390,7 +390,7 @@ mc_search_t *search; gboolean regexp_ok = FALSE; - search = mc_search_new (r, -1); + search = mc_search_new (r, -1, NULL); if (search != NULL) { @@ -1187,19 +1187,18 @@ static void find_rotate_dash (const WDialog * h, gboolean show) { - static const char rotating_dash[4] = "|/-\\"; static size_t pos = 0; + static const char rotating_dash[4] = "|/-\\"; + const Widget *w = WIDGET (h); - if (verbose) - { - const Widget *w = WIDGET (h); + if (!verbose) + return; - tty_setcolor (h->color[DLG_COLOR_NORMAL]); - widget_move (h, w->lines - 7, w->cols - 4); - tty_print_char (show ? rotating_dash[pos] : ' '); - pos = (pos + 1) % sizeof (rotating_dash); - mc_refresh (); - } + tty_setcolor (h->color[DLG_COLOR_NORMAL]); + widget_move (h, w->lines - 7, w->cols - 4); + tty_print_char (show ? rotating_dash[pos] : ' '); + pos = (pos + 1) % sizeof (rotating_dash); + mc_refresh (); } /* --------------------------------------------------------------------------------------------- */ @@ -1625,19 +1624,23 @@ { int ret; - search_content_handle = mc_search_new (content_pattern, -1); + search_content_handle = mc_search_new (content_pattern, -1, NULL); if (search_content_handle) { search_content_handle->search_type = options.content_regexp ? MC_SEARCH_T_REGEX : MC_SEARCH_T_NORMAL; search_content_handle->is_case_sensitive = options.content_case_sens; search_content_handle->whole_words = options.content_whole_words; +#ifdef HAVE_CHARSET search_content_handle->is_all_charsets = options.content_all_charsets; +#endif } - search_file_handle = mc_search_new (find_pattern, -1); + search_file_handle = mc_search_new (find_pattern, -1, NULL); search_file_handle->search_type = options.file_pattern ? MC_SEARCH_T_GLOB : MC_SEARCH_T_REGEX; search_file_handle->is_case_sensitive = options.file_case_sens; +#ifdef HAVE_CHARSET search_file_handle->is_all_charsets = options.file_all_charsets; +#endif search_file_handle->is_entire_line = options.file_pattern; resuming = FALSE; @@ -1698,16 +1701,14 @@ if (return_value == B_PANELIZE && *filename) { - int status, link_to_dir, stale_link; - int next_free = 0; + int link_to_dir, stale_link; int i; struct stat st; GList *entry; dir_list *list = ¤t_panel->dir; char *name = NULL; - if (set_zero_dir (list)) - next_free++; + dir_list_init (list); for (i = 0, entry = find_list->list; entry != NULL; i++, entry = g_list_next (entry)) { @@ -1734,46 +1735,45 @@ p++; } - status = handle_path (list, p, &st, next_free, &link_to_dir, &stale_link); - if (status == 0) + if (!handle_path (p, &st, &link_to_dir, &stale_link)) { g_free (name); continue; } - if (status == -1) + /* Need to grow the *list? */ + if (list->len == list->size && !dir_list_grow (list, DIR_LIST_RESIZE_STEP)) { g_free (name); break; } /* don't add files more than once to the panel */ - if (content_pattern != NULL && next_free > 0 - && strcmp (list->list[next_free - 1].fname, p) == 0) + if (content_pattern != NULL && list->len != 0 + && strcmp (list->list[list->len - 1].fname, p) == 0) { g_free (name); continue; } - if (next_free == 0) /* first turn i.e clean old list */ + if (list->len == 0) /* first turn i.e clean old list */ panel_clean_dir (current_panel); - list->list[next_free].fnamelen = strlen (p); - list->list[next_free].fname = g_strndup (p, list->list[next_free].fnamelen); - list->list[next_free].f.marked = 0; - list->list[next_free].f.link_to_dir = link_to_dir; - list->list[next_free].f.stale_link = stale_link; - list->list[next_free].f.dir_size_computed = 0; - list->list[next_free].st = st; - list->list[next_free].sort_key = NULL; - list->list[next_free].second_sort_key = NULL; - next_free++; + list->list[list->len].fnamelen = strlen (p); + list->list[list->len].fname = g_strndup (p, list->list[list->len].fnamelen); + list->list[list->len].f.marked = 0; + list->list[list->len].f.link_to_dir = link_to_dir; + list->list[list->len].f.stale_link = stale_link; + list->list[list->len].f.dir_size_computed = 0; + list->list[list->len].st = st; + list->list[list->len].sort_key = NULL; + list->list[list->len].second_sort_key = NULL; + list->len++; g_free (name); - if ((next_free & 15) == 0) + if ((list->len & 15) == 0) rotate_dash (TRUE); } - if (next_free) + if (list->len != 0) { - current_panel->count = next_free; current_panel->is_panelized = TRUE; /* absolute path */ @@ -1809,10 +1809,11 @@ char *start_dir = NULL, *pattern = NULL, *content = NULL, *ignore_dirs = NULL; ssize_t start_dir_len; char *filename = NULL, *dirname = NULL; - int v; while (find_parameters (&start_dir, &start_dir_len, &ignore_dirs, &pattern, &content)) { + int v; + if (pattern[0] == '\0') break; /* nothing search */ diff -Nru mc-4.8.10/src/filemanager/hotlist.c mc-4.8.11/src/filemanager/hotlist.c --- mc-4.8.10/src/filemanager/hotlist.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/filemanager/hotlist.c 2013-11-29 18:27:07.000000000 +0000 @@ -1393,7 +1393,6 @@ clean_up_hotlist_groups (const char *section) { char *grp_section; - gchar **profile_keys, **keys; gsize len; grp_section = g_strconcat (section, ".Group", (char *) NULL); @@ -1402,6 +1401,8 @@ if (mc_config_has_group (mc_main_config, grp_section)) { + char **profile_keys, **keys; + profile_keys = keys = mc_config_get_keys (mc_main_config, grp_section, &len); while (*profile_keys != NULL) diff -Nru mc-4.8.10/src/filemanager/layout.c mc-4.8.11/src/filemanager/layout.c --- mc-4.8.10/src/filemanager/layout.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/filemanager/layout.c 2013-11-29 18:27:07.000000000 +0000 @@ -10,6 +10,7 @@ Miguel de Icaza, 1995 Andrew Borodin , 2011, 2012, 2013 Slava Zanko , 2013 + Avi Kelman , 2013 This file is part of the Midnight Commander. @@ -146,7 +147,6 @@ static int old_output_lines; /* Internal variables */ -panels_layout_t _panels_layout; static int equal_split; static int _menubar_visible; static int _output_lines; @@ -227,28 +227,27 @@ { /* Check split has to be done before testing if it changed, since it can change due to calling check_split() as well */ - check_split (&_panels_layout); - old_layout = _panels_layout; + check_split (&panels_layout); - if (_panels_layout.horizontal_split) - check_options[0].widget->state = _panels_layout.horizontal_equal ? 1 : 0; + if (panels_layout.horizontal_split) + check_options[0].widget->state = panels_layout.horizontal_equal ? 1 : 0; else - check_options[0].widget->state = _panels_layout.vertical_equal ? 1 : 0; + check_options[0].widget->state = panels_layout.vertical_equal ? 1 : 0; widget_redraw (WIDGET (check_options[0].widget)); tty_setcolor (check_options[0].widget->state & C_BOOL ? DISABLED_COLOR : COLOR_NORMAL); widget_move (h, 6, 5); - if (_panels_layout.horizontal_split) - tty_printf ("%03d", _panels_layout.top_panel_size); + if (panels_layout.horizontal_split) + tty_printf ("%03d", panels_layout.top_panel_size); else - tty_printf ("%03d", _panels_layout.left_panel_size); + tty_printf ("%03d", panels_layout.left_panel_size); widget_move (h, 6, 17); - if (_panels_layout.horizontal_split) - tty_printf ("%03d", height - _panels_layout.top_panel_size); + if (panels_layout.horizontal_split) + tty_printf ("%03d", height - panels_layout.top_panel_size); else - tty_printf ("%03d", COLS - _panels_layout.left_panel_size); + tty_printf ("%03d", COLS - panels_layout.left_panel_size); widget_move (h, 6, 12); tty_print_char ('='); @@ -261,22 +260,24 @@ { (void) action; - if (button == bleft_widget) + if (button == bright_widget) { - if (_panels_layout.horizontal_split) - _panels_layout.top_panel_size++; + if (panels_layout.horizontal_split) + panels_layout.top_panel_size++; else - _panels_layout.left_panel_size++; + panels_layout.left_panel_size++; } else { - if (_panels_layout.horizontal_split) - _panels_layout.top_panel_size--; + if (panels_layout.horizontal_split) + panels_layout.top_panel_size--; else - _panels_layout.left_panel_size--; + panels_layout.left_panel_size--; } update_split (WIDGET (button)->owner); + layout_change (); + do_refresh (); return 0; } @@ -320,10 +321,6 @@ update everything */ dlg_default_repaint (h); - old_layout.horizontal_split = -1; - old_layout.left_panel_size = -1; - old_layout.top_panel_size = -1; - old_output_lines = -1; update_split (h); @@ -355,7 +352,7 @@ _output_lines = 0; height = LINES - _keybar_visible - (_command_prompt ? 1 : 0) - _menubar_visible - _output_lines - _message_visible; - minimum = MINHEIGHT * (1 + _panels_layout.horizontal_split); + minimum = MINHEIGHT * (1 + panels_layout.horizontal_split); if (height < minimum) { _output_lines -= minimum - height; @@ -378,23 +375,34 @@ case MSG_ACTION: if (sender == WIDGET (radio_widget)) { - if (_panels_layout.horizontal_split != radio_widget->sel) + if (panels_layout.horizontal_split != radio_widget->sel) { - _panels_layout.horizontal_split = radio_widget->sel; + int eq; - if (_panels_layout.horizontal_split) + panels_layout.horizontal_split = radio_widget->sel; + + if (panels_layout.horizontal_split) { - if (_panels_layout.horizontal_equal) - _panels_layout.top_panel_size = height / 2; + eq = panels_layout.horizontal_equal; + if (eq) + panels_layout.top_panel_size = height / 2; } else { - if (_panels_layout.vertical_equal) - _panels_layout.left_panel_size = COLS / 2; + eq = panels_layout.vertical_equal; + if (eq) + panels_layout.left_panel_size = COLS / 2; } - } - update_split (h); + widget_disable (WIDGET (bleft_widget), eq); + widget_disable (WIDGET (bright_widget), eq); + + update_split (h); + layout_change (); + do_refresh (); + } + else + update_split (h); return MSG_HANDLED; } @@ -403,21 +411,23 @@ { int eq; - if (_panels_layout.horizontal_split) + if (panels_layout.horizontal_split) { - _panels_layout.horizontal_equal = check_options[0].widget->state & C_BOOL; - eq = _panels_layout.horizontal_equal; + panels_layout.horizontal_equal = check_options[0].widget->state & C_BOOL; + eq = panels_layout.horizontal_equal; } else { - _panels_layout.vertical_equal = check_options[0].widget->state & C_BOOL; - eq = _panels_layout.vertical_equal; + panels_layout.vertical_equal = check_options[0].widget->state & C_BOOL; + eq = panels_layout.vertical_equal; } widget_disable (WIDGET (bleft_widget), eq); widget_disable (WIDGET (bright_widget), eq); update_split (h); + layout_change (); + do_refresh (); return MSG_HANDLED; } @@ -454,18 +464,12 @@ output_lines_label = _("Output lines:"); /* save old params */ - _panels_layout = panels_layout; _menubar_visible = menubar_visible; _command_prompt = command_prompt; _keybar_visible = mc_global.keybar_visible; _message_visible = mc_global.message_visible; _xterm_title = xterm_title; _free_space = free_space; - - old_layout.horizontal_split = -1; - old_layout.left_panel_size = -1; - old_layout.top_panel_size = -1; - old_output_lines = -1; _output_lines = output_lines; @@ -591,7 +595,7 @@ panel_do_cols (int idx) { if (get_display_type (idx) == view_listing) - set_panel_formats ((WPanel *) panels[idx].widget); + set_panel_formats (PANEL (panels[idx].widget)); else panel_update_cols (panels[idx].widget, frame_half); } @@ -642,8 +646,9 @@ layout_box (void) { WDialog *layout_dlg; - gboolean layout_do_change = FALSE; + old_layout = panels_layout; + old_output_lines = output_lines; layout_dlg = init_layout (); if (dlg_run (layout_dlg) == B_ENTER) @@ -653,25 +658,18 @@ for (i = 0; i < (size_t) LAYOUT_OPTIONS_COUNT; i++) if (check_options[i].widget != NULL) *check_options[i].variable = check_options[i].widget->state & C_BOOL; - - panels_layout.horizontal_split = radio_widget->sel; - if (panels_layout.horizontal_split) - { - panels_layout.horizontal_equal = *check_options[0].variable; - panels_layout.top_panel_size = _panels_layout.top_panel_size; - } - else - { - panels_layout.vertical_equal = *check_options[0].variable; - panels_layout.left_panel_size = _panels_layout.left_panel_size; - } - output_lines = _output_lines; - layout_do_change = TRUE; + } + else + { + /* restore layout */ + panels_layout = old_layout; + output_lines = old_output_lines; + update_split (layout_dlg); } dlg_destroy (layout_dlg); - if (layout_do_change) - layout_change (); + layout_change (); + do_refresh (); } /* --------------------------------------------------------------------------------------------- */ @@ -735,7 +733,6 @@ else { widget_set_size (WIDGET (cmdline), 0, 0, 0, 0); - input_set_origin (cmdline, 0, 0); widget_set_size (WIDGET (the_prompt), LINES, COLS, 0, 0); } @@ -852,7 +849,6 @@ widget_set_size (WIDGET (the_prompt), y, 0, 1, prompt_len); label_set_text (the_prompt, mc_prompt); widget_set_size (WIDGET (cmdline), y, prompt_len, 1, COLS - prompt_len); - input_set_origin (cmdline, prompt_len, COLS - prompt_len); } /* --------------------------------------------------------------------------------------------- */ @@ -881,8 +877,6 @@ void rotate_dash (gboolean show) { - static const char rotating_dash[4] = "|/-\\"; - static size_t pos = 0; Widget *w = WIDGET (midnight_dlg); if (!nice_rotating_dash || (ok_to_refresh <= 0)) @@ -895,6 +889,9 @@ tty_print_alt_char (ACS_URCORNER, FALSE); else { + static const char rotating_dash[4] = "|/-\\"; + static size_t pos = 0; + tty_print_char (rotating_dash[pos]); pos = (pos + 1) % sizeof (rotating_dash); } @@ -907,14 +904,14 @@ const char * get_nth_panel_name (int num) { - static char buffer[BUF_SMALL]; - if (!num) return "New Left Panel"; else if (num == 1) return "New Right Panel"; else { + static char buffer[BUF_SMALL]; + g_snprintf (buffer, sizeof (buffer), "%ith Panel", num); return buffer; } @@ -961,7 +958,7 @@ if (panels[num].widget != NULL) { Widget *w = panels[num].widget; - WPanel *panel = (WPanel *) w; + WPanel *panel = PANEL (w); x = w->x; y = w->y; @@ -1015,7 +1012,7 @@ case view_quick: new_widget = WIDGET (mcview_new (y, x, lines, cols, TRUE)); - the_other_panel = (WPanel *) panels[the_other].widget; + the_other_panel = PANEL (panels[the_other].widget); if (the_other_panel != NULL) file_name = the_other_panel->dir.list[the_other_panel->selected].fname; else @@ -1049,7 +1046,7 @@ if (type == view_listing) { - WPanel *panel = (WPanel *) new_widget; + WPanel *panel = PANEL (new_widget); /* if existing panel changed type to view_listing, then load history */ if (old_widget != NULL) @@ -1079,7 +1076,7 @@ * - as long as you stay in the left panel almost everything that uses * current_panel causes segfault, e.g. C-Enter, C-x c, ... */ - if ((type != view_listing) && (current_panel == (WPanel *) old_widget)) + if ((type != view_listing) && (current_panel == PANEL (old_widget))) current_panel = num == 0 ? right_panel : left_panel; g_free (old_widget); @@ -1096,8 +1093,8 @@ WPanel *panel1, *panel2; Widget *tmp_widget; - panel1 = (WPanel *) panels[0].widget; - panel2 = (WPanel *) panels[1].widget; + panel1 = PANEL (panels[0].widget); + panel2 = PANEL (panels[1].widget); if (panels[0].type == view_listing && panels[1].type == view_listing && !mc_config_get_bool (mc_main_config, CONFIG_PANELS_SECTION, "simple_swap", FALSE)) @@ -1114,7 +1111,6 @@ panelswap (active); panelswap (cwd_vpath); panelswap (lwd_vpath); - panelswap (count); panelswap (marked); panelswap (dirs_marked); panelswap (total); @@ -1134,7 +1130,7 @@ current_panel = panel1; /* if sort options are different -> resort panels */ - if (memcmp (&panel1->sort_info, &panel2->sort_info, sizeof (panel_sort_info_t)) != 0) + if (memcmp (&panel1->sort_info, &panel2->sort_info, sizeof (dir_sort_options_t)) != 0) { panel_re_sort (other_panel); panel_re_sort (current_panel); @@ -1196,9 +1192,9 @@ /* force update formats because of possible changed sizes */ if (panels[0].type == view_listing) - set_panel_formats ((WPanel *) panels[0].widget); + set_panel_formats (PANEL (panels[0].widget)); if (panels[1].type == view_listing) - set_panel_formats ((WPanel *) panels[1].widget); + set_panel_formats (PANEL (panels[1].widget)); } } @@ -1239,10 +1235,10 @@ /* --------------------------------------------------------------------------------------------- */ -struct WPanel * +WPanel * get_other_panel (void) { - return (struct WPanel *) get_panel_widget (get_other_index ()); + return PANEL (get_panel_widget (get_other_index ())); } /* --------------------------------------------------------------------------------------------- */ @@ -1280,7 +1276,7 @@ if ((type == view_listing) && (widget != NULL)) { - WPanel *w = (WPanel *) widget; + WPanel *w = PANEL (widget); g_free (panels[idx].last_saved_dir); /* last path no needed */ /* Because path can be nonlocal */ @@ -1298,7 +1294,7 @@ int i; for (i = 0; i < MAX_VIEWS; i++) - if ((WPanel *) get_panel_widget (i) == widget) + if (PANEL (get_panel_widget (i)) == widget) break; if (i >= MAX_VIEWS) @@ -1308,7 +1304,7 @@ { vfs_path_t *cwd_vpath; - cwd_vpath = ((WPanel *) get_panel_widget (i))->cwd_vpath; + cwd_vpath = PANEL (get_panel_widget (i))->cwd_vpath; return g_strdup (vfs_path_as_str (cwd_vpath)); } diff -Nru mc-4.8.10/src/filemanager/layout.h mc-4.8.11/src/filemanager/layout.h --- mc-4.8.10/src/filemanager/layout.h 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/filemanager/layout.h 2013-11-29 18:27:07.000000000 +0000 @@ -8,6 +8,8 @@ #include "lib/global.h" #include "lib/widget.h" +#include "panel.h" + /*** typedefs(not structures) and defined constants **********************************************/ typedef enum @@ -23,8 +25,6 @@ /*** structures declarations (and typedefs of structures)*****************************************/ -struct WPanel; - typedef struct { int horizontal_split; @@ -70,10 +70,10 @@ struct Widget *get_panel_widget (int idx); -struct WPanel *get_other_panel (void); +WPanel *get_other_panel (void); void save_panel_dir (int idx); -char *get_panel_dir_for (const struct WPanel *widget); +char *get_panel_dir_for (const WPanel * widget); void set_hintbar (const char *str); diff -Nru mc-4.8.10/src/filemanager/midnight.c mc-4.8.11/src/filemanager/midnight.c --- mc-4.8.10/src/filemanager/midnight.c 2013-08-02 18:02:40.000000000 +0000 +++ mc-4.8.11/src/filemanager/midnight.c 2013-11-29 18:27:07.000000000 +0000 @@ -72,7 +72,7 @@ #include "hotlist.h" #include "panelize.h" #include "command.h" /* cmdline */ -#include "dir.h" /* clean_dir() */ +#include "dir.h" /* dir_list_clean() */ #include "chmod.h" #include "chown.h" @@ -403,7 +403,7 @@ return; p = MENU_PANEL; - sort_order = sort_box (&p->sort_info); + sort_order = sort_box (&p->sort_info, p->sort_field); panel_set_sort_order (p, sort_order); } @@ -584,15 +584,15 @@ * Following cases from command line are possible: * 'mc' (no arguments): mc_run_param0 == NULL, mc_run_param1 == NULL * active panel uses current directory - * passive panel uses "other_dir" from ini + * passive panel uses "other_dir" from panels.ini * * 'mc dir1 dir2' (two arguments): mc_run_param0 != NULL, mc_run_param1 != NULL - * left panel uses mc_run_param0 - * right panel uses mc_run_param1 + * active panel uses mc_run_param0 + * passive panel uses mc_run_param1 * * 'mc dir1' (single argument): mc_run_param0 != NULL, mc_run_param1 == NULL - * active panel uses current directory - * passive panel uses mc_run_param0 + * active panel uses mc_run_param0 + * passive panel uses "other_dir" from panels.ini */ /* Set up panel directories */ @@ -619,8 +619,8 @@ else /* mc_run_param0 != NULL && mc_run_param1 == NULL */ { /* one argument */ - current_dir = NULL; /* assume current dir */ - other_dir = (char *) mc_run_param0; + current_dir = (char *) mc_run_param0; + other_dir = saved_other_dir; /* from ini */ } } else @@ -640,14 +640,14 @@ else if (mc_run_param0 != NULL && mc_run_param1 != NULL) { /* two arguments */ - current_dir = mc_run_param1; - other_dir = (char *) mc_run_param0; + current_dir = (char *) mc_run_param0; + other_dir = mc_run_param1; } else /* mc_run_param0 != NULL && mc_run_param1 == NULL */ { /* one argument */ - current_dir = NULL; /* assume current dir */ ; - other_dir = (char *) mc_run_param0; + current_dir = (char *) mc_run_param0; + other_dir = saved_other_dir; /* from ini */ } } @@ -814,14 +814,14 @@ static void put_tagged (WPanel * panel) { - int i; - if (!command_prompt) return; input_disable_update (cmdline); if (panel->marked) { - for (i = 0; i < panel->count; i++) + int i; + + for (i = 0; i < panel->dir.len; i++) { if (panel->dir.list[i].f.marked) command_insert (cmdline, panel->dir.list[i].fname, TRUE); @@ -1783,7 +1783,7 @@ /* don't handle VFS timestamps for dirs opened in panels */ mc_event_destroy (MCEVENT_GROUP_CORE, "vfs_timestamp"); - clean_dir (&panelized_panel.list, panelized_panel.count); + dir_list_clean (&panelized_panel.list); } /* Program end */ diff -Nru mc-4.8.10/src/filemanager/midnight.h mc-4.8.11/src/filemanager/midnight.h --- mc-4.8.10/src/filemanager/midnight.h 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/filemanager/midnight.h 2013-11-29 18:27:07.000000000 +0000 @@ -24,8 +24,6 @@ /*** structures declarations (and typedefs of structures)*****************************************/ -struct WPanel; - /*** global variables defined in .c file *********************************************************/ extern WMenuBar *the_menubar; diff -Nru mc-4.8.10/src/filemanager/mountlist.c mc-4.8.11/src/filemanager/mountlist.c --- mc-4.8.10/src/filemanager/mountlist.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/filemanager/mountlist.c 2013-11-29 18:27:07.000000000 +0000 @@ -242,8 +242,10 @@ /* All cygwin mount points include ':' or start with '//'; so it requires a native Windows call to determine remote disks. */ static int -me_remote (char const *fs_name, char const *fs_type _GL_UNUSED) +me_remote (char const *fs_name, char const *fs_type) { + (void) fs_type; + if (fs_name[0] && fs_name[1] == ':') { char drive[4]; @@ -397,86 +399,107 @@ switch (t) { #ifdef MOUNT_PC + /* cppcheck-suppress syntaxError */ case MOUNT_PC: return "pc"; #endif #ifdef MOUNT_MFS + /* cppcheck-suppress syntaxError */ case MOUNT_MFS: return "mfs"; #endif #ifdef MOUNT_LO + /* cppcheck-suppress syntaxError */ case MOUNT_LO: return "lo"; #endif #ifdef MOUNT_TFS + /* cppcheck-suppress syntaxError */ case MOUNT_TFS: return "tfs"; #endif #ifdef MOUNT_TMP + /* cppcheck-suppress syntaxError */ case MOUNT_TMP: return "tmp"; #endif #ifdef MOUNT_UFS + /* cppcheck-suppress syntaxError */ case MOUNT_UFS: return "ufs"; #endif #ifdef MOUNT_NFS + /* cppcheck-suppress syntaxError */ case MOUNT_NFS: return "nfs"; #endif #ifdef MOUNT_MSDOS + /* cppcheck-suppress syntaxError */ case MOUNT_MSDOS: return "msdos"; #endif #ifdef MOUNT_LFS + /* cppcheck-suppress syntaxError */ case MOUNT_LFS: return "lfs"; #endif #ifdef MOUNT_LOFS + /* cppcheck-suppress syntaxError */ case MOUNT_LOFS: return "lofs"; #endif #ifdef MOUNT_FDESC + /* cppcheck-suppress syntaxError */ case MOUNT_FDESC: return "fdesc"; #endif #ifdef MOUNT_PORTAL + /* cppcheck-suppress syntaxError */ case MOUNT_PORTAL: return "portal"; #endif #ifdef MOUNT_NULL + /* cppcheck-suppress syntaxError */ case MOUNT_NULL: return "null"; #endif #ifdef MOUNT_UMAP + /* cppcheck-suppress syntaxError */ case MOUNT_UMAP: return "umap"; #endif #ifdef MOUNT_KERNFS + /* cppcheck-suppress syntaxError */ case MOUNT_KERNFS: return "kernfs"; #endif #ifdef MOUNT_PROCFS + /* cppcheck-suppress syntaxError */ case MOUNT_PROCFS: return "procfs"; #endif #ifdef MOUNT_AFS + /* cppcheck-suppress syntaxError */ case MOUNT_AFS: return "afs"; #endif #ifdef MOUNT_CD9660 + /* cppcheck-suppress syntaxError */ case MOUNT_CD9660: return "cd9660"; #endif #ifdef MOUNT_UNION + /* cppcheck-suppress syntaxError */ case MOUNT_UNION: return "union"; #endif #ifdef MOUNT_DEVFS + /* cppcheck-suppress syntaxError */ case MOUNT_DEVFS: return "devfs"; #endif #ifdef MOUNT_EXT2FS + /* cppcheck-suppress syntaxError */ case MOUNT_EXT2FS: return "ext2fs"; #endif @@ -600,7 +623,6 @@ #ifdef MOUNTED_LISTMNTENT { struct tabmntent *mntlist, *p; - struct mntent *mnt; struct mount_entry *me; /* the third and fourth arguments could be used to filter mounts, @@ -612,7 +634,8 @@ return NULL; for (p = mntlist; p; p = p->next) { - mnt = p->ment; + struct mntent *mnt = p->ment; + me = g_malloc (sizeof (*me)); me->me_devname = g_strdup (mnt->mnt_fsname); me->me_mountdir = g_strdup (mnt->mnt_dir); @@ -719,8 +742,15 @@ int val; struct fs_data fsd; - while (errno = 0, 0 < (val = getmnt (&offset, &fsd, sizeof (fsd), NOSTAT_MANY, (char *) 0))) + while (TRUE) { + errno = 0; + val = getmnt (&offset, &fsd, sizeof (fsd), NOSTAT_MANY, (char *) NULL); + if (val < 0) + goto free_then_fail; + if (val == 0) + break; + me = g_malloc (sizeof (*me)); me->me_devname = g_strdup (fsd.fd_req.devname); me->me_mountdir = g_strdup (fsd.fd_req.path); @@ -734,8 +764,6 @@ *mtail = me; mtail = &me->me_next; } - if (val < 0) - goto free_then_fail; } #endif /* MOUNTED_GETMNT. */ @@ -971,7 +999,7 @@ char *table = MNTTAB; FILE *fp; int ret; - int lockfd = -1; + int lockfd; #if defined F_RDLCK && defined F_SETLKW /* MNTTAB_LOCK is a macro name of our own invention; it's not present in @@ -982,9 +1010,10 @@ #define MNTTAB_LOCK "/etc/.mnttab.lock" #endif lockfd = open (MNTTAB_LOCK, O_RDONLY); - if (0 <= lockfd) + if (lockfd >= 0) { struct flock flock; + flock.l_type = F_RDLCK; flock.l_whence = SEEK_SET; flock.l_start = 0; @@ -1027,10 +1056,10 @@ ret = fclose (fp) == EOF ? errno : 0 < ret ? 0 : -1; } - if (0 <= lockfd && close (lockfd) != 0) + if (lockfd >= 0 && close (lockfd) != 0) ret = errno; - if (0 <= ret) + if (ret >= 0) { errno = ret; goto free_then_fail; @@ -1138,6 +1167,7 @@ mtail = &me->me_next; } } + closedir (dirp); } #endif /* MOUNTED_INTERIX_STATVFS */ @@ -1568,13 +1598,15 @@ my_statfs (struct my_statfs *myfs_stats, const char *path) { #ifdef HAVE_INFOMOUNT_LIST - size_t i, len = 0; + size_t len = 0; struct mount_entry *entry = NULL; struct mount_entry *temp = mc_mount_list; struct fs_usage fs_use; while (temp) { + size_t i; + i = strlen (temp->me_mountdir); if (i > len && (strncmp (path, temp->me_mountdir, i) == 0)) if (!entry || (path[i] == PATH_SEP || path[i] == '\0')) diff -Nru mc-4.8.10/src/filemanager/panel.c mc-4.8.11/src/filemanager/panel.c --- mc-4.8.10/src/filemanager/panel.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/filemanager/panel.c 2013-11-29 18:27:07.000000000 +0000 @@ -86,27 +86,27 @@ hook_t *select_file_hook = NULL; /* *INDENT-OFF* */ -panelized_panel_t panelized_panel = { {NULL, 0}, -1, NULL }; +panelized_panel_t panelized_panel = { {NULL, 0, -1}, NULL }; /* *INDENT-ON* */ -static const char *string_file_name (file_entry *, int); -static const char *string_file_size (file_entry *, int); -static const char *string_file_size_brief (file_entry *, int); -static const char *string_file_type (file_entry *, int); -static const char *string_file_mtime (file_entry *, int); -static const char *string_file_atime (file_entry *, int); -static const char *string_file_ctime (file_entry *, int); -static const char *string_file_permission (file_entry *, int); -static const char *string_file_perm_octal (file_entry *, int); -static const char *string_file_nlinks (file_entry *, int); -static const char *string_inode (file_entry *, int); -static const char *string_file_nuid (file_entry *, int); -static const char *string_file_ngid (file_entry *, int); -static const char *string_file_owner (file_entry *, int); -static const char *string_file_group (file_entry *, int); -static const char *string_marked (file_entry *, int); -static const char *string_space (file_entry *, int); -static const char *string_dot (file_entry *, int); +static const char *string_file_name (file_entry_t *, int); +static const char *string_file_size (file_entry_t *, int); +static const char *string_file_size_brief (file_entry_t *, int); +static const char *string_file_type (file_entry_t *, int); +static const char *string_file_mtime (file_entry_t *, int); +static const char *string_file_atime (file_entry_t *, int); +static const char *string_file_ctime (file_entry_t *, int); +static const char *string_file_permission (file_entry_t *, int); +static const char *string_file_perm_octal (file_entry_t *, int); +static const char *string_file_nlinks (file_entry_t *, int); +static const char *string_inode (file_entry_t *, int); +static const char *string_file_nuid (file_entry_t *, int); +static const char *string_file_ngid (file_entry_t *, int); +static const char *string_file_owner (file_entry_t *, int); +static const char *string_file_group (file_entry_t *, int); +static const char *string_marked (file_entry_t *, int); +static const char *string_space (file_entry_t *, int); +static const char *string_dot (file_entry_t *, int); /* *INDENT-OFF* */ panel_field_t panel_fields[] = { @@ -117,7 +117,7 @@ N_("sort|u"), N_("&Unsorted"), TRUE, FALSE, string_file_name, - (sortfn *) unsorted + (GCompareFunc) unsorted } , { @@ -127,7 +127,7 @@ N_("sort|n"), N_("&Name"), TRUE, TRUE, string_file_name, - (sortfn *) sort_name + (GCompareFunc) sort_name } , { @@ -137,7 +137,7 @@ N_("sort|v"), N_("&Version"), TRUE, FALSE, string_file_name, - (sortfn *) sort_vers + (GCompareFunc) sort_vers } , { @@ -147,7 +147,7 @@ N_("sort|e"), N_("E&xtension"), TRUE, FALSE, string_file_name, /* TODO: string_file_ext */ - (sortfn *) sort_ext + (GCompareFunc) sort_ext } , { @@ -157,7 +157,7 @@ N_("sort|s"), N_("&Size"), TRUE, TRUE, string_file_size, - (sortfn *) sort_size + (GCompareFunc) sort_size } , { @@ -165,7 +165,7 @@ "", N_("Block Size"), FALSE, FALSE, string_file_size_brief, - (sortfn *) sort_size + (GCompareFunc) sort_size } , { @@ -183,7 +183,7 @@ N_("sort|m"), N_("&Modify time"), TRUE, TRUE, string_file_mtime, - (sortfn *) sort_time + (GCompareFunc) sort_time } , { @@ -193,7 +193,7 @@ N_("sort|a"), N_("&Access time"), TRUE, TRUE, string_file_atime, - (sortfn *) sort_atime + (GCompareFunc) sort_atime } , { @@ -203,7 +203,7 @@ N_("sort|h"), N_("C&hange time"), TRUE, TRUE, string_file_ctime, - (sortfn *) sort_ctime + (GCompareFunc) sort_ctime } , { @@ -236,7 +236,7 @@ N_("sort|i"), N_("&Inode"), TRUE, TRUE, string_inode, - (sortfn *) sort_inode + (GCompareFunc) sort_inode } , { @@ -345,7 +345,7 @@ int field_len; align_crt_t just_mode; int expand; - const char *(*string_fn) (file_entry *, int len); + const char *(*string_fn) (file_entry_t *, int len); char *title; const char *id; } format_e; @@ -406,7 +406,7 @@ /** This code relies on the default justification!!! */ static void -add_permission_string (const char *dest, int width, file_entry * fe, int attr, int color, +add_permission_string (const char *dest, int width, file_entry_t * fe, int attr, int color, int is_octal) { int i, r, l; @@ -448,7 +448,7 @@ /** String representations of various file attributes name */ static const char * -string_file_name (file_entry * fe, int len) +string_file_name (file_entry_t * fe, int len) { static char buffer[MC_MAXPATHLEN * MB_LEN_MAX + 1]; @@ -496,7 +496,7 @@ /** size */ static const char * -string_file_size (file_entry * fe, int len) +string_file_size (file_entry_t * fe, int len) { static char buffer[BUF_TINY]; @@ -519,7 +519,7 @@ /** bsize */ static const char * -string_file_size_brief (file_entry * fe, int len) +string_file_size_brief (file_entry_t * fe, int len) { if (S_ISLNK (fe->st.st_mode) && !fe->f.link_to_dir) { @@ -538,7 +538,7 @@ /** This functions return a string representation of a file entry type */ static const char * -string_file_type (file_entry * fe, int len) +string_file_type (file_entry_t * fe, int len) { static char buffer[2]; @@ -580,7 +580,7 @@ /** mtime */ static const char * -string_file_mtime (file_entry * fe, int len) +string_file_mtime (file_entry_t * fe, int len) { (void) len; return file_date (fe->st.st_mtime); @@ -590,7 +590,7 @@ /** atime */ static const char * -string_file_atime (file_entry * fe, int len) +string_file_atime (file_entry_t * fe, int len) { (void) len; return file_date (fe->st.st_atime); @@ -600,7 +600,7 @@ /** ctime */ static const char * -string_file_ctime (file_entry * fe, int len) +string_file_ctime (file_entry_t * fe, int len) { (void) len; return file_date (fe->st.st_ctime); @@ -610,7 +610,7 @@ /** perm */ static const char * -string_file_permission (file_entry * fe, int len) +string_file_permission (file_entry_t * fe, int len) { (void) len; return string_perm (fe->st.st_mode); @@ -620,7 +620,7 @@ /** mode */ static const char * -string_file_perm_octal (file_entry * fe, int len) +string_file_perm_octal (file_entry_t * fe, int len) { static char buffer[10]; @@ -633,7 +633,7 @@ /** nlink */ static const char * -string_file_nlinks (file_entry * fe, int len) +string_file_nlinks (file_entry_t * fe, int len) { static char buffer[BUF_TINY]; @@ -646,7 +646,7 @@ /** inode */ static const char * -string_inode (file_entry * fe, int len) +string_inode (file_entry_t * fe, int len) { static char buffer[10]; @@ -659,7 +659,7 @@ /** nuid */ static const char * -string_file_nuid (file_entry * fe, int len) +string_file_nuid (file_entry_t * fe, int len) { static char buffer[10]; @@ -672,7 +672,7 @@ /** ngid */ static const char * -string_file_ngid (file_entry * fe, int len) +string_file_ngid (file_entry_t * fe, int len) { static char buffer[10]; @@ -685,7 +685,7 @@ /** owner */ static const char * -string_file_owner (file_entry * fe, int len) +string_file_owner (file_entry_t * fe, int len) { (void) len; return get_owner (fe->st.st_uid); @@ -695,7 +695,7 @@ /** group */ static const char * -string_file_group (file_entry * fe, int len) +string_file_group (file_entry_t * fe, int len) { (void) len; return get_group (fe->st.st_gid); @@ -705,7 +705,7 @@ /** mark */ static const char * -string_marked (file_entry * fe, int len) +string_marked (file_entry_t * fe, int len) { (void) len; return fe->f.marked ? "*" : " "; @@ -715,7 +715,7 @@ /** space */ static const char * -string_space (file_entry * fe, int len) +string_space (file_entry_t * fe, int len) { (void) fe; (void) len; @@ -726,7 +726,7 @@ /** dot */ static const char * -string_dot (file_entry * fe, int len) +string_dot (file_entry_t * fe, int len) { (void) fe; (void) len; @@ -736,7 +736,7 @@ /* --------------------------------------------------------------------------------------------- */ static int -file_compute_color (int attr, file_entry * fe) +file_compute_color (int attr, file_entry_t * fe) { switch (attr) { @@ -767,13 +767,13 @@ int color, length, empty_line; const char *txt; format_e *format, *home; - file_entry *fe; + file_entry_t *fe; filename_scroll_flag_t res = FILENAME_NOSCROLL; (void) dest; (void) limit; length = 0; - empty_line = (file_index >= panel->count); + empty_line = (file_index >= panel->dir.len); home = (isstatus) ? panel->status_format : panel->format; fe = &panel->dir.list[file_index]; *field_lenght = 0; @@ -1008,7 +1008,7 @@ else if (DIR_IS_DOTDOT (panel->dir.list[panel->selected].fname)) { /* FIXME: - * while loading directory (do_load_dir() and do_reload_dir()), + * while loading directory (dir_list_load() and dir_list_reload()), * the actual stat info about ".." directory isn't got; * so just don't display incorrect info about ".." directory */ tty_print_string (str_fit_to_term (_("UP--DIR"), w->cols - 2, J_LEFT)); @@ -1032,7 +1032,7 @@ panel->max_shift = -1; for (i = 0; i < items; i++) { - if (i + panel->top_file >= panel->count) + if (i + panel->top_file >= panel->dir.len) color = 0; else { @@ -1342,7 +1342,7 @@ { int items = ITEMS (panel); - if (panel->count <= items) + if (panel->dir.len <= items) { /* If all files fit, show them all. */ panel->top_file = 0; @@ -1364,7 +1364,7 @@ if (panel->top_file < i) panel->top_file = i; - i = panel->count - items; + i = panel->dir.len - items; if (panel->top_file > i) panel->top_file = i; @@ -1393,7 +1393,7 @@ /* --------------------------------------------------------------------------------------------- */ static void -directory_history_add (struct WPanel *panel, const vfs_path_t * vpath) +directory_history_add (WPanel * panel, const vfs_path_t * vpath) { char *tmp; @@ -1409,7 +1409,7 @@ panel_load_history (const gchar * event_group_name, const gchar * event_name, gpointer init_data, gpointer data) { - WPanel *p = (WPanel *) init_data; + WPanel *p = PANEL (init_data); ev_history_load_save_t *ev = (ev_history_load_save_t *) data; (void) event_group_name; @@ -1435,7 +1435,7 @@ panel_save_history (const gchar * event_group_name, const gchar * event_name, gpointer init_data, gpointer data) { - WPanel *p = (WPanel *) init_data; + WPanel *p = PANEL (init_data); (void) event_group_name; (void) event_name; @@ -1473,8 +1473,7 @@ { /* directory history is already saved before this moment */ p->dir_history = g_list_first (p->dir_history); - g_list_foreach (p->dir_history, (GFunc) g_free, NULL); - g_list_free (p->dir_history); + g_list_free_full (p->dir_history, g_free); } g_free (p->hist_name); @@ -1505,13 +1504,13 @@ static void panel_paint_sort_info (WPanel * panel) { - if (*panel->sort_info.sort_field->hotkey != '\0') + if (*panel->sort_field->hotkey != '\0') { const char *sort_sign = panel->sort_info.reverse ? panel_sort_down_sign : panel_sort_up_sign; char *str; - str = g_strdup_printf ("%s%s", sort_sign, Q_ (panel->sort_info.sort_field->hotkey)); + str = g_strdup_printf ("%s%s", sort_sign, Q_ (panel->sort_field->hotkey)); widget_move (panel, 1, 1); tty_print_string (str); g_free (str); @@ -1548,7 +1547,6 @@ Widget *w = WIDGET (panel); int side, width; - GString *format_txt; adjust_top_file (panel); @@ -1559,6 +1557,7 @@ for (side = 0; side <= panel->split; side++) { + GString *format_txt; format_e *format; if (side) @@ -1580,7 +1579,7 @@ g_string_set_size (format_txt, 0); if (panel->list_type == list_long - && strcmp (format->id, panel->sort_info.sort_field->id) == 0) + && strcmp (format->id, panel->sort_field->id) == 0) g_string_append (format_txt, panel->sort_info.reverse ? panel_sort_down_sign : panel_sort_up_sign); @@ -1826,7 +1825,6 @@ int expand_top = 0; /* Max used element in expand */ int usable_columns; /* Usable columns in the panel */ int total_cols = 0; - int i; format_e *darr, *home; if (!format) @@ -1856,11 +1854,12 @@ /* If we used more columns than the available columns, adjust that */ if (total_cols > usable_columns) { - int pdif, dif = total_cols - usable_columns; + int dif = total_cols - usable_columns; while (dif) { - pdif = dif; + int pdif = dif; + for (darr = home; darr; darr = darr->next) { if (dif && darr->field_len - 1) @@ -1880,6 +1879,7 @@ /* Expand the available space */ if ((usable_columns > total_cols) && expand_top) { + int i; int spaces = (usable_columns - total_cols) / expand_top; int extra = (usable_columns - total_cols) % expand_top; @@ -2006,7 +2006,7 @@ static void move_down (WPanel * panel) { - if (panel->selected + 1 == panel->count) + if (panel->selected + 1 == panel->dir.len) return; unselect_item (panel); @@ -2015,8 +2015,8 @@ { /* Scroll window half screen */ panel->top_file += ITEMS (panel) / 2; - if (panel->top_file > panel->count - ITEMS (panel)) - panel->top_file = panel->count - ITEMS (panel); + if (panel->top_file > panel->dir.len - ITEMS (panel)) + panel->top_file = panel->dir.len - ITEMS (panel); paint_dir (panel); } select_item (panel); @@ -2053,8 +2053,8 @@ int adjust = 0; new_pos = panel->selected + lines; - if (new_pos >= panel->count) - new_pos = panel->count - 1; + if (new_pos >= panel->dir.len) + new_pos = panel->dir.len - 1; if (new_pos < 0) new_pos = 0; @@ -2190,16 +2190,16 @@ { int items; - if (panel->selected == panel->count - 1) + if (panel->selected == panel->dir.len - 1) return; unselect_item (panel); items = ITEMS (panel); - if (panel->top_file > panel->count - 2 * items) - items = panel->count - items - panel->top_file; + if (panel->top_file > panel->dir.len - 2 * items) + items = panel->dir.len - items - panel->top_file; if (panel->top_file + items < 0) items = -panel->top_file; if (!items) - panel->selected = panel->count - 1; + panel->selected = panel->dir.len - 1; else panel->selected += items; panel->top_file += items; @@ -2291,7 +2291,7 @@ static void move_end (WPanel * panel) { - if (panel->selected == panel->count - 1) + if (panel->selected == panel->dir.len - 1) return; unselect_item (panel); @@ -2312,7 +2312,7 @@ } } - panel->selected = panel->count - 1; + panel->selected = panel->dir.len - 1; paint_dir (panel); select_item (panel); } @@ -2363,7 +2363,7 @@ if (state_mark < 0) state_mark = selection (panel)->f.marked ? 0 : 1; - lines = min (lines, panel->count - panel->selected - 1); + lines = min (lines, panel->dir.len - panel->selected - 1); for (; lines != 0; lines--) { do_file_mark (panel, panel->selected, state_mark); @@ -2450,7 +2450,7 @@ reg_exp = g_strdup_printf ("%s*", panel->search_buffer); esc_str = strutils_escape (reg_exp, -1, ",|\\{}[]", TRUE); - search = mc_search_new (esc_str, -1); + search = mc_search_new (esc_str, -1, NULL); search->search_type = MC_SEARCH_T_GLOB; search->is_entire_line = TRUE; switch (panels_options.qsearch_mode) @@ -2468,7 +2468,7 @@ sel = panel->selected; for (i = panel->selected; !wrapped || i != panel->selected; i++) { - if (i >= panel->count) + if (i >= panel->dir.len) { i = 0; if (wrapped) @@ -2510,7 +2510,7 @@ { if (panel->searching) { - if (panel->selected + 1 == panel->count) + if (panel->selected + 1 == panel->dir.len) panel->selected = 0; else move_down (panel); @@ -2554,7 +2554,7 @@ /** Return 1 if the Enter key has been processed, 0 otherwise */ static int -do_enter_on_file_entry (file_entry * fe) +do_enter_on_file_entry_t (file_entry_t * fe) { vfs_path_t *full_name_vpath; gboolean ok; @@ -2631,7 +2631,7 @@ static int do_enter (WPanel * panel) { - return do_enter_on_file_entry (selection (panel)); + return do_enter_on_file_entry_t (selection (panel)); } /* --------------------------------------------------------------------------------------------- */ @@ -2639,7 +2639,7 @@ static void chdir_other_panel (WPanel * panel) { - const file_entry *entry = &panel->dir.list[panel->selected]; + const file_entry_t *entry = &panel->dir.list[panel->selected]; vfs_path_t *new_dir_vpath; char *sel_entry = NULL; @@ -2699,7 +2699,7 @@ chdir_to_readlink (WPanel * panel) { vfs_path_t *new_dir_vpath; - char buffer[MC_MAXPATHLEN], *p; + char buffer[MC_MAXPATHLEN]; int i; struct stat st; vfs_path_t *panel_fname_vpath; @@ -2724,6 +2724,8 @@ buffer[i] = 0; if (!S_ISDIR (st.st_mode)) { + char *p; + p = strrchr (buffer, PATH_SEP); if (p && !p[1]) { @@ -2817,7 +2819,7 @@ const panel_field_t *pfield = NULL; - title = panel_get_title_without_hotkey (panel->sort_info.sort_field->title_hotkey); + title = panel_get_title_without_hotkey (panel->sort_field->title_hotkey); lc_index = panel_get_format_field_index_by_name (panel, title); g_free (title); @@ -2837,7 +2839,7 @@ if (pfield != NULL) { - panel->sort_info.sort_field = pfield; + panel->sort_field = pfield; panel_set_sort_order (panel, pfield); } } @@ -2853,7 +2855,7 @@ gchar *title; format_field_count = panel_get_format_field_count (panel); - title = panel_get_title_without_hotkey (panel->sort_info.sort_field->title_hotkey); + title = panel_get_title_without_hotkey (panel->sort_field->title_hotkey); lc_index = panel_get_format_field_index_by_name (panel, title); g_free (title); @@ -2875,7 +2877,7 @@ if (pfield != NULL) { - panel->sort_info.sort_field = pfield; + panel->sort_field = pfield; panel_set_sort_order (panel, pfield); } } @@ -2887,10 +2889,10 @@ { const panel_field_t *sort_order; - sort_order = sort_box (&panel->sort_info); + sort_order = sort_box (&panel->sort_info, panel->sort_field); if (sort_order != NULL) { - panel->sort_info.sort_field = sort_order; + panel->sort_field = sort_order; panel_set_sort_order (panel, sort_order); } } @@ -2946,19 +2948,19 @@ static void panel_set_sort_type_by_id (WPanel * panel, const char *name) { - if (strcmp (panel->sort_info.sort_field->id, name) != 0) + if (strcmp (panel->sort_field->id, name) != 0) { const panel_field_t *sort_order; sort_order = panel_get_field_by_id (name); if (sort_order == NULL) return; - panel->sort_info.sort_field = sort_order; + panel->sort_field = sort_order; } else panel->sort_info.reverse = !panel->sort_info.reverse; - panel_set_sort_order (panel, panel->sort_info.sort_field); + panel_set_sort_order (panel, panel->sort_field); } /* --------------------------------------------------------------------------------------------- */ @@ -3063,10 +3065,8 @@ /* Reload current panel */ panel_clean_dir (panel); - panel->count = - do_load_dir (panel->cwd_vpath, &panel->dir, panel->sort_info.sort_field->sort_routine, - panel->sort_info.reverse, panel->sort_info.case_sensitive, - panel->sort_info.exec_first, panel->filter); + dir_list_load (&panel->dir, panel->cwd_vpath, panel->sort_field->sort_routine, + &panel->sort_info, panel->filter); try_to_select (panel, get_parent_dir_name (panel->cwd_vpath, olddir_vpath)); load_hint (0); @@ -3336,7 +3336,7 @@ break; case CK_SortReverse: panel->sort_info.reverse = !panel->sort_info.reverse; - panel_set_sort_order (panel, panel->sort_info.sort_field); + panel_set_sort_order (panel, panel->sort_field); break; case CK_SortByName: panel_set_sort_type_by_id (panel, "name"); @@ -3398,7 +3398,7 @@ static cb_ret_t panel_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data) { - WPanel *panel = (WPanel *) w; + WPanel *panel = PANEL (w); WButtonBar *bb; switch (msg) @@ -3531,7 +3531,6 @@ const char *lc_sort_name = NULL; panel_field_t *col_sort_format = NULL; format_e *format; - gchar *title; for (i = 0, format = panel->format; format != NULL; format = format->next) { @@ -3549,6 +3548,8 @@ for (i = 0; panel_fields[i].id != NULL; i++) { + char *title; + title = panel_get_title_without_hotkey (panel_fields[i].title_hotkey); if (!strcmp (lc_sort_name, title) && panel_fields[i].sort_routine) { @@ -3562,7 +3563,7 @@ if (col_sort_format == NULL) return; - if (panel->sort_info.sort_field == col_sort_format) + if (panel->sort_field == col_sort_format) { /* reverse the sort if clicked column is already the sorted column */ panel->sort_info.reverse = !panel->sort_info.reverse; @@ -3583,7 +3584,7 @@ static int panel_event (Gpm_Event * event, void *data) { - WPanel *panel = (WPanel *) data; + WPanel *panel = PANEL (data); Widget *w = WIDGET (data); const int lines = llines (panel); @@ -3655,7 +3656,8 @@ { if (is_active) { - if (panels_options.mouse_move_pages && (panel->top_file + ITEMS (panel) < panel->count)) + if (panels_options.mouse_move_pages + && (panel->top_file + ITEMS (panel) < panel->dir.len)) next_page (panel); else /* We are in last page */ move_down (panel); @@ -3671,16 +3673,16 @@ if (!is_active) change_panel (); - if (panel->top_file + local.y > panel->count) - my_index = panel->count - 1; + if (panel->top_file + local.y > panel->dir.len) + my_index = panel->dir.len - 1; else { my_index = panel->top_file + local.y - 1; if (panel->split && (local.x > (w->cols - 2) / 2)) my_index += llines (panel); - if (my_index >= panel->count) - my_index = panel->count - 1; + if (my_index >= panel->dir.len) + my_index = panel->dir.len - 1; } if (my_index != panel->selected) @@ -3715,7 +3717,7 @@ if (panel != current_panel) (void) mc_chdir (panel->cwd_vpath); - for (i = 0, j = 0; i < panel->count; i++) + for (i = 0, j = 0; i < panel->dir.len; i++) { vfs_path_t *vpath; @@ -3730,7 +3732,7 @@ do_file_mark (panel, i, 0); } vpath = vfs_path_from_str (list->list[i].fname); - if (mc_lstat (vpath, &list->list[i].st)) + if (mc_lstat (vpath, &list->list[i].st) != 0) g_free (list->list[i].fname); else { @@ -3743,9 +3745,9 @@ vfs_path_free (vpath); } if (j == 0) - panel->count = set_zero_dir (list) ? 1 : 0; + dir_list_init (list); else - panel->count = j; + list->len = j; if (panel != current_panel) (void) mc_chdir (current_panel->cwd_vpath); @@ -3796,7 +3798,7 @@ { WPanel *panel; - panel = (WPanel *) get_panel_widget (which); + panel = PANEL (get_panel_widget (which)); if (panel->is_panelized) flags &= ~UP_RELOAD; update_one_panel_widget (panel, flags, current_file); @@ -3842,7 +3844,7 @@ subdir = vfs_strip_suffix_from_filename (x_basename (name)); /* Search that subdir or filename without prefix (if not panelized panel), select it if found */ - for (i = 0; i < panel->count; i++) + for (i = 0; i < panel->dir.len; i++) { if (strcmp (subdir, panel->dir.list[i].fname) == 0) { @@ -3853,8 +3855,8 @@ } /* Try to select a file near the file that is missing */ - if (panel->selected >= panel->count) - do_select (panel, panel->count - 1); + if (panel->selected >= panel->dir.len) + do_select (panel, panel->dir.len - 1); g_free (subdir); } @@ -3896,7 +3898,7 @@ gboolean first = TRUE; char *flist = NULL; - for (i = 0; i < current_panel->count; i++) + for (i = 0; i < current_panel->dir.len; i++) if (current_panel->dir.list[i].f.marked != 0) { /* Skip the unmarked ones */ if (first) @@ -3966,9 +3968,6 @@ void panel_clean_dir (WPanel * panel) { - int count = panel->count; - - panel->count = 0; panel->top_file = 0; panel->selected = 0; panel->marked = 0; @@ -3980,7 +3979,7 @@ panel->content_shift = -1; panel->max_shift = -1; - clean_dir (&panel->dir, count); + dir_list_clean (&panel->dir); } /* --------------------------------------------------------------------------------------------- */ @@ -4074,8 +4073,9 @@ panel->hist_name = g_strconcat ("Dir Hist ", panel_name, (char *) NULL); /* directories history will be get later */ - panel->dir.list = g_new (file_entry, MIN_FILES); - panel->dir.size = MIN_FILES; + panel->dir.size = DIR_LIST_MIN_SIZE; + panel->dir.list = g_new (file_entry_t, panel->dir.size); + panel->dir.len = 0; panel->active = 0; panel->filter = 0; panel->split = 0; @@ -4142,10 +4142,8 @@ } /* Load the default format */ - panel->count = - do_load_dir (panel->cwd_vpath, &panel->dir, panel->sort_info.sort_field->sort_routine, - panel->sort_info.reverse, panel->sort_info.case_sensitive, - panel->sort_info.exec_first, panel->filter); + dir_list_load (&panel->dir, panel->cwd_vpath, panel->sort_field->sort_routine, + &panel->sort_info, panel->filter); /* Restore old right path */ if (curdir != NULL) @@ -4181,7 +4179,7 @@ { panel->cwd_vpath = vfs_path_from_str (PATH_SEP_STR); panel_clean_dir (panel); - panel->count = set_zero_dir (&panel->dir) ? 1 : 0; + dir_list_init (&panel->dir); return; } @@ -4189,14 +4187,12 @@ memset (&(panel->dir_stat), 0, sizeof (panel->dir_stat)); show_dir (panel); - panel->count = - do_reload_dir (panel->cwd_vpath, &panel->dir, panel->sort_info.sort_field->sort_routine, - panel->count, panel->sort_info.reverse, panel->sort_info.case_sensitive, - panel->sort_info.exec_first, panel->filter); + dir_list_reload (&panel->dir, panel->cwd_vpath, panel->sort_field->sort_routine, + &panel->sort_info, panel->filter); panel->dirty = 1; - if (panel->selected >= panel->count) - do_select (panel, panel->count - 1); + if (panel->selected >= panel->dir.len) + do_select (panel, panel->dir.len - 1); recalculate_panel_summary (panel); } @@ -4314,8 +4310,8 @@ if (panel->selected < 0) panel->selected = 0; - if (panel->selected > panel->count - 1) - panel->selected = panel->count - 1; + if (panel->selected > panel->dir.len - 1) + panel->selected = panel->dir.len - 1; adjust_top_file (panel); @@ -4333,7 +4329,7 @@ if (!panel->marked) return; - for (i = 0; i < panel->count; i++) + for (i = 0; i < panel->dir.len; i++) file_mark (panel, i, 0); panel->dirs_marked = 0; @@ -4354,7 +4350,7 @@ panel->dirs_marked = 0; panel->total = 0; - for (i = 0; i < panel->count; i++) + for (i = 0; i < panel->dir.len; i++) if (panel->dir.list[i].f.marked) { /* do_file_mark will return immediately if newmark == oldmark. @@ -4412,7 +4408,7 @@ * Record change in the directory history. */ gboolean -do_panel_cd (struct WPanel *panel, const vfs_path_t * new_dir_vpath, enum cd_enum cd_type) +do_panel_cd (WPanel * panel, const vfs_path_t * new_dir_vpath, enum cd_enum cd_type) { gboolean r; @@ -4447,13 +4443,11 @@ filename = g_strdup (selection (panel)->fname); unselect_item (panel); - do_sort (&panel->dir, panel->sort_info.sort_field->sort_routine, panel->count - 1, - panel->sort_info.reverse, panel->sort_info.case_sensitive, - panel->sort_info.exec_first); + dir_list_sort (&panel->dir, panel->sort_field->sort_routine, &panel->sort_info); panel->selected = -1; - for (i = panel->count; i; i--) + for (i = panel->dir.len; i != 0; i--) { - if (!strcmp (panel->dir.list[i - 1].fname, filename)) + if (strcmp (panel->dir.list[i - 1].fname, filename) == 0) { panel->selected = i - 1; break; @@ -4473,10 +4467,10 @@ if (sort_order == NULL) return; - panel->sort_info.sort_field = sort_order; + panel->sort_field = sort_order; /* The directory is already sorted, we have to load the unsorted stuff */ - if (sort_order->sort_routine == (sortfn *) unsorted) + if (sort_order->sort_routine == (GCompareFunc) unsorted) { char *current_file; @@ -4626,9 +4620,9 @@ update_one_panel (get_other_index (), flags, UP_KEEPSEL); if (get_current_type () == view_listing) - panel = (WPanel *) get_panel_widget (get_current_index ()); + panel = PANEL (get_panel_widget (get_current_index ())); else - panel = (WPanel *) get_panel_widget (get_other_index ()); + panel = PANEL (get_panel_widget (get_other_index ())); if (!panel->is_panelized) (void) mc_chdir (panel->cwd_vpath); @@ -4703,18 +4697,20 @@ panel_get_field_by_title (const char *name) { gsize lc_index; - gchar *title = NULL; for (lc_index = 0; panel_fields[lc_index].id != NULL; lc_index++) { + gchar *title; + gboolean ok; + title = panel_get_title_without_hotkey (panel_fields[lc_index].title_hotkey); - if (panel_fields[lc_index].title_hotkey != NULL && strcmp (name, title) == 0) - { - g_free (title); + ok = title != NULL && strcmp (name, title) == 0; + g_free (title); + + if (ok) return &panel_fields[lc_index]; - } } - g_free (title); + return NULL; } diff -Nru mc-4.8.10/src/filemanager/panel.h mc-4.8.11/src/filemanager/panel.h --- mc-4.8.10/src/filemanager/panel.h 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/filemanager/panel.h 2013-11-29 18:27:07.000000000 +0000 @@ -17,6 +17,7 @@ /*** typedefs(not structures) and defined constants **********************************************/ +#define PANEL(x) ((WPanel *)(x)) #define selection(p) (&(p->dir.list[p->selected])) #define DEFAULT_USER_FORMAT "half type name | size | perm" @@ -69,26 +70,17 @@ const char *title_hotkey; gboolean is_user_choice; gboolean use_in_user_format; - const char *(*string_fn) (file_entry *, int); - sortfn *sort_routine; /* used by mouse_sort_col() */ + const char *(*string_fn) (file_entry_t *, int); + GCompareFunc sort_routine; /* used by mouse_sort_col() */ } panel_field_t; typedef struct { dir_list list; - int count; vfs_path_t *root_vpath; } panelized_panel_t; -typedef struct panel_sort_info_struct -{ - gboolean reverse; /* Show listing in reverse? */ - gboolean case_sensitive; /* Listing is case sensitive? */ - gboolean exec_first; /* Show executable top in list? */ - const panel_field_t *sort_field; -} panel_sort_info_t; - -typedef struct WPanel +typedef struct { Widget widget; dir_list dir; /* Directory contents */ @@ -100,7 +92,6 @@ GList *dir_history; /* directory history */ GList *dir_history_current; /* pointer to the current history item */ char *hist_name; /* directory history name for history file */ - int count; /* Number of files in dir structure */ int marked; /* Count of marked files */ int dirs_marked; /* Count of marked directories */ uintmax_t total; /* Bytes in marked files */ @@ -110,7 +101,10 @@ gboolean is_panelized; /* Flag: special filelisting, can't reload */ panel_display_t frame_size; /* half or full frame */ char *filter; /* File name filter */ - panel_sort_info_t sort_info; /* Sort descriptor */ + + /* sort */ + dir_sort_options_t sort_info; + const panel_field_t *sort_field; int dirty; /* Should we redisplay the panel? */ @@ -177,7 +171,7 @@ void file_mark (WPanel * panel, int idx, int val); void do_file_mark (WPanel * panel, int idx, int val); -gboolean do_panel_cd (struct WPanel *panel, const vfs_path_t * new_dir_vpath, enum cd_enum cd_type); +gboolean do_panel_cd (WPanel * panel, const vfs_path_t * new_dir_vpath, enum cd_enum cd_type); gsize panel_get_num_of_sortable_fields (void); const char **panel_get_sortable_fields (gsize *); diff -Nru mc-4.8.10/src/filemanager/panelize.c mc-4.8.11/src/filemanager/panelize.c --- mc-4.8.10/src/filemanager/panelize.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/filemanager/panelize.c 2013-11-29 18:27:07.000000000 +0000 @@ -259,22 +259,17 @@ static void add2panelize_cmd (void) { - char *label; - - if (pname->buffer && (*pname->buffer)) + if (pname->buffer != NULL && *pname->buffer != '\0') { + char *label; + label = input_dialog (_("Add to external panelize"), _("Enter command label:"), MC_HISTORY_FM_PANELIZE_ADD, "", INPUT_COMPLETE_NONE); - if (!label) - return; - if (!*label) - { + if (label == NULL || *label == '\0') g_free (label); - return; - } - - add2panelize (label, g_strdup (pname->buffer)); + else + add2panelize (label, g_strdup (pname->buffer)); } } @@ -311,8 +306,7 @@ static void do_external_panelize (char *command) { - int status, link_to_dir, stale_link; - int next_free = 0; + int link_to_dir, stale_link; struct stat st; dir_list *list = ¤t_panel->dir; char line[MC_MAXPATHLEN]; @@ -331,10 +325,9 @@ panelize_change_root (current_panel->cwd_vpath); - if (set_zero_dir (list)) - next_free++; + dir_list_init (list); - while (1) + while (TRUE) { clearerr (external); if (fgets (line, MC_MAXPATHLEN, external) == NULL) @@ -352,45 +345,36 @@ name = line + 2; else name = line; - status = handle_path (list, name, &st, next_free, &link_to_dir, &stale_link); - if (status == 0) + + if (!handle_path (name, &st, &link_to_dir, &stale_link)) continue; - if (status == -1) + + if (!dir_list_append (list, name, &st, link_to_dir != 0, stale_link != 0)) break; - list->list[next_free].fnamelen = strlen (name); - list->list[next_free].fname = g_strndup (name, list->list[next_free].fnamelen); - file_mark (current_panel, next_free, 0); - list->list[next_free].f.link_to_dir = link_to_dir; - list->list[next_free].f.stale_link = stale_link; - list->list[next_free].f.dir_size_computed = 0; - list->list[next_free].st = st; - list->list[next_free].sort_key = NULL; - list->list[next_free].second_sort_key = NULL; - next_free++; - if ((next_free & 32) == 0) + + file_mark (current_panel, list->len - 1, 0); + + if ((list->len & 31) == 0) rotate_dash (TRUE); } current_panel->is_panelized = TRUE; - if (next_free) - { - current_panel->count = next_free; - if (list->list[0].fname[0] == PATH_SEP) - { - vfs_path_t *vpath_root; - int ret; - vpath_root = vfs_path_from_str (PATH_SEP_STR); - panel_set_cwd (current_panel, vpath_root); - ret = mc_chdir (vpath_root); - vfs_path_free (vpath_root); - (void) ret; - } - } - else - { - current_panel->count = set_zero_dir (list) ? 1 : 0; + if (list->len == 0) + dir_list_init (list); + else if (list->list[0].fname[0] == PATH_SEP) + { + vfs_path_t *vpath_root; + int ret; + + vpath_root = vfs_path_from_str (PATH_SEP_STR); + panel_set_cwd (current_panel, vpath_root); + ret = mc_chdir (vpath_root); + vfs_path_free (vpath_root); + + (void) ret; } + if (pclose (external) < 0) message (D_NORMAL, _("External panelize"), _("Pipe close failed")); close_error_pipe (D_NORMAL, NULL); @@ -402,32 +386,28 @@ /* --------------------------------------------------------------------------------------------- */ static void -do_panelize_cd (struct WPanel *panel) +do_panelize_cd (WPanel * panel) { int i; - dir_list *list = &panel->dir; + dir_list *list; gboolean panelized_same; - clean_dir (list, panel->count); + dir_list_clean (&panel->dir); if (panelized_panel.root_vpath == NULL) panelize_change_root (current_panel->cwd_vpath); - if (panelized_panel.count < 1) - { - if (set_zero_dir (&panelized_panel.list)) - panelized_panel.count = 1; - } - else if (panelized_panel.count >= list->size) - { - list->list = g_try_realloc (list->list, sizeof (file_entry) * panelized_panel.count); - list->size = panelized_panel.count; - } - panel->count = panelized_panel.count; + if (panelized_panel.list.len < 1) + dir_list_init (&panelized_panel.list); + else if (panelized_panel.list.len > panel->dir.size) + dir_list_grow (&panel->dir, panelized_panel.list.len - panel->dir.size); + + list = &panel->dir; + list->len = panelized_panel.list.len; panel->is_panelized = TRUE; - panelized_same = (vfs_path_equal (panelized_panel.root_vpath, panel->cwd_vpath)); + panelized_same = vfs_path_equal (panelized_panel.root_vpath, panel->cwd_vpath); - for (i = 0; i < panelized_panel.count; i++) + for (i = 0; i < panelized_panel.list.len; i++) { if (panelized_same || DIR_IS_DOTDOT (panelized_panel.list.list[i].fname)) { @@ -438,13 +418,15 @@ else { vfs_path_t *tmp_vpath; + const char *fname; tmp_vpath = vfs_path_append_new (panelized_panel.root_vpath, panelized_panel.list.list[i].fname, NULL); - list->list[i].fname = g_strdup (vfs_path_as_str (tmp_vpath)); + fname = vfs_path_as_str (tmp_vpath); + list->list[i].fnamelen = strlen (fname); + list->list[i].fname = g_strndup (fname, list->list[i].fnamelen); vfs_path_free (tmp_vpath); - list->list[i].fnamelen = strlen (list->list[i].fname); } list->list[i].f.link_to_dir = panelized_panel.list.list[i].f.link_to_dir; list->list[i].f.stale_link = panelized_panel.list.list[i].f.stale_link; @@ -475,26 +457,23 @@ /* --------------------------------------------------------------------------------------------- */ void -panelize_save_panel (struct WPanel *panel) +panelize_save_panel (WPanel * panel) { int i; dir_list *list = &panel->dir; panelize_change_root (current_panel->cwd_vpath); - if (panelized_panel.count > 0) - clean_dir (&panelized_panel.list, panelized_panel.count); - if (panel->count < 1) + if (panelized_panel.list.len > 0) + dir_list_clean (&panelized_panel.list); + if (panel->dir.len == 0) return; - panelized_panel.count = panel->count; - if (panel->count >= panelized_panel.list.size) - { - panelized_panel.list.list = g_try_realloc (panelized_panel.list.list, - sizeof (file_entry) * panel->count); - panelized_panel.list.size = panel->count; - } - for (i = 0; i < panel->count; i++) + if (panel->dir.len > panelized_panel.list.size) + dir_list_grow (&panelized_panel.list, panel->dir.len - panelized_panel.list.size); + panelized_panel.list.len = panel->dir.len; + + for (i = 0; i < panel->dir.len; i++) { panelized_panel.list.list[i].fnamelen = list->list[i].fnamelen; panelized_panel.list.list[i].fname = @@ -517,7 +496,7 @@ if (!SELECTED_IS_PANEL) set_display_type (MENU_PANEL_IDX, view_listing); - do_panelize_cd ((struct WPanel *) get_panel_widget (MENU_PANEL_IDX)); + do_panelize_cd (PANEL (get_panel_widget (MENU_PANEL_IDX))); } /* --------------------------------------------------------------------------------------------- */ @@ -581,17 +560,14 @@ void load_panelize (void) { - gchar **profile_keys, **keys; + char **keys; gsize len; - GIConv conv; - - conv = str_crt_conv_from ("UTF-8"); - profile_keys = keys = mc_config_get_keys (mc_main_config, panelize_section, &len); + keys = mc_config_get_keys (mc_main_config, panelize_section, &len); add2panelize (g_strdup (_("Other command")), g_strdup ("")); - if (!profile_keys || *profile_keys == NULL) + if (keys == NULL || *keys == NULL) { add2panelize (g_strdup (_("Modified git files")), g_strdup ("git ls-files --modified")); add2panelize (g_strdup (_("Find rejects after patching")), @@ -600,30 +576,37 @@ g_strdup ("find . -name \\*.orig -print")); add2panelize (g_strdup (_("Find SUID and SGID programs")), g_strdup - ("find . \\( \\( -perm -04000 -a -perm +011 \\) -o \\( -perm -02000 -a -perm +01 \\) \\) -print")); - return; + ("find . \\( \\( -perm -04000 -a -perm /011 \\) -o \\( -perm -02000 -a -perm /01 \\) \\) -print")); } - - while (*profile_keys) + else { - GString *buffer; + GIConv conv; + char **profile_keys; - if (mc_global.utf8_display || conv == INVALID_CONV) - buffer = g_string_new (*profile_keys); - else + conv = str_crt_conv_from ("UTF-8"); + + for (profile_keys = keys; *profile_keys != NULL; profile_keys++) { - buffer = g_string_new (""); - if (str_convert (conv, *profile_keys, buffer) == ESTR_FAILURE) - g_string_assign (buffer, *profile_keys); + GString *buffer; + + if (mc_global.utf8_display || conv == INVALID_CONV) + buffer = g_string_new (*profile_keys); + else + { + buffer = g_string_new (""); + if (str_convert (conv, *profile_keys, buffer) == ESTR_FAILURE) + g_string_assign (buffer, *profile_keys); + } + + add2panelize (g_string_free (buffer, FALSE), + mc_config_get_string (mc_main_config, panelize_section, *profile_keys, + "")); } - add2panelize (g_string_free (buffer, FALSE), - mc_config_get_string (mc_main_config, panelize_section, *profile_keys, "")); - profile_keys++; + str_close_conv (conv); } g_strfreev (keys); - str_close_conv (conv); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.10/src/filemanager/panelize.h mc-4.8.11/src/filemanager/panelize.h --- mc-4.8.10/src/filemanager/panelize.h 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/filemanager/panelize.h 2013-11-29 18:27:07.000000000 +0000 @@ -11,8 +11,6 @@ /*** structures declarations (and typedefs of structures)*****************************************/ -struct WPanel; - /*** global variables defined in .c file *********************************************************/ /*** declarations of public functions ************************************************************/ @@ -22,7 +20,7 @@ void save_panelize (void); void done_panelize (void); void cd_panelize_cmd (void); -void panelize_save_panel (struct WPanel *panel); +void panelize_save_panel (WPanel * panel); void panelize_change_root (const vfs_path_t * new_root); /*** inline functions ****************************************************************************/ diff -Nru mc-4.8.10/src/filemanager/tree.c mc-4.8.11/src/filemanager/tree.c --- mc-4.8.10/src/filemanager/tree.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/filemanager/tree.c 2013-11-29 18:27:07.000000000 +0000 @@ -172,14 +172,14 @@ save_tree (WTree * tree) { int error; - char *tree_name; (void) tree; error = tree_store_save (); - if (error) { + char *tree_name; + tree_name = mc_config_get_full_path (MC_TREESTORE_FILE); fprintf (stderr, _("Cannot open the %s file for writing:\n%s\n"), tree_name, unix_error_string (error)); @@ -776,7 +776,7 @@ if (dest != NULL && *dest != '\0') { - FileOpContext *ctx; + file_op_context_t *ctx; FileOpTotalContext *tctx; ctx = file_op_context_new (OP_COPY); @@ -800,7 +800,7 @@ char msg[BUF_MEDIUM]; char *dest; struct stat buf; - FileOpContext *ctx; + file_op_context_t *ctx; FileOpTotalContext *tctx; if (tree->selected_ptr == NULL) @@ -865,7 +865,7 @@ tree_rmdir (void *data) { WTree *tree = data; - FileOpContext *ctx; + file_op_context_t *ctx; FileOpTotalContext *tctx; if (!tree->selected_ptr) diff -Nru mc-4.8.10/src/filemanager/treestore.c mc-4.8.11/src/filemanager/treestore.c --- mc-4.8.10/src/filemanager/treestore.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/filemanager/treestore.c 2013-11-29 18:27:07.000000000 +0000 @@ -207,9 +207,7 @@ tree_store_load_from (char *name) { FILE *file; - char buffer[MC_MAXPATHLEN + 20], oldname[MC_MAXPATHLEN]; - char *different; - int common; + char buffer[MC_MAXPATHLEN + 20]; int do_load; g_return_val_if_fail (name != NULL, FALSE); @@ -239,6 +237,8 @@ if (do_load) { + char oldname[MC_MAXPATHLEN]; + ts.loaded = TRUE; /* File open -> read contents */ @@ -264,8 +264,11 @@ /* Clear-text decompression */ char *s = strtok (lc_name, " "); - if (s) + if (s != NULL) { + char *different; + int common; + common = atoi (s); different = strtok (NULL, ""); if (different) @@ -344,10 +347,10 @@ current = ts.tree_first; while (current) { - int i, common; - if (vfs_file_is_local (current->name)) { + int i, common; + /* Clear-text compression */ if (current->prev && (common = str_common (current->prev->name, current->name)) > 2) { @@ -482,11 +485,11 @@ tree_store_notify_remove (tree_entry * entry) { hook_t *p = remove_entry_hooks; - tree_store_remove_fn r; while (p != NULL) { - r = (tree_store_remove_fn) p->hook_fn; + tree_store_remove_fn r = (tree_store_remove_fn) p->hook_fn; + r (entry, p->hook_data); p = p->next; } @@ -689,7 +692,7 @@ void tree_store_remove_entry (const vfs_path_t * name_vpath) { - tree_entry *current, *base, *old; + tree_entry *current, *base; size_t len; g_return_if_fail (name_vpath != NULL); @@ -715,6 +718,7 @@ while (current != NULL && vfs_path_equal_len (current->name, base->name, len)) { gboolean ok; + tree_entry *old; const char *cname; cname = vfs_path_as_str (current->name); @@ -859,7 +863,7 @@ void tree_store_end_check (void) { - tree_entry *current, *old; + tree_entry *current; size_t len; GList *the_queue; @@ -875,6 +879,7 @@ while (current != NULL && vfs_path_equal_len (current->name, ts.check_name, len)) { gboolean ok; + tree_entry *old; const char *cname; cname = vfs_path_as_str (current->name); @@ -895,8 +900,7 @@ vfs_path_free (ts.check_name); ts.check_name = NULL; - g_list_foreach (the_queue, (GFunc) vfs_path_free, NULL); - g_list_free (the_queue); + g_list_free_full (the_queue, (GDestroyNotify) vfs_path_free); } /* --------------------------------------------------------------------------------------------- */ @@ -905,7 +909,6 @@ tree_store_rescan (const vfs_path_t * vpath) { DIR *dirp; - struct dirent *dp; struct stat buf; tree_entry *entry; @@ -923,6 +926,8 @@ dirp = mc_opendir (vpath); if (dirp) { + struct dirent *dp; + for (dp = mc_readdir (dirp); dp; dp = mc_readdir (dirp)) { vfs_path_t *tmp_vpath; diff -Nru mc-4.8.10/src/filemanager/usermenu.c mc-4.8.11/src/filemanager/usermenu.c --- mc-4.8.10/src/filemanager/usermenu.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/filemanager/usermenu.c 2013-11-29 18:27:07.000000000 +0000 @@ -7,6 +7,7 @@ Written by: Slava Zanko , 2013 + Andrew Borodin , 2013 This file is part of the Midnight Commander. @@ -246,13 +247,14 @@ char *edit_filename; edit_filename = edit_get_file_name (edit_widget); - *condition = mc_search (arg, edit_filename, search_type) ? 1 : 0; + *condition = mc_search (arg, DEFAULT_CHARSET, edit_filename, search_type) ? 1 : 0; g_free (edit_filename); } else #endif *condition = panel != NULL && - mc_search (arg, panel->dir.list[panel->selected].fname, search_type) ? 1 : 0; + mc_search (arg, DEFAULT_CHARSET, panel->dir.list[panel->selected].fname, + search_type) ? 1 : 0; break; case 'y': /* syntax pattern */ #ifdef USE_INTERNAL_EDIT @@ -262,7 +264,8 @@ if (syntax_type != NULL) { p = extract_arg (p, arg, sizeof (arg)); - *condition = mc_search (arg, syntax_type, MC_SEARCH_T_NORMAL) ? 1 : 0; + *condition = + mc_search (arg, DEFAULT_CHARSET, syntax_type, MC_SEARCH_T_NORMAL) ? 1 : 0; } } #endif @@ -270,7 +273,8 @@ case 'd': p = extract_arg (p, arg, sizeof (arg)); *condition = panel != NULL - && mc_search (arg, vfs_path_as_str (panel->cwd_vpath), search_type) ? 1 : 0; + && mc_search (arg, DEFAULT_CHARSET, vfs_path_as_str (panel->cwd_vpath), + search_type) ? 1 : 0; break; case 't': p = extract_arg (p, arg, sizeof (arg)); @@ -303,15 +307,16 @@ debug_out (char *start, char *end, int cond) { static char *msg; - int len; if (start == NULL && end == NULL) { /* Show output */ if (debug_flag && msg) { + size_t len; + len = strlen (msg); - if (len) + if (len != 0) msg[len - 1] = 0; message (D_NORMAL, _("Debug"), "%s", msg); @@ -357,11 +362,12 @@ { int condition; char operator; - char *debug_start, *debug_end; /* Repeat till end of line */ while (*p && *p != '\n') { + char *debug_start, *debug_end; + /* support quote space .mnu */ while ((*p == ' ' && *(p - 1) != '\\') || *p == '\t') p++; @@ -469,7 +475,6 @@ { if (*commands == '}') { - char *tmp; *parameter = 0; parameter = input_dialog (_("Parameter"), lc_prompt, MC_HISTORY_FM_MENU_EXEC_PARAM, "", @@ -486,6 +491,8 @@ } if (do_quote) { + char *tmp; + tmp = name_quote (parameter, 0); fputs (tmp, cmd_file); g_free (tmp); @@ -638,7 +645,7 @@ { for (q++; *q && *q != '}'; q++) { - if (!strncmp (q, "ascii", 5)) + if (!strncmp (q, DEFAULT_CHARSET, 5)) { mcview_default_hex_mode = 0; q += 4; @@ -685,12 +692,13 @@ { const char *q = p; char *var_name; - const char *value; - const char *dots = 0; - *v = 0; + *v = NULL; if (!strncmp (p, "var{", 4)) { + const char *dots = NULL; + const char *value; + for (q += 4; *q && *q != '}'; q++) { if (*q == ':') @@ -883,7 +891,7 @@ block = g_string_sized_new (16); - for (i = 0; i < panel->count; i++) + for (i = 0; i < panel->dir.len; i++) if (panel->dir.list[i].f.marked) { char *tmp; @@ -921,7 +929,6 @@ int max_cols, menu_lines, menu_limit; int col, i, accept_entry = 1; int selected, old_patterns; - Listbox *listbox; gboolean res = FALSE; gboolean interactive = TRUE; @@ -1089,6 +1096,8 @@ selected = selected_entry; else { + Listbox *listbox; + max_cols = min (max (max_cols, col), MAX_ENTRY_LEN); /* Create listbox */ diff -Nru mc-4.8.10/src/help.c mc-4.8.11/src/help.c --- mc-4.8.10/src/help.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/help.c 2013-11-29 18:27:07.000000000 +0000 @@ -296,9 +296,7 @@ static const char * help_follow_link (const char *start, const char *lc_selected_item) { - char link_name[MAXLINKNAME]; const char *p; - int i = 0; if (lc_selected_item == NULL) return start; @@ -307,6 +305,9 @@ ; if (*p == CHAR_LINK_POINTER) { + int i; + char link_name[MAXLINKNAME]; + link_name[0] = '['; for (i = 1; *p != CHAR_LINK_END && *p && *p != CHAR_NODE_END && i < MAXLINKNAME - 3;) link_name[i++] = *++p; @@ -393,8 +394,7 @@ static void clear_link_areas (void) { - g_slist_foreach (link_area, (GFunc) g_free, NULL); - g_slist_free (link_area); + g_slist_free_full (link_area, g_free); link_area = NULL; inside_link_area = FALSE; } diff -Nru mc-4.8.10/src/keybind-defaults.c mc-4.8.11/src/keybind-defaults.c --- mc-4.8.10/src/keybind-defaults.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/keybind-defaults.c 2013-10-15 09:52:41.000000000 +0000 @@ -320,8 +320,8 @@ #ifdef USE_INTERNAL_EDIT static const global_keymap_ini_t default_editor_keymap[] = { {"Enter", "enter"}, - {"Return", "shift-enter"}, /* useful for pasting multiline text */ - {"Tab", "tab"}, + {"Return", "shift-enter; ctrl-enter; ctrl-shift-enter"}, /* useful for pasting multiline text */ + {"Tab", "tab; shift-tab; ctrl-tab; ctrl-shift-tab"}, /* ditto */ {"BackSpace", "backspace; ctrl-h"}, {"Delete", "delete; ctrl-d"}, {"Left", "left"}, diff -Nru mc-4.8.10/src/main.c mc-4.8.11/src/main.c --- mc-4.8.10/src/main.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/main.c 2013-11-29 18:27:07.000000000 +0000 @@ -203,6 +203,7 @@ { struct sigaction sigchld_action; + memset (&sigchld_action, 0, sizeof (sigchld_action)); sigchld_action.sa_handler = #ifdef ENABLE_SUBSHELL mc_global.tty.use_subshell ? sigchld_handler : @@ -213,8 +214,6 @@ #ifdef SA_RESTART sigchld_action.sa_flags = SA_RESTART; -#else - sigchld_action.sa_flags = 0; #endif /* !SA_RESTART */ if (sigaction (SIGCHLD, &sigchld_action, NULL) == -1) @@ -381,6 +380,10 @@ w/o Shift button in subshell in the native console */ init_mouse (); + /* Done after do_enter_ca_mode (tty_init) because in VTE bracketed mode is + separate for the normal and alternate screens */ + enable_bracketed_paste (); + /* subshell_prompt is NULL here */ mc_prompt = (geteuid () == 0) ? "# " : "$ "; @@ -449,9 +452,10 @@ if (macros_list != NULL) { guint i; - macros_t *macros; for (i = 0; i < macros_list->len; i++) { + macros_t *macros; + macros = &g_array_index (macros_list, struct macros_t, i); if (macros != NULL && macros->macro != NULL) (void) g_array_free (macros->macro, FALSE); @@ -464,10 +468,8 @@ if (mc_global.mc_run_mode != MC_RUN_EDITOR) g_free (mc_run_param0); else - { - g_list_foreach ((GList *) mc_run_param0, (GFunc) mcedit_arg_free, NULL); - g_list_free ((GList *) mc_run_param0); - } + g_list_free_full ((GList *) mc_run_param0, (GDestroyNotify) mcedit_arg_free); + g_free (mc_run_param1); g_free (saved_other_dir); diff -Nru mc-4.8.10/src/man2hlp/Makefile.in mc-4.8.11/src/man2hlp/Makefile.in --- mc-4.8.10/src/man2hlp/Makefile.in 2013-08-02 18:56:47.000000000 +0000 +++ mc-4.8.11/src/man2hlp/Makefile.in 2013-11-29 18:45:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,8 +79,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/man2hlp -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/man2hlp.in $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs $(srcdir)/man2hlp.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -132,6 +160,7 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -385,11 +414,9 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -527,15 +554,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/src/setup.c mc-4.8.11/src/setup.c --- mc-4.8.10/src/setup.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/setup.c 2013-11-29 18:27:07.000000000 +0000 @@ -510,7 +510,6 @@ { mc_config_t *tmp_cfg; char **groups, **curr_grp; - const char *need_grp; if (!exist_file (profile)) return; @@ -547,6 +546,8 @@ while (*curr_grp) { + const char *need_grp; + need_grp = setup__is_cfg_group_must_panel_config (*curr_grp); if (need_grp != NULL) { @@ -1385,9 +1386,9 @@ /* Load sort order */ buffer = mc_config_get_string (mc_panels_config, section, "sort_order", "name"); - panel->sort_info.sort_field = panel_get_field_by_id (buffer); - if (panel->sort_info.sort_field == NULL) - panel->sort_info.sort_field = panel_get_field_by_id ("name"); + panel->sort_field = panel_get_field_by_id (buffer); + if (panel->sort_field == NULL) + panel->sort_field = panel_get_field_by_id ("name"); g_free (buffer); @@ -1421,7 +1422,7 @@ /* --------------------------------------------------------------------------------------------- */ void -panel_save_setup (struct WPanel *panel, const char *section) +panel_save_setup (WPanel * panel, const char *section) { char buffer[BUF_TINY]; size_t i; @@ -1431,7 +1432,7 @@ panel->sort_info.case_sensitive); mc_config_set_int (mc_panels_config, section, "exec_first", panel->sort_info.exec_first); - mc_config_set_string (mc_panels_config, section, "sort_order", panel->sort_info.sort_field->id); + mc_config_set_string (mc_panels_config, section, "sort_order", panel->sort_field->id); for (i = 0; list_types[i].key != NULL; i++) if (list_types[i].list_type == panel->list_type) diff -Nru mc-4.8.10/src/setup.h mc-4.8.11/src/setup.h --- mc-4.8.10/src/setup.h 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/setup.h 2013-11-29 18:27:07.000000000 +0000 @@ -10,6 +10,7 @@ #include "lib/global.h" /* GError */ #include "filemanager/layout.h" /* panel_view_mode_t */ +#include "filemanager/panel.h" /* WPanel */ /*** typedefs(not structures) and defined constants **********************************************/ @@ -54,8 +55,6 @@ gboolean torben_fj_mode; /* If TRUE, use some usability hacks by Torben */ } panels_options_t; -struct WPanel; - typedef struct macro_action_t { unsigned long action; @@ -154,8 +153,8 @@ void load_keymap_defs (gboolean load_from_file); void free_keymap_defs (void); -void panel_load_setup (struct WPanel *panel, const char *section); -void panel_save_setup (struct WPanel *panel, const char *section); +void panel_load_setup (WPanel * panel, const char *section); +void panel_save_setup (WPanel * panel, const char *section); void panels_load_options (void); void panels_save_options (void); diff -Nru mc-4.8.10/src/subshell.c mc-4.8.11/src/subshell.c --- mc-4.8.10/src/subshell.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/subshell.c 2013-11-29 18:27:07.000000000 +0000 @@ -184,10 +184,12 @@ static ssize_t write_all (int fd, const void *buf, size_t count) { - ssize_t ret; ssize_t written = 0; + while (count > 0) { + ssize_t ret; + ret = write (fd, (const unsigned char *) buf + written, count); if (ret < 0) { @@ -471,7 +473,6 @@ feed_subshell (int how, int fail_on_error) { fd_set read_set; /* For 'select' */ - int maxfdp; int bytes; /* For the return value from 'read' */ int i; /* Loop counter */ @@ -485,6 +486,8 @@ while (TRUE) { + int maxfdp; + if (!subshell_alive) return FALSE; @@ -924,8 +927,6 @@ int invoke_subshell (const char *command, int how, vfs_path_t ** new_dir_vpath) { - char *pcwd; - /* Make the MC terminal transparent */ tcsetattr (STDOUT_FILENO, TCSANOW, &raw_mode); @@ -957,11 +958,14 @@ feed_subshell (how, FALSE); - pcwd = vfs_translate_path_n (vfs_path_as_str (current_panel->cwd_vpath)); + if (new_dir_vpath != NULL && subshell_alive) + { + const char *pcwd; - if (new_dir_vpath != NULL && subshell_alive && strcmp (subshell_cwd, pcwd)) - *new_dir_vpath = vfs_path_from_str (subshell_cwd); /* Make MC change to the subshell's CWD */ - g_free (pcwd); + pcwd = vfs_translate_path (vfs_path_as_str (current_panel->cwd_vpath)); + if (strcmp (subshell_cwd, pcwd) != 0) + *new_dir_vpath = vfs_path_from_str (subshell_cwd); /* Make MC change to the subshell's CWD */ + } /* Restart the subshell if it has died by SIGHUP, SIGQUIT, etc. */ while (!subshell_alive && quit == 0 && mc_global.tty.use_subshell) @@ -1175,9 +1179,9 @@ if (vpath != NULL) { - char *translate; + const char *translate; - translate = vfs_translate_path_n (vfs_path_as_str (vpath)); + translate = vfs_translate_path (vfs_path_as_str (vpath)); if (translate != NULL) { GString *temp; @@ -1185,8 +1189,6 @@ temp = subshell_name_quote (translate); write_all (mc_global.tty.subshell_pty, temp->str, temp->len); g_string_free (temp, TRUE); - - g_free (translate); } else { diff -Nru mc-4.8.10/src/util.c mc-4.8.11/src/util.c --- mc-4.8.10/src/util.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/util.c 2013-11-29 18:27:07.000000000 +0000 @@ -54,7 +54,7 @@ { if (!exist_file (vfs_path_as_str (file_vpath))) { - FileOpContext *ctx; + file_op_context_t *ctx; FileOpTotalContext *tctx; if (!exist_file (vfs_path_as_str (default_file_vpath))) diff -Nru mc-4.8.10/src/vfs/Makefile.in mc-4.8.11/src/vfs/Makefile.in --- mc-4.8.10/src/vfs/Makefile.in 2013-08-02 18:56:47.000000000 +0000 +++ mc-4.8.11/src/vfs/Makefile.in 2013-11-29 18:45:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,9 +97,9 @@ @ENABLE_VFS_UNDELFS_TRUE@am__append_17 = undelfs @ENABLE_VFS_UNDELFS_TRUE@am__append_18 = undelfs/libvfs-undelfs.la subdir = src/vfs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -178,13 +206,14 @@ am__v_CCLD_1 = SOURCES = $(libmc_vfs_la_SOURCES) DIST_SOURCES = $(libmc_vfs_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -192,9 +221,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = local cpio extfs fish ftpfs sftpfs sfs smbfs tar \ @@ -490,6 +539,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libmc-vfs.la: $(libmc_vfs_la_OBJECTS) $(libmc_vfs_la_DEPENDENCIES) $(EXTRA_libmc_vfs_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libmc_vfs_la_OBJECTS) $(libmc_vfs_la_LIBADD) $(LIBS) @@ -534,14 +584,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -562,31 +611,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -602,12 +633,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -619,15 +645,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -636,9 +658,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -815,24 +838,22 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - clean-noinstLTLIBRARIES cscopelist cscopelist-recursive ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool \ + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/src/vfs/cpio/Makefile.in mc-4.8.11/src/vfs/cpio/Makefile.in --- mc-4.8.10/src/vfs/cpio/Makefile.in 2013-08-02 18:56:48.000000000 +0000 +++ mc-4.8.11/src/vfs/cpio/Makefile.in 2013-11-29 18:45:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/vfs/cpio -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -162,6 +190,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -425,6 +470,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libvfs-cpio.la: $(libvfs_cpio_la_OBJECTS) $(libvfs_cpio_la_DEPENDENCIES) $(EXTRA_libvfs_cpio_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libvfs_cpio_la_OBJECTS) $(libvfs_cpio_la_LIBADD) $(LIBS) @@ -463,26 +509,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -494,15 +529,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -511,9 +542,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -666,9 +698,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -678,7 +710,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/src/vfs/cpio/cpio.c mc-4.8.11/src/vfs/cpio/cpio.c --- mc-4.8.10/src/vfs/cpio/cpio.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/vfs/cpio/cpio.c 2013-11-29 18:27:07.000000000 +0000 @@ -205,8 +205,7 @@ if (arch->fd != -1) mc_close (arch->fd); arch->fd = -1; - g_slist_foreach (arch->deferred, (GFunc) g_free, NULL); - g_slist_free (arch->deferred); + g_slist_free_full (arch->deferred, g_free); arch->deferred = NULL; g_free (super->data); super->data = NULL; @@ -380,12 +379,15 @@ case S_IFCHR: case S_IFBLK: #ifdef S_IFSOCK + /* cppcheck-suppress syntaxError */ case S_IFSOCK: #endif #ifdef S_IFIFO + /* cppcheck-suppress syntaxError */ case S_IFIFO: #endif #ifdef S_IFNAM + /* cppcheck-suppress syntaxError */ case S_IFNAM: #endif if ((st->st_size != 0) && (st->st_rdev == 0x0001)) @@ -737,6 +739,8 @@ ssize_t status; status = cpio_read_head (vpath_element->class, super); + if (status < 0) + return (-1); switch (status) { diff -Nru mc-4.8.10/src/vfs/extfs/Makefile.in mc-4.8.11/src/vfs/extfs/Makefile.in --- mc-4.8.10/src/vfs/extfs/Makefile.in 2013-08-02 18:56:48.000000000 +0000 +++ mc-4.8.11/src/vfs/extfs/Makefile.in 2013-11-29 18:45:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/vfs/extfs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -157,13 +185,14 @@ am__v_CCLD_1 = SOURCES = $(libvfs_extfs_la_SOURCES) DIST_SOURCES = $(libvfs_extfs_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -171,9 +200,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -468,6 +517,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libvfs-extfs.la: $(libvfs_extfs_la_OBJECTS) $(libvfs_extfs_la_DEPENDENCIES) $(EXTRA_libvfs_extfs_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libvfs_extfs_la_OBJECTS) $(libvfs_extfs_la_LIBADD) $(LIBS) @@ -512,14 +562,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -540,31 +589,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -580,12 +611,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -597,15 +623,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -614,9 +636,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -793,24 +816,22 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - clean-noinstLTLIBRARIES cscopelist cscopelist-recursive ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool \ + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/src/vfs/extfs/extfs.c mc-4.8.11/src/vfs/extfs/extfs.c --- mc-4.8.10/src/vfs/extfs/extfs.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/vfs/extfs/extfs.c 2013-10-15 09:52:41.000000000 +0000 @@ -377,7 +377,7 @@ vfs_path_t *local_name_vpath, *name_vpath; local_name_vpath = vfs_path_from_str (archive->local_name); - name_vpath = vfs_path_from_str (archive->local_name); + name_vpath = vfs_path_from_str (archive->name); mc_stat (local_name_vpath, &my); mc_ungetlocalcopy (name_vpath, local_name_vpath, archive->local_stat.st_mtime != my.st_mtime); @@ -449,7 +449,7 @@ current_archive = g_new (struct archive, 1); current_archive->fstype = fstype; - current_archive->name = (name != NULL) ? g_strdup (name) : NULL; + current_archive->name = g_strdup (name); current_archive->local_name = g_strdup (vfs_path_get_last_path_str (local_name_vpath)); if (local_name_vpath != NULL) @@ -690,6 +690,7 @@ if (strcmp (parc->name, archive_name) == 0) { vfs_stamp (&vfs_extfs_ops, (vfsid) parc); + g_free (archive_name); goto return_success; } } diff -Nru mc-4.8.10/src/vfs/extfs/helpers/Makefile.in mc-4.8.11/src/vfs/extfs/helpers/Makefile.in --- mc-4.8.10/src/vfs/extfs/helpers/Makefile.in 2013-08-02 18:56:48.000000000 +0000 +++ mc-4.8.11/src/vfs/extfs/helpers/Makefile.in 2013-11-29 18:45:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,17 +80,17 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/vfs/extfs/helpers -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/a+.in $(srcdir)/apt+.in $(srcdir)/audio.in \ - $(srcdir)/deb.in $(srcdir)/deba.in $(srcdir)/debd.in \ - $(srcdir)/dpkg+.in $(srcdir)/hp48+.in $(srcdir)/iso9660.in \ - $(srcdir)/lslR.in $(srcdir)/mailfs.in $(srcdir)/patchfs.in \ - $(srcdir)/rpms+.in $(srcdir)/s3+.in $(srcdir)/uace.in \ - $(srcdir)/ualz.in $(srcdir)/uar.in $(srcdir)/uarc.in \ - $(srcdir)/uarj.in $(srcdir)/uc1541.in $(srcdir)/ucab.in \ - $(srcdir)/uha.in $(srcdir)/ulha.in $(srcdir)/ulib.in \ - $(srcdir)/urar.in $(srcdir)/uzip.in $(srcdir)/uzoo.in \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs $(srcdir)/a+.in \ + $(srcdir)/apt+.in $(srcdir)/audio.in $(srcdir)/deb.in \ + $(srcdir)/deba.in $(srcdir)/debd.in $(srcdir)/dpkg+.in \ + $(srcdir)/iso9660.in $(srcdir)/hp48+.in $(srcdir)/lslR.in \ + $(srcdir)/mailfs.in $(srcdir)/patchfs.in $(srcdir)/rpms+.in \ + $(srcdir)/s3+.in $(srcdir)/uace.in $(srcdir)/ualz.in \ + $(srcdir)/uar.in $(srcdir)/uarc.in $(srcdir)/uarj.in \ + $(srcdir)/uc1541.in $(srcdir)/ucab.in $(srcdir)/uha.in \ + $(srcdir)/ulha.in $(srcdir)/ulib.in $(srcdir)/urar.in \ + $(srcdir)/uzip.in $(srcdir)/uzoo.in README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -174,6 +202,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(extfs_DATA) $(extfsconf_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -630,11 +659,9 @@ @list='$(extfsconf_DATA)'; test -n "$(extfsconfdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(extfsconfdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -777,17 +804,17 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-extfsDATA \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-extfsDATA \ install-extfsSCRIPTS install-extfsconfDATA install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-extfsDATA \ + tags-am uninstall uninstall-am uninstall-extfsDATA \ uninstall-extfsSCRIPTS uninstall-extfsconfDATA diff -Nru mc-4.8.10/src/vfs/extfs/helpers/iso9660.in mc-4.8.11/src/vfs/extfs/helpers/iso9660.in --- mc-4.8.10/src/vfs/extfs/helpers/iso9660.in 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/vfs/extfs/helpers/iso9660.in 2013-10-15 09:52:41.000000000 +0000 @@ -41,7 +41,7 @@ dir="$2" $XORRISO -dev stdio:"$1" -cd "$dir" -lsl 2> /dev/null | @GREP@ "^[-d]" | \ while read attr ln usr gr sz dt1 dt2 dt3 nm ; do - len=$((${#nm} - 2)) + len=$((${#nm} - 1)) name=$(printf "$nm" | cut -c2-$len) # remove quotes if test $(printf "$nm" | cut -c1-2) != "d"; then printf "%s %s %s %s %s %s %s %s %s/%s\n" "$attr" "$ln" "$usr" "$gr" "$sz" "$dt1" "$dt2" "$dt3" "$dir" "$name" diff -Nru mc-4.8.10/src/vfs/extfs/helpers/rpm mc-4.8.11/src/vfs/extfs/helpers/rpm --- mc-4.8.10/src/vfs/extfs/helpers/rpm 2013-08-02 18:02:40.000000000 +0000 +++ mc-4.8.11/src/vfs/extfs/helpers/rpm 2013-10-15 09:52:41.000000000 +0000 @@ -21,6 +21,15 @@ # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=64007 # Slava Zanko # 2009: Totally rewritten. +# Alexander Chumachenko +# 2013: add dependency version output +# Denis Silakov +# 2013: tar payload support. +# Arkadiusz Miśkiewicz +# 2013: improve support for EPOCH +# add support for PREINPROG/POSTINPROG/PREUNPROG/POSTUNPROG +# add support for VERIFYSCRIPTPROG +# add support for TRIGGERSCRIPTS/TRIGGERSCRIPTPROG # # This file is part of the Midnight Commander. # @@ -94,9 +103,9 @@ "|URL=%{URL}"\ "|EPOCH=%{EPOCH}"\ "|LICENSE=%{LICENSE}"\ -"|REQUIRENAME=%{REQUIRENAME}"\ +"|REQUIRES=%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}"\ "|OBSOLETES=%{OBSOLETES}"\ -"|PROVIDES=%{PROVIDES}"\ +"|PROVIDES=%{PROVIDES} %{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}"\ ${tag_CONFLICTS}\ "|PACKAGER=%{PACKAGER}" \ "${rpm_filename}" @@ -141,12 +150,13 @@ echo "$FILEPREF 0 $DATE INFO/SCRIPTS/PREUN" echo "$FILEPREF 0 $DATE INFO/SCRIPTS/POSTUN" echo "$FILEPREF 0 $DATE INFO/SCRIPTS/VERIFYSCRIPT" + echo "$FILEPREF 0 $DATE INFO/SCRIPTS/TRIGGERSCRIPTS" echo "$FILEPREF 0 $DATE INFO/SCRIPTS/ALL" echo "$FILEPREF 0 $DATE INFO/PACKAGER" echo "$FILEPREF 0 $DATE INFO/URL" echo "$FILEPREF 0 $DATE INFO/EPOCH" echo "$FILEPREF 0 $DATE INFO/LICENSE" - echo "$FILEPREF 0 $DATE INFO/REQUIRENAME" + echo "$FILEPREF 0 $DATE INFO/REQUIRES" echo "$FILEPREF 0 $DATE INFO/OBSOLETES" echo "$FILEPREF 0 $DATE INFO/PROVIDES" echo "$FILEPREF 0 $DATE INFO/CONFLICTS" @@ -160,22 +170,31 @@ mcrpmfs_printOneMetaInfo "INFO/DESCRIPTION" "DESCRIPTION" mcrpmfs_printOneMetaInfo "INFO/SUMMARY" "SUMMARY" - if test "`mcrpmfs_getRawOneTag \"%{RPMTAG_PREIN}%{RPMTAG_POSTIN}%{RPMTAG_PREUN}%{RPMTAG_POSTUN}%{VERIFYSCRIPT}\"`" != "(none)(none)(none)(none)(none)"; then + if test "`mcrpmfs_getRawOneTag \"%{RPMTAG_PREIN}%{RPMTAG_POSTIN}%{RPMTAG_PREUN}%{RPMTAG_POSTUN}%{VERIFYSCRIPT}%{TRIGGERSCRIPTS}\"`" != "(none)(none)(none)(none)(none)(none)"; then mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/PREIN" "RPMTAG_PREIN" "raw" mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/POSTIN" "RPMTAG_POSTIN" "raw" mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/PREUN" "RPMTAG_PREUN" "raw" mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/POSTUN" "RPMTAG_POSTUN" "raw" mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/VERIFYSCRIPT" "VERIFYSCRIPT" "raw" + mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/TRIGGERSCRIPTS" "TRIGGERSCRIPTS" "raw" echo "$FILEPREF 0 $DATE INFO/SCRIPTS/ALL" fi + if test "`mcrpmfs_getRawOneTag \"%{RPMTAG_PREINPROG}%{RPMTAG_POSTINPROG}%{RPMTAG_PREUNPROG}%{RPMTAG_POSTUNPROG}%{VERIFYSCRIPTPROG}%{TRIGGERSCRIPTPROG}\"`" != "(none)(none)(none)(none)(none)(none)"; then + mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/PREINPROG" "RPMTAG_PREINPROG" "raw" + mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/POSTINPROG" "RPMTAG_POSTINPROG" "raw" + mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/PREUNPROG" "RPMTAG_PREUNPROG" "raw" + mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/POSTUNPROG" "RPMTAG_POSTUNPROG" "raw" + mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/VERIFYSCRIPTPROG" "VERIFYSCRIPTPROG" "raw" + mcrpmfs_printOneMetaInfo "INFO/SCRIPTS/TRIGGERSCRIPTPROG" "TRIGGERSCRIPTPROG" "raw" + fi + mcrpmfs_printOneMetaInfo "INFO/PACKAGER" "PACKAGER" mcrpmfs_printOneMetaInfo "INFO/URL" "URL" mcrpmfs_printOneMetaInfo "INFO/EPOCH" "EPOCH" mcrpmfs_printOneMetaInfo "INFO/LICENSE" "LICENSE" - - mcrpmfs_printOneMetaInfo "INFO/REQUIRENAME" "REQUIRENAME" + mcrpmfs_printOneMetaInfo "INFO/REQUIRES" "REQUIRES" mcrpmfs_printOneMetaInfo "INFO/OBSOLETES" "OBSOLETES" mcrpmfs_printOneMetaInfo "INFO/PROVIDES" "PROVIDES" mcrpmfs_printOneMetaInfo "INFO/CONFLICTS" "CONFLICTS" @@ -196,6 +215,7 @@ exit 1 } DATE=`mcrpmfs_getRawOneTag "%{BUILDTIME:date}\n" | cut -c 5-11,21-24` + PAYLOAD=`mcrpmfs_getRawOneTag "%{PAYLOADFORMAT}\n" | sed s/ustar/tar/` HEADERSIZE=`echo "$DESC" | wc -c` printf '%s %s %s HEADER\n' "${FILEPREF}" "${HEADERSIZE}" "${DATE}" @@ -210,7 +230,11 @@ esac echo "dr-xr-xr-x 3 root root 0 $DATE INFO" - echo "$FILEPREF 0 $DATE INFO/NAME-VERSION-RELEASE" + if [ `mcrpmfs_getRawOneTag "%{EPOCH}"` = "(none)" ]; then + echo "$FILEPREF 0 $DATE INFO/NAME-VERSION-RELEASE" + else + echo "$FILEPREF 0 $DATE INFO/NAME-EPOCH:VERSION-RELEASE" + fi echo "$FILEPREF 0 $DATE INFO/GROUP" echo "$FILEPREF 0 $DATE INFO/BUILDHOST" echo "$FILEPREF 0 $DATE INFO/SOURCERPM" @@ -225,7 +249,7 @@ mcrpmfs_list_fastRPM fi - echo "$FILEPREF 0 $DATE CONTENTS.cpio" + echo "$FILEPREF 0 $DATE CONTENTS.$PAYLOAD" } mcrpmfs_copyout () @@ -252,6 +276,10 @@ echo `mcrpmfs_getOneTag "NAME"`-`mcrpmfs_getOneTag "VERSION"`-`mcrpmfs_getOneTag "RELEASE"` > "$2" exit 0 ;; + INFO/NAME-EPOCH:VERSION-RELEASE) + echo `mcrpmfs_getOneTag "NAME"`-`mcrpmfs_getOneTag "EPOCH"`:`mcrpmfs_getOneTag "VERSION"`-`mcrpmfs_getOneTag "RELEASE"` > "$2" + exit 0 + ;; INFO/RELEASE) mcrpmfs_getOneTag "RELEASE" > "$2"; exit 0;; INFO/GROUP) mcrpmfs_getRawOneTag "%{GROUP}\n" > "$2"; exit 0;; INFO/DISTRIBUTION) mcrpmfs_getOneTag "DISTRIBUTION" > "$2"; exit 0;; @@ -265,13 +293,20 @@ INFO/EPOCH) mcrpmfs_getOneTag "EPOCH" >"$2"; exit 0;; INFO/LICENSE) mcrpmfs_getOneTag "LICENSE" >"$2"; exit 0;; INFO/RPMVERSION) mcrpmfs_getRawOneTag "%{RPMVERSION}\n" >"$2"; exit 0;; - INFO/REQUIRENAME) mcrpmfs_getRawOneTag "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" >"$2"; exit 0;; - INFO/PROVIDES) mcrpmfs_getRawOneTag "[%{PROVIDES}\n]" >"$2"; exit 0;; + INFO/REQUIRES) mcrpmfs_getRawOneTag "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" >"$2"; exit 0;; + INFO/PROVIDES) mcrpmfs_getRawOneTag "[%{PROVIDES} %{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}\n]" >"$2"; exit 0;; INFO/SCRIPTS/PREIN) mcrpmfs_getRawOneTag "%{RPMTAG_PREIN}\n" >"$2"; exit 0;; + INFO/SCRIPTS/PREINPROG) mcrpmfs_getRawOneTag "%{RPMTAG_PREINPROG}\n" >"$2"; exit 0;; INFO/SCRIPTS/POSTIN) mcrpmfs_getRawOneTag "%{RPMTAG_POSTIN}\n" >"$2"; exit 0;; + INFO/SCRIPTS/POSTINPROG) mcrpmfs_getRawOneTag "%{RPMTAG_POSTINPROG}\n" >"$2"; exit 0;; INFO/SCRIPTS/PREUN) mcrpmfs_getRawOneTag "%{RPMTAG_PREUN}\n" >"$2"; exit 0;; + INFO/SCRIPTS/PREUNPROG) mcrpmfs_getRawOneTag "%{RPMTAG_PREUNPROG}\n" >"$2"; exit 0;; INFO/SCRIPTS/POSTUN) mcrpmfs_getRawOneTag "%{RPMTAG_POSTUN}\n" >"$2"; exit 0;; + INFO/SCRIPTS/POSTUNPROG) mcrpmfs_getRawOneTag "%{RPMTAG_POSTUNPROG}\n" >"$2"; exit 0;; INFO/SCRIPTS/VERIFYSCRIPT) mcrpmfs_getRawOneTag "%{VERIFYSCRIPT}\n" > "$2"; exit 0;; + INFO/SCRIPTS/VERIFYSCRIPTPROG) mcrpmfs_getRawOneTag "%{VERIFYSCRIPTPROG}\n" > "$2"; exit 0;; + INFO/SCRIPTS/TRIGGERSCRIPTS) $RPM -qp --triggers "${rpm_filename}" > "$2"; exit 0;; + INFO/SCRIPTS/TRIGGERSCRIPTPROG) mcrpmfs_getRawOneTag "%{TRIGGERSCRIPTPROG}\n" > "$2"; exit 0;; INFO/SCRIPTS/ALL) $RPM -qp --scripts "${rpm_filename}" > "$2"; exit 0;; INFO/SUMMARY) mcrpmfs_getRawOneTag "%{SUMMARY}\n" > "$2"; exit 0;; INFO/OS) mcrpmfs_getRawOneTag "%{OS}\n" > "$2"; exit 0;; @@ -279,7 +314,7 @@ INFO/SIZE) mcrpmfs_getRawOneTag "%{SIZE} bytes\n" > "$2"; exit 0;; INFO/OBSOLETES) mcrpmfs_getRawOneTag "[%{OBSOLETENAME} %|OBSOLETEFLAGS?{%{OBSOLETEFLAGS:depflags} %{OBSOLETEVERSION}}:{}|\n]" > "$2"; exit 0;; INFO/CONFLICTS) mcrpmfs_getRawOneTag "[%{CONFLICTNAME} %{CONFLICTFLAGS:depflags} %{CONFLICTVERSION}\n]" >"$2"; exit 0;; - CONTENTS.cpio) $RPM2CPIO "${rpm_filename}" > "$2"; exit 0;; + CONTENTS.*) $RPM2CPIO "${rpm_filename}" > "$2"; exit 0;; *) ;; esac diff -Nru mc-4.8.10/src/vfs/extfs/helpers/ulib.in mc-4.8.11/src/vfs/extfs/helpers/ulib.in --- mc-4.8.10/src/vfs/extfs/helpers/ulib.in 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/vfs/extfs/helpers/ulib.in 2013-11-29 18:27:07.000000000 +0000 @@ -73,7 +73,7 @@ my($module, $fname) = @_; my $tmpdir = $ENV{'TMPDIR'}; - $tmpdir = '/tmp' if ($tmpdir eq ''); + $tmpdir = '/tmp' if (! defined $tmpdir or $tmpdir eq ''); open(PIPE, "$gplib -tq $archive |") || die("Error in: $gplib -tq"); diff -Nru mc-4.8.10/src/vfs/extfs/helpers/urar.in mc-4.8.11/src/vfs/extfs/helpers/urar.in --- mc-4.8.10/src/vfs/extfs/helpers/urar.in 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/vfs/extfs/helpers/urar.in 2013-11-29 18:27:07.000000000 +0000 @@ -4,6 +4,11 @@ # (C) 1996 2:5020/337.13@fidonet.org # Updated by christian.gennerat@alcatel.fr 1999 # Andrew V. Samoilov 2000 +# +# Andrew Borodin +# David Haller +# 2013: support unrar5 +# # beta version 2.0 # # rar and unrar can be found on http://www.rarlabs.com/ @@ -39,18 +44,62 @@ mcrar5fs_list () { - $UNRAR v -c- -cfg- "$1" | @AWK@ -v uid=`id -u` -v gid=`id -g` ' -BEGIN { flag=0 } -/^-----------/ { flag++; if (flag > 1) exit 0; next } -flag==1 { - split($5, a, "-") - if (index($1, "D") != 0) - $1="drwxr-xr-x" - else - if (index($1, ".") != 0) - $1="-rw-r--r--" - printf "%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", $1, uid, gid, $2, a[2], a[1], a[3], $6, $8 -}' + $UNRAR vt -c- -cfg- "$1" | @AWK@ -F ':' -v uid=`id -u` -v gid=`id -g` ' + { + ### remove space after the ":" of the field name + sub ("^ ", "", $2); + } + + $1 ~ / *Name$/ { + ### next file + name = mtime = size = attrs = ""; + delete date; + name = $2; + ### if the name contains ":", append the rest of the fields + if (NF > 2) { + for (i = 3; i <= NF; i++) { + name = name ":" $i; + } + } + } + $1 ~ /^ *mtime$/ { + mtime = $2 ":" $3; + } + $1 ~ /^ *Size$/ { + size = $2; + } + $1 ~ /^ *Attributes$/ { + attrs = $2; + } + + $1 ~ /^ *Compression$/ { + ### file done, using /^$/ is not so good you + ### would have to skip the version stuff first + + ### get date and time + split (mtime, date, " "); + time = date[2]; + ### cut off seconds from the time + sub (",[0-9]*$", "", time); + ### split for reordering of the date in the printf below + split (date[1], date, "-"); + ### mc seems to be able to parse 4 digit years too, so remove if tested + # sub ("^..", "", date[1]); ### cut year to 2 digits only + + ### check/adjust rights + if (index (attrs, "D") != 0) { + attrs = "drwxr-xr-x"; + } else { + if (index (attrs, ".") != 0) { + attrs = "-rw-r--r--"; + } + } + + ### and finally + printf ("%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", + attrs, uid, gid, size, date[2], date[3], date[1], time, name); + } +' } mcrarfs_list () diff -Nru mc-4.8.10/src/vfs/fish/Makefile.in mc-4.8.11/src/vfs/fish/Makefile.in --- mc-4.8.10/src/vfs/fish/Makefile.in 2013-08-02 18:56:49.000000000 +0000 +++ mc-4.8.11/src/vfs/fish/Makefile.in 2013-11-29 18:45:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/vfs/fish -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -157,13 +185,14 @@ am__v_CCLD_1 = SOURCES = $(libvfs_fish_la_SOURCES) DIST_SOURCES = $(libvfs_fish_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -171,9 +200,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -469,6 +518,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libvfs-fish.la: $(libvfs_fish_la_OBJECTS) $(libvfs_fish_la_DEPENDENCIES) $(EXTRA_libvfs_fish_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libvfs_fish_la_OBJECTS) $(libvfs_fish_la_LIBADD) $(LIBS) @@ -513,14 +563,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -541,31 +590,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -581,12 +612,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -598,15 +624,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -615,9 +637,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -794,24 +817,22 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - clean-noinstLTLIBRARIES cscopelist cscopelist-recursive ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool \ + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/src/vfs/fish/fish.c mc-4.8.11/src/vfs/fish/fish.c --- mc-4.8.10/src/vfs/fish/fish.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/vfs/fish/fish.c 2013-11-29 18:27:07.000000000 +0000 @@ -197,6 +197,7 @@ { int code; + /* cppcheck-suppress invalidscanf */ if (sscanf (s, "%d", &code) == 0) { code = 500; @@ -384,12 +385,12 @@ static gboolean fish_info (struct vfs_class *me, struct vfs_s_super *super) { - char buffer[BUF_8K]; if (fish_command (me, super, NONE, SUP->scr_info) == COMPLETE) { while (TRUE) { int res; + char buffer[BUF_8K]; res = vfs_s_get_line_interruptible (me, buffer, sizeof (buffer), SUP->sockr); if ((res == 0) || (res == EINTR)) @@ -809,6 +810,7 @@ case 'D': { struct tm tim; + /* cppcheck-suppress invalidscanf */ if (sscanf (buffer + 1, "%d %d %d %d %d %d", &tim.tm_year, &tim.tm_mon, &tim.tm_mday, &tim.tm_hour, &tim.tm_min, &tim.tm_sec) != 6) break; @@ -818,6 +820,7 @@ case 'E': { int maj, min; + /* cppcheck-suppress invalidscanf */ if (sscanf (buffer + 1, "%d,%d", &maj, &min) != 2) break; #ifdef HAVE_STRUCT_STAT_ST_RDEV diff -Nru mc-4.8.10/src/vfs/fish/helpers/Makefile.in mc-4.8.11/src/vfs/fish/helpers/Makefile.in --- mc-4.8.10/src/vfs/fish/helpers/Makefile.in 2013-08-02 18:56:49.000000000 +0000 +++ mc-4.8.11/src/vfs/fish/helpers/Makefile.in 2013-11-29 18:45:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +80,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/vfs/fish/helpers -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/config/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ @@ -162,6 +190,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(fish_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -476,11 +505,9 @@ @list='$(fish_DATA)'; test -n "$(fishdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(fishdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -621,17 +648,17 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-fishDATA \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-fishDATA \ install-fishSCRIPTS install-html install-html-am install-info \ install-info-am install-man install-pdf install-pdf-am \ install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-fishDATA uninstall-fishSCRIPTS + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-fishDATA uninstall-fishSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/src/vfs/ftpfs/Makefile.in mc-4.8.11/src/vfs/ftpfs/Makefile.in --- mc-4.8.10/src/vfs/ftpfs/Makefile.in 2013-08-02 18:56:50.000000000 +0000 +++ mc-4.8.11/src/vfs/ftpfs/Makefile.in 2013-11-29 18:45:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/vfs/ftpfs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -162,6 +190,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -425,6 +470,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libvfs-ftpfs.la: $(libvfs_ftpfs_la_OBJECTS) $(libvfs_ftpfs_la_DEPENDENCIES) $(EXTRA_libvfs_ftpfs_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libvfs_ftpfs_la_OBJECTS) $(libvfs_ftpfs_la_LIBADD) $(LIBS) @@ -463,26 +509,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -494,15 +529,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -511,9 +542,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -666,9 +698,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -678,7 +710,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/src/vfs/ftpfs/ftpfs.c mc-4.8.11/src/vfs/ftpfs/ftpfs.c --- mc-4.8.10/src/vfs/ftpfs/ftpfs.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/vfs/ftpfs/ftpfs.c 2013-11-29 18:27:07.000000000 +0000 @@ -386,6 +386,7 @@ code = 421; return 4; } + /* cppcheck-suppress invalidscanf */ switch (sscanf (answer, "%d", &code)) { case 0: @@ -405,6 +406,7 @@ code = 421; return 4; } + /* cppcheck-suppress invalidscanf */ if ((sscanf (answer, "%d", &i) > 0) && (code == i) && (answer[3] == ' ')) break; } @@ -697,23 +699,27 @@ ftpfs_load_no_proxy_list (void) { /* FixMe: shouldn't be hardcoded!!! */ - char s[BUF_LARGE]; /* provide for BUF_LARGE characters */ - FILE *npf; - int c; - char *p; static char *mc_file = NULL; mc_file = g_build_filename (mc_global.sysconfig_dir, "mc.no_proxy", (char *) NULL); if (exist_file (mc_file)) { + FILE *npf; + npf = fopen (mc_file, "r"); if (npf != NULL) { + char s[BUF_LARGE]; /* provide for BUF_LARGE characters */ + while (fgets (s, sizeof (s), npf) != NULL) { + char *p; + p = strchr (s, '\n'); if (p == NULL) /* skip bogus entries */ { + int c; + while ((c = fgetc (npf)) != EOF && c != '\n') ; continue; @@ -1089,6 +1095,7 @@ return 0; if (!isdigit ((unsigned char) *c)) return 0; + /* cppcheck-suppress invalidscanf */ if (sscanf (c, "%d,%d,%d,%d,%d,%d", &xa, &xb, &xc, &xd, &xe, &xf) != 6) return 0; @@ -1409,7 +1416,6 @@ struct vfs_s_super *super = FH_SUPER; static unsigned char const ipbuf[3] = { IAC, IP, IAC }; fd_set mask; - char buf[BUF_8K]; int dsock = FH_SOCK; FH_SOCK = -1; SUP->ctl_connection_busy = 0; @@ -1437,6 +1443,8 @@ if (select (dsock + 1, &mask, NULL, NULL, NULL) > 0) { struct timeval start_tim, tim; + char buf[BUF_8K]; + gettimeofday (&start_tim, NULL); /* flush the remaining data */ while (read (dsock, buf, sizeof (buf)) > 0) @@ -1494,7 +1502,7 @@ for (depth = 0; depth < 100; depth++) { /* depth protects against recursive symbolic links */ canonicalize_pathname (tmp); - fe = _get_file_entry (bucket, tmp, 0, 0); + fe = _get_file_entry_t (bucket, tmp, 0, 0); if (fe) { if (S_ISLNK (fe->s.st_mode) && fe->l_stat == 0) @@ -2228,8 +2236,7 @@ { (void) me; - g_slist_foreach (no_proxy, (GFunc) g_free, NULL); - g_slist_free (no_proxy); + g_slist_free_full (no_proxy, g_free); g_free (ftpfs_anonymous_passwd); g_free (ftpfs_proxy_host); @@ -2310,11 +2317,12 @@ static int ftpfs_netrc_bad_mode (const char *netrcname) { - static int be_angry = 1; struct stat mystat; if (stat (netrcname, &mystat) >= 0 && (mystat.st_mode & 077)) { + static int be_angry = 1; + if (be_angry) { message (D_ERROR, MSG_ERROR, @@ -2404,7 +2412,6 @@ char *tmp_pass = NULL; char hostname[MAXHOSTNAMELEN]; const char *domain; - keyword_t keyword; static struct rupcache { struct rupcache *next; @@ -2456,6 +2463,8 @@ /* Scan for keywords following "default" and "machine" */ while (1) { + keyword_t keyword; + int need_break = 0; keyword = ftpfs_netrc_next (); diff -Nru mc-4.8.10/src/vfs/local/Makefile.in mc-4.8.11/src/vfs/local/Makefile.in --- mc-4.8.10/src/vfs/local/Makefile.in 2013-08-02 18:56:50.000000000 +0000 +++ mc-4.8.11/src/vfs/local/Makefile.in 2013-11-29 18:45:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/vfs/local -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -162,6 +190,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -425,6 +470,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libvfs-local.la: $(libvfs_local_la_OBJECTS) $(libvfs_local_la_DEPENDENCIES) $(EXTRA_libvfs_local_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libvfs_local_la_OBJECTS) $(libvfs_local_la_LIBADD) $(LIBS) @@ -463,26 +509,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -494,15 +529,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -511,9 +542,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -666,9 +698,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -678,7 +710,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/src/vfs/sfs/Makefile.in mc-4.8.11/src/vfs/sfs/Makefile.in --- mc-4.8.10/src/vfs/sfs/Makefile.in 2013-08-02 18:56:50.000000000 +0000 +++ mc-4.8.11/src/vfs/sfs/Makefile.in 2013-11-29 18:45:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/vfs/sfs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -162,6 +190,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -425,6 +470,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libvfs-sfs.la: $(libvfs_sfs_la_OBJECTS) $(libvfs_sfs_la_DEPENDENCIES) $(EXTRA_libvfs_sfs_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libvfs_sfs_la_OBJECTS) $(libvfs_sfs_la_LIBADD) $(LIBS) @@ -463,26 +509,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -494,15 +529,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -511,9 +542,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -666,9 +698,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -678,7 +710,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/src/vfs/sfs/sfs.c mc-4.8.11/src/vfs/sfs/sfs.c --- mc-4.8.10/src/vfs/sfs/sfs.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/vfs/sfs/sfs.c 2013-11-29 18:27:07.000000000 +0000 @@ -129,7 +129,7 @@ char pad[10240]; char *s_iter, *t = pad; int was_percent = 0; - vfs_path_t *pname, *s; /* name of parent archive */ + vfs_path_t *pname; /* name of parent archive */ char *pqname; /* name of parent archive, quoted */ const vfs_path_element_t *path_element; @@ -150,6 +150,8 @@ /* if ((sfs_flags[w] & F_2) || (!inpath) || (!*inpath)); else return -1; */ if ((sfs_flags[w] & F_NOLOCALCOPY) == 0) { + vfs_path_t *s; + s = mc_getlocalcopy (pname); if (s == NULL) { diff -Nru mc-4.8.10/src/vfs/sftpfs/Makefile.in mc-4.8.11/src/vfs/sftpfs/Makefile.in --- mc-4.8.10/src/vfs/sftpfs/Makefile.in 2013-08-02 18:56:51.000000000 +0000 +++ mc-4.8.11/src/vfs/sftpfs/Makefile.in 2013-11-29 18:45:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/vfs/sftpfs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -163,6 +191,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -433,6 +478,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libvfs-sftpfs.la: $(libvfs_sftpfs_la_OBJECTS) $(libvfs_sftpfs_la_DEPENDENCIES) $(EXTRA_libvfs_sftpfs_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libvfs_sftpfs_la_OBJECTS) $(libvfs_sftpfs_la_LIBADD) $(LIBS) @@ -478,26 +524,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -509,15 +544,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -526,9 +557,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -681,9 +713,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -693,7 +725,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/src/vfs/sftpfs/config_parcer.c mc-4.8.11/src/vfs/sftpfs/config_parcer.c --- mc-4.8.10/src/vfs/sftpfs/config_parcer.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/vfs/sftpfs/config_parcer.c 2013-11-29 18:27:07.000000000 +0000 @@ -210,7 +210,7 @@ gboolean pattern_block_hit = FALSE; mc_search_t *host_regexp; - host_regexp = mc_search_new ("^\\s*host\\s+(.*)$", -1); + host_regexp = mc_search_new ("^\\s*host\\s+(.*)$", -1, DEFAULT_CHARSET); host_regexp->search_type = MC_SEARCH_T_REGEX; host_regexp->is_case_sensitive = FALSE; @@ -253,8 +253,7 @@ { mc_search_t *pattern_regexp; - pattern_block_hit = FALSE; - pattern_regexp = mc_search_new (host_pattern, -1); + pattern_regexp = mc_search_new (host_pattern, -1, DEFAULT_CHARSET); pattern_regexp->search_type = MC_SEARCH_T_GLOB; pattern_regexp->is_case_sensitive = FALSE; pattern_regexp->is_entire_line = TRUE; @@ -397,7 +396,8 @@ for (i = 0; config_variables[i].pattern != NULL; i++) { - config_variables[i].pattern_regexp = mc_search_new (config_variables[i].pattern, -1); + config_variables[i].pattern_regexp = + mc_search_new (config_variables[i].pattern, -1, DEFAULT_CHARSET); config_variables[i].pattern_regexp->search_type = MC_SEARCH_T_REGEX; config_variables[i].pattern_regexp->is_case_sensitive = FALSE; config_variables[i].offset = structure_offsets[i]; diff -Nru mc-4.8.10/src/vfs/sftpfs/file.c mc-4.8.11/src/vfs/sftpfs/file.c --- mc-4.8.10/src/vfs/sftpfs/file.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/vfs/sftpfs/file.c 2013-11-29 18:27:07.000000000 +0000 @@ -133,6 +133,7 @@ { sftpfs_ssherror_to_gliberror (super_data, libssh_errno, error); g_free (name); + g_free (file_handler_data); return FALSE; } } diff -Nru mc-4.8.10/src/vfs/smbfs/Makefile.in mc-4.8.11/src/vfs/smbfs/Makefile.in --- mc-4.8.10/src/vfs/smbfs/Makefile.in 2013-08-02 18:56:51.000000000 +0000 +++ mc-4.8.11/src/vfs/smbfs/Makefile.in 2013-11-29 18:45:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/vfs/smbfs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -157,13 +185,14 @@ am__v_CCLD_1 = SOURCES = $(libvfs_smbfs_la_SOURCES) DIST_SOURCES = $(libvfs_smbfs_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -171,9 +200,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -515,6 +564,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libvfs-smbfs.la: $(libvfs_smbfs_la_OBJECTS) $(libvfs_smbfs_la_DEPENDENCIES) $(EXTRA_libvfs_smbfs_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libvfs_smbfs_la_OBJECTS) $(libvfs_smbfs_la_LIBADD) $(LIBS) @@ -559,14 +609,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -587,31 +636,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -627,12 +658,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -644,15 +670,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -661,9 +683,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -843,25 +866,23 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - clean-local clean-noinstLTLIBRARIES cscopelist \ - cscopelist-recursive ctags ctags-recursive dist-hook distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-local distclean-tags distdir dvi dvi-am html html-am \ - info info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool clean-local \ + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am dist-hook \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-local distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + mostlyclean-local pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am dist-hook: diff -Nru mc-4.8.10/src/vfs/smbfs/helpers/include/stamp-h.in mc-4.8.11/src/vfs/smbfs/helpers/include/stamp-h.in --- mc-4.8.10/src/vfs/smbfs/helpers/include/stamp-h.in 2013-08-02 18:56:56.000000000 +0000 +++ mc-4.8.11/src/vfs/smbfs/helpers/include/stamp-h.in 2013-11-29 18:45:52.000000000 +0000 @@ -1 +1 @@ -Пт. авг. 2 18:56:56 UTC 2013 +Пт ноя 29 18:45:52 UTC 2013 diff -Nru mc-4.8.10/src/vfs/smbfs/helpers/lib/system.c mc-4.8.11/src/vfs/smbfs/helpers/lib/system.c --- mc-4.8.10/src/vfs/smbfs/helpers/lib/system.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/vfs/smbfs/helpers/lib/system.c 2013-11-29 18:27:07.000000000 +0000 @@ -103,6 +103,7 @@ #else /* !NO_SELECT */ int sys_select (int maxfd, fd_set * fds, struct timeval *tval) +/* cppcheck-suppress syntaxError */ { #ifdef USE_POLL struct pollfd pfd[256]; diff -Nru mc-4.8.10/src/vfs/smbfs/helpers/lib/util.c mc-4.8.11/src/vfs/smbfs/helpers/lib/util.c --- mc-4.8.10/src/vfs/smbfs/helpers/lib/util.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/vfs/smbfs/helpers/lib/util.c 2013-11-29 18:27:07.000000000 +0000 @@ -1829,6 +1829,7 @@ struct hostent *hp; pstring hostname; + /* cppcheck-suppress uninitvar */ *hostname = 0; /* get my host name */ diff -Nru mc-4.8.10/src/vfs/tar/Makefile.in mc-4.8.11/src/vfs/tar/Makefile.in --- mc-4.8.10/src/vfs/tar/Makefile.in 2013-08-02 18:56:52.000000000 +0000 +++ mc-4.8.11/src/vfs/tar/Makefile.in 2013-11-29 18:45:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/vfs/tar -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -162,6 +190,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -425,6 +470,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libvfs-tar.la: $(libvfs_tar_la_OBJECTS) $(libvfs_tar_la_DEPENDENCIES) $(EXTRA_libvfs_tar_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libvfs_tar_la_OBJECTS) $(libvfs_tar_la_LIBADD) $(LIBS) @@ -463,26 +509,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -494,15 +529,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -511,9 +542,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -666,9 +698,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -678,7 +710,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/src/vfs/tar/tar.c mc-4.8.11/src/vfs/tar/tar.c --- mc-4.8.10/src/vfs/tar/tar.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/vfs/tar/tar.c 2013-11-29 18:27:07.000000000 +0000 @@ -146,16 +146,12 @@ struct sparse { + /* cppcheck-suppress unusedStructMember */ char offset[12]; + /* cppcheck-suppress unusedStructMember */ char numbytes[12]; }; -struct sp_array -{ - int offset; - int numbytes; -}; - union record { char charptr[RECORDSIZE]; @@ -190,11 +186,15 @@ { char atime[12]; char ctime[12]; + /* cppcheck-suppress unusedStructMember */ char offset[12]; + /* cppcheck-suppress unusedStructMember */ char longnames[4]; + /* cppcheck-suppress unusedStructMember */ char pad; struct sparse sp[SPARSE_IN_HDR]; char isextended; + /* cppcheck-suppress unusedStructMember */ char realsize[12]; /* true size of the sparse file */ } oldgnu; } unused; @@ -754,7 +754,6 @@ { /* Initial status at start of archive */ ReadStatus status = STATUS_EOFMARK; - ReadStatus prev_status; int tard; current_tar_position = 0; @@ -766,8 +765,8 @@ while (TRUE) { size_t h_size; + ReadStatus prev_status = status; - prev_status = status; status = tar_read_header (vpath_element->class, archive, tard, &h_size); switch (status) diff -Nru mc-4.8.10/src/vfs/undelfs/Makefile.in mc-4.8.11/src/vfs/undelfs/Makefile.in --- mc-4.8.10/src/vfs/undelfs/Makefile.in 2013-08-02 18:56:52.000000000 +0000 +++ mc-4.8.11/src/vfs/undelfs/Makefile.in 2013-11-29 18:45:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/vfs/undelfs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -162,6 +190,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -425,6 +470,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libvfs-undelfs.la: $(libvfs_undelfs_la_OBJECTS) $(libvfs_undelfs_la_DEPENDENCIES) $(EXTRA_libvfs_undelfs_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libvfs_undelfs_la_OBJECTS) $(libvfs_undelfs_la_LIBADD) $(LIBS) @@ -463,26 +509,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -494,15 +529,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -511,9 +542,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -666,9 +698,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -678,7 +710,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/src/vfs/undelfs/undelfs.c mc-4.8.11/src/vfs/undelfs/undelfs.c --- mc-4.8.10/src/vfs/undelfs/undelfs.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/vfs/undelfs/undelfs.c 2013-11-29 18:27:07.000000000 +0000 @@ -342,13 +342,16 @@ static void * undelfs_opendir (const vfs_path_t * vpath) { - char *file, *f; + char *file, *f = NULL; const vfs_path_element_t *path_element; path_element = vfs_path_get_by_index (vpath, -1); undelfs_get_path (vpath, &file, &f); - if (!file) + if (file == NULL) + { + g_free (f); return 0; + } /* We don't use the file name */ g_free (f); @@ -437,7 +440,7 @@ static void * undelfs_open (const vfs_path_t * vpath, int flags, mode_t mode) { - char *file, *f; + char *file, *f = NULL; ext2_ino_t inode, i; undelfs_file *p = NULL; (void) flags; @@ -445,8 +448,11 @@ /* Only allow reads on this file system */ undelfs_get_path (vpath, &file, &f); - if (!file) + if (file == NULL) + { + g_free (f); return 0; + } if (!ext2_fname || strcmp (ext2_fname, file)) { @@ -645,11 +651,14 @@ undelfs_lstat (const vfs_path_t * vpath, struct stat *buf) { int inode_index; - char *file, *f; + char *file, *f = NULL; undelfs_get_path (vpath, &file, &f); - if (!file) + if (file == NULL) + { + g_free (f); return 0; + } /* When called from save_cwd_stats we get an incorrect file and f here: e.g. incorrect correct @@ -696,12 +705,15 @@ static int undelfs_chdir (const vfs_path_t * vpath) { - char *file, *f; + char *file, *f = NULL; int fd; undelfs_get_path (vpath, &file, &f); - if (!file) - return -1; + if (file == NULL) + { + g_free (f); + return (-1); + } /* We may use access because ext2 file systems are local */ /* this could be fixed by making an ext2fs io manager to use */ @@ -738,15 +750,16 @@ static vfsid undelfs_getid (const vfs_path_t * vpath) { - char *fname, *fsname; + char *fname = NULL, *fsname; + gboolean ok; undelfs_get_path (vpath, &fsname, &fname); + ok = fsname != NULL; - if (!fsname) - return NULL; g_free (fname); g_free (fsname); - return (vfsid) fs; + + return ok ? (vfsid) fs : NULL; } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.10/src/viewer/Makefile.in mc-4.8.11/src/viewer/Makefile.in --- mc-4.8.10/src/viewer/Makefile.in 2013-08-02 18:56:52.000000000 +0000 +++ mc-4.8.11/src/viewer/Makefile.in 2013-11-29 18:45:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,9 +79,9 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/viewer -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -164,6 +192,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -443,6 +488,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libmcviewer.la: $(libmcviewer_la_OBJECTS) $(libmcviewer_la_DEPENDENCIES) $(EXTRA_libmcviewer_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libmcviewer_la_OBJECTS) $(libmcviewer_la_LIBADD) $(LIBS) @@ -493,26 +539,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -524,15 +559,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -541,9 +572,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -696,9 +728,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -708,7 +740,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/src/viewer/actions_cmd.c mc-4.8.11/src/viewer/actions_cmd.c --- mc-4.8.10/src/viewer/actions_cmd.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/viewer/actions_cmd.c 2013-11-29 18:27:07.000000000 +0000 @@ -143,10 +143,13 @@ { view->last_search_string = (gchar *) g_strdup (history->data); history = g_list_first (history); - g_list_foreach (history, (GFunc) g_free, NULL); - g_list_free (history); + g_list_free_full (history, g_free); - view->search = mc_search_new (view->last_search_string, -1); +#ifdef HAVE_CHARSET + view->search = mc_search_new (view->last_search_string, -1, cp_source); +#else + view->search = mc_search_new (view->last_search_string, -1, NULL); +#endif view->search_nroff_seq = mcview_nroff_seq_new (view); if (view->search == NULL) @@ -159,7 +162,9 @@ else { view->search->search_type = mcview_search_options.type; +#ifdef HAVE_CHARSET view->search->is_all_charsets = mcview_search_options.all_codepages; +#endif view->search->is_case_sensitive = mcview_search_options.case_sens; view->search->whole_words = mcview_search_options.whole_words; view->search->search_fn = mcview_search_cmd_callback; @@ -286,7 +291,6 @@ { /* get file list from current panel. Update it each time */ view->dir = ¤t_panel->dir; - view->dir_count = ¤t_panel->count; view->dir_idx = ¤t_panel->selected; } else if (view->dir == NULL) @@ -299,22 +303,21 @@ const char *fname; size_t fname_len; int i; + dir_sort_options_t sort_op = { FALSE, TRUE, FALSE }; /* load directory where requested file is */ view->dir = g_new0 (dir_list, 1); - view->dir_count = g_new (int, 1); view->dir_idx = g_new (int, 1); - *view->dir_count = do_load_dir (view->workdir_vpath, view->dir, (sortfn *) sort_name, FALSE, - TRUE, FALSE, NULL); + dir_list_load (view->dir, view->workdir_vpath, (GCompareFunc) sort_name, &sort_op, NULL); fname = x_basename (vfs_path_as_str (view->filename_vpath)); fname_len = strlen (fname); /* search current file in the list */ - for (i = 0; i != *view->dir_count; i++) + for (i = 0; i != view->dir->len; i++) { - const file_entry *fe = &view->dir->list[i]; + const file_entry_t *fe = &view->dir->list[i]; if (fname_len == fe->fnamelen && strncmp (fname, fe->fname, fname_len) == 0) break; @@ -334,8 +337,8 @@ for (i = *view->dir_idx + direction; i != *view->dir_idx; i += direction) { if (i < 0) - i = *view->dir_count - 1; - if (i == *view->dir_count) + i = view->dir->len - 1; + if (i == view->dir->len) i = 0; if (!S_ISDIR (view->dir->list[i].st.st_mode)) break; @@ -350,7 +353,7 @@ mcview_load_next_prev (mcview_t * view, int direction) { dir_list *dir; - int *dir_count, *dir_idx; + int *dir_idx; vfs_path_t *vfile; vfs_path_t *ext_script = NULL; @@ -359,10 +362,8 @@ /* reinit view */ dir = view->dir; - dir_count = view->dir_count; dir_idx = view->dir_idx; view->dir = NULL; - view->dir_count = NULL; view->dir_idx = NULL; vfile = vfs_path_append_new (view->workdir_vpath, dir->list[*dir_idx].fname, (char *) NULL); mcview_done (view); @@ -372,7 +373,6 @@ mcview_load (view, NULL, vfs_path_as_str (vfile), 0); vfs_path_free (vfile); view->dir = dir; - view->dir_count = dir_count; view->dir_idx = dir_idx; view->ext_script = ext_script; diff -Nru mc-4.8.10/src/viewer/coord_cache.c mc-4.8.11/src/viewer/coord_cache.c --- mc-4.8.10/src/viewer/coord_cache.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/viewer/coord_cache.c 2013-11-29 18:27:07.000000000 +0000 @@ -50,7 +50,7 @@ #include -#include /* for g_memmove() */ +#include /* memmove() */ #ifdef MC_ENABLE_DEBUGGING_CODE #include /* uintmax_t */ #endif @@ -93,8 +93,8 @@ /* insert new entry */ if (pos != cache->size) - g_memmove (cache->cache[pos + 1], cache->cache[pos], - (cache->size - pos) * sizeof (coord_cache_entry_t *)); + memmove (cache->cache[pos + 1], cache->cache[pos], + (cache->size - pos) * sizeof (coord_cache_entry_t *)); cache->cache[pos] = g_memdup (entry, sizeof (coord_cache_entry_t)); cache->size++; } diff -Nru mc-4.8.10/src/viewer/dialogs.c mc-4.8.11/src/viewer/dialogs.c --- mc-4.8.10/src/viewer/dialogs.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/viewer/dialogs.c 2013-10-15 09:52:41.000000000 +0000 @@ -142,12 +142,18 @@ mcview_nroff_seq_free (&view->search_nroff_seq); mc_search_free (view->search); - view->search = mc_search_new (view->last_search_string, -1); +#ifdef HAVE_CHARSET + view->search = mc_search_new (view->last_search_string, -1, cp_source); +#else + view->search = mc_search_new (view->last_search_string, -1, NULL); +#endif view->search_nroff_seq = mcview_nroff_seq_new (view); if (view->search != NULL) { view->search->search_type = mcview_search_options.type; +#ifdef HAVE_CHARSET view->search->is_all_charsets = mcview_search_options.all_codepages; +#endif view->search->is_case_sensitive = mcview_search_options.case_sens; view->search->whole_words = mcview_search_options.whole_words; view->search->search_fn = mcview_search_cmd_callback; diff -Nru mc-4.8.10/src/viewer/display.c mc-4.8.11/src/viewer/display.c --- mc-4.8.10/src/viewer/display.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/viewer/display.c 2013-11-29 18:27:07.000000000 +0000 @@ -148,13 +148,13 @@ if (width > 40) { - char buffer[BUF_TRUNC_LEN + 1]; - widget_move (view, top, width - 32); if (view->hex_mode) tty_printf ("0x%08" PRIxMAX, (uintmax_t) view->hex_cursor); else { + char buffer[BUF_TRUNC_LEN + 1]; + size_trunc_len (buffer, BUF_TRUNC_LEN, mcview_get_filesize (view), 0, panels_options.kilobyte_si); tty_printf ("%9" PRIuMAX "/%s%s %s", (uintmax_t) view->dpy_end, diff -Nru mc-4.8.10/src/viewer/growbuf.c mc-4.8.11/src/viewer/growbuf.c --- mc-4.8.10/src/viewer/growbuf.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/viewer/growbuf.c 2013-11-29 18:27:07.000000000 +0000 @@ -113,8 +113,6 @@ mcview_growbuf_read_until (mcview_t * view, off_t ofs) { ssize_t nread; - byte *p; - size_t bytesfree; gboolean short_read; #ifdef HAVE_ASSERT_H @@ -127,6 +125,9 @@ short_read = FALSE; while (mcview_growbuf_filesize (view) < ofs || short_read) { + byte *p; + size_t bytesfree; + if (view->growbuf_lastindex == VIEW_PAGE_SIZE) { /* Append a new block to the growing buffer */ diff -Nru mc-4.8.10/src/viewer/hex.c mc-4.8.11/src/viewer/hex.c --- mc-4.8.10/src/viewer/hex.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/src/viewer/hex.c 2013-11-29 18:27:07.000000000 +0000 @@ -3,7 +3,7 @@ Function for hex view Copyright (C) 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005, 2006, 2007, 2009, 2011 + 2004, 2005, 2006, 2007, 2009, 2011, 2013 The Free Software Foundation, Inc. Written by: @@ -14,7 +14,7 @@ Norbert Warmuth, 1997 Pavel Machek, 1998 Roland Illig , 2004, 2005 - Slava Zanko , 2009 + Slava Zanko , 2009, 2013 Andrew Borodin , 2009 Ilia Maslakov , 2009 @@ -111,6 +111,22 @@ #endif /* HAVE_CHARSET */ /* --------------------------------------------------------------------------------------------- */ +/** Determine the state of the current byte. + * + * @param view viewer object + * @param from offset + * @param curr current node + */ + +static mark_t +mcview_hex_calculate_boldflag (mcview_t * view, off_t from, struct hexedit_change_node *curr) +{ + return (from == view->hex_cursor) ? MARK_CURSOR + : (curr != NULL && from == curr->offset) ? MARK_CHANGED + : (view->search_start <= from && from < view->search_end) ? MARK_SELECTED : MARK_NORMAL; +} + +/* --------------------------------------------------------------------------------------------- */ /*** public functions ****************************************************************************/ /* --------------------------------------------------------------------------------------------- */ @@ -129,7 +145,7 @@ * text column. */ - screen_dimen row, col; + screen_dimen row; off_t from; int c; mark_t boldflag = MARK_NORMAL; @@ -152,7 +168,9 @@ for (row = 0; mcview_get_byte (view, from, NULL) == TRUE && row < height; row++) { + screen_dimen col = 0; size_t i; + col = 0; /* Print the hex offset */ @@ -173,17 +191,22 @@ #ifdef HAVE_CHARSET if (view->utf8) { - char corr_buf[6 + 1]; - int cnt, cw = 1; + int cw = 1; gboolean read_res = TRUE; + ch = mcview_get_utf (view, from, &cw, &read_res); if (!read_res) break; /* char width is greater 0 bytes */ if (cw != 0) { + int cnt; + char corr_buf[UTF8_CHAR_LEN + 1]; struct hexedit_change_node *corr = curr; - int res = g_unichar_to_utf8 (ch, (char *) corr_buf); + int res; + + res = g_unichar_to_utf8 (ch, (char *) corr_buf); + for (cnt = 0; cnt < cw; cnt++) { if (curr != NULL && from + cnt == curr->offset) @@ -211,11 +234,7 @@ } /* Determine the state of the current byte */ - boldflag = - (from == view->hex_cursor) ? MARK_CURSOR - : (curr != NULL && from == curr->offset) ? MARK_CHANGED - : (view->search_start <= from && - from < view->search_end) ? MARK_SELECTED : MARK_NORMAL; + boldflag = mcview_hex_calculate_boldflag (view, from, curr); /* Determine the value of the current byte */ if (curr != NULL && from == curr->offset) diff -Nru mc-4.8.10/src/viewer/internal.h mc-4.8.11/src/viewer/internal.h --- mc-4.8.10/src/viewer/internal.h 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/viewer/internal.h 2013-11-29 18:27:07.000000000 +0000 @@ -184,10 +184,8 @@ dir_list *dir; /* List of current directory files * to handle CK_FileNext and CK_FilePrev commands */ - int *dir_count; /* Number of files in dir structure. - * Pointer is used here as reference to WPanel::count */ int *dir_idx; /* Index of current file in dir structure. - * Pointer is used here as reference to WPanel::count */ + * Pointer is used here as reference to WPanel::dir::count */ vfs_path_t *ext_script; /* Temporary script file created by regex_command_for() */ }; diff -Nru mc-4.8.10/src/viewer/lib.c mc-4.8.11/src/viewer/lib.c --- mc-4.8.10/src/viewer/lib.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/viewer/lib.c 2013-10-15 09:52:41.000000000 +0000 @@ -78,7 +78,7 @@ { char *command; dir_list *dir; - int *dir_count, *dir_idx; + int *dir_idx; mcview_altered_magic_flag = 1; view->magic_mode = !view->magic_mode; @@ -86,16 +86,13 @@ /* reinit view */ command = g_strdup (view->command); dir = view->dir; - dir_count = view->dir_count; dir_idx = view->dir_idx; view->dir = NULL; - view->dir_count = NULL; view->dir_idx = NULL; mcview_done (view); mcview_init (view); mcview_load (view, command, vfs_path_as_str (view->filename_vpath), 0); view->dir = dir; - view->dir_count = dir_count; view->dir_idx = dir_idx; g_free (command); @@ -253,9 +250,8 @@ if (mc_global.mc_run_mode == MC_RUN_VIEWER && view->dir != NULL) { /* mcviewer is the owner of file list */ - clean_dir (view->dir, *view->dir_count); + dir_list_clean (view->dir); g_free (view->dir->list); - g_free (view->dir_count); g_free (view->dir_idx); g_free (view->dir); } diff -Nru mc-4.8.10/src/viewer/mcviewer.c mc-4.8.11/src/viewer/mcviewer.c --- mc-4.8.10/src/viewer/mcviewer.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/src/viewer/mcviewer.c 2013-11-29 18:27:07.000000000 +0000 @@ -310,7 +310,7 @@ retval = mcview_load_command_output (view, command); else if (file != NULL && file[0] != '\0') { - int fd = -1; + int fd; char tmp[BUF_MEDIUM]; struct stat st; diff -Nru mc-4.8.10/tests/Makefile.in mc-4.8.11/tests/Makefile.in --- mc-4.8.10/tests/Makefile.in 2013-08-02 18:56:52.000000000 +0000 +++ mc-4.8.11/tests/Makefile.in 2013-11-29 18:45:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = tests -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/config/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ @@ -125,13 +153,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -139,9 +168,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -429,14 +478,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -457,31 +505,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -497,12 +527,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -514,15 +539,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -531,9 +552,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -705,23 +727,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/tests/lib/Makefile.in mc-4.8.11/tests/lib/Makefile.in --- mc-4.8.10/tests/lib/Makefile.in 2013-08-02 18:56:53.000000000 +0000 +++ mc-4.8.11/tests/lib/Makefile.in 2013-11-29 18:45:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,9 +84,9 @@ utilunix__my_system_fork_child$(EXEEXT) x_basename$(EXEEXT) check_PROGRAMS = $(am__EXEEXT_1) subdir = tests/lib -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp $(top_srcdir)/config/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -201,13 +229,14 @@ $(serialize_SOURCES) $(utilunix__my_system_fork_child_SOURCES) \ $(utilunix__my_system_fork_child_shell_SOURCES) \ $(utilunix__my_system_fork_fail_SOURCES) $(x_basename_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -215,15 +244,234 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + check recheck distdir +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no -am__tty_colors = $(am__tty_colors_dummy) +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ @@ -492,7 +740,7 @@ all: all-recursive .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -532,27 +780,35 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + library_independ$(EXEEXT): $(library_independ_OBJECTS) $(library_independ_DEPENDENCIES) $(EXTRA_library_independ_DEPENDENCIES) @rm -f library_independ$(EXEEXT) $(AM_V_CCLD)$(LINK) $(library_independ_OBJECTS) $(library_independ_LDADD) $(LIBS) + mc_build_filename$(EXEEXT): $(mc_build_filename_OBJECTS) $(mc_build_filename_DEPENDENCIES) $(EXTRA_mc_build_filename_DEPENDENCIES) @rm -f mc_build_filename$(EXEEXT) $(AM_V_CCLD)$(LINK) $(mc_build_filename_OBJECTS) $(mc_build_filename_LDADD) $(LIBS) + name_quote$(EXEEXT): $(name_quote_OBJECTS) $(name_quote_DEPENDENCIES) $(EXTRA_name_quote_DEPENDENCIES) @rm -f name_quote$(EXEEXT) $(AM_V_CCLD)$(LINK) $(name_quote_OBJECTS) $(name_quote_LDADD) $(LIBS) + serialize$(EXEEXT): $(serialize_OBJECTS) $(serialize_DEPENDENCIES) $(EXTRA_serialize_DEPENDENCIES) @rm -f serialize$(EXEEXT) $(AM_V_CCLD)$(LINK) $(serialize_OBJECTS) $(serialize_LDADD) $(LIBS) + utilunix__my_system_fork_child$(EXEEXT): $(utilunix__my_system_fork_child_OBJECTS) $(utilunix__my_system_fork_child_DEPENDENCIES) $(EXTRA_utilunix__my_system_fork_child_DEPENDENCIES) @rm -f utilunix__my_system_fork_child$(EXEEXT) $(AM_V_CCLD)$(LINK) $(utilunix__my_system_fork_child_OBJECTS) $(utilunix__my_system_fork_child_LDADD) $(LIBS) + utilunix__my_system_fork_child_shell$(EXEEXT): $(utilunix__my_system_fork_child_shell_OBJECTS) $(utilunix__my_system_fork_child_shell_DEPENDENCIES) $(EXTRA_utilunix__my_system_fork_child_shell_DEPENDENCIES) @rm -f utilunix__my_system_fork_child_shell$(EXEEXT) $(AM_V_CCLD)$(LINK) $(utilunix__my_system_fork_child_shell_OBJECTS) $(utilunix__my_system_fork_child_shell_LDADD) $(LIBS) + utilunix__my_system_fork_fail$(EXEEXT): $(utilunix__my_system_fork_fail_OBJECTS) $(utilunix__my_system_fork_fail_DEPENDENCIES) $(EXTRA_utilunix__my_system_fork_fail_DEPENDENCIES) @rm -f utilunix__my_system_fork_fail$(EXEEXT) $(AM_V_CCLD)$(LINK) $(utilunix__my_system_fork_fail_OBJECTS) $(utilunix__my_system_fork_fail_LDADD) $(LIBS) + x_basename$(EXEEXT): $(x_basename_OBJECTS) $(x_basename_DEPENDENCIES) $(EXTRA_x_basename_DEPENDENCIES) @rm -f x_basename$(EXEEXT) $(AM_V_CCLD)$(LINK) $(x_basename_OBJECTS) $(x_basename_LDADD) $(LIBS) @@ -605,14 +861,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -633,31 +888,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -673,12 +910,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -690,15 +922,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -707,9 +935,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -725,98 +954,217 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +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) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +library_independ.log: library_independ$(EXEEXT) + @p='library_independ$(EXEEXT)'; \ + b='library_independ'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +mc_build_filename.log: mc_build_filename$(EXEEXT) + @p='mc_build_filename$(EXEEXT)'; \ + b='mc_build_filename'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +name_quote.log: name_quote$(EXEEXT) + @p='name_quote$(EXEEXT)'; \ + b='name_quote'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +serialize.log: serialize$(EXEEXT) + @p='serialize$(EXEEXT)'; \ + b='serialize'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +utilunix__my_system_fork_fail.log: utilunix__my_system_fork_fail$(EXEEXT) + @p='utilunix__my_system_fork_fail$(EXEEXT)'; \ + b='utilunix__my_system_fork_fail'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +utilunix__my_system_fork_child_shell.log: utilunix__my_system_fork_child_shell$(EXEEXT) + @p='utilunix__my_system_fork_child_shell$(EXEEXT)'; \ + b='utilunix__my_system_fork_child_shell'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +utilunix__my_system_fork_child.log: utilunix__my_system_fork_child$(EXEEXT) + @p='utilunix__my_system_fork_child$(EXEEXT)'; \ + b='utilunix__my_system_fork_child'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +x_basename.log: x_basename$(EXEEXT) + @p='x_basename$(EXEEXT)'; \ + b='x_basename'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@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) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -900,6 +1248,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -981,14 +1332,11 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool cscopelist \ - cscopelist-recursive ctags ctags-recursive distclean \ +.MAKE: $(am__recursive_targets) check-am install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-TESTS check-am clean clean-checkPROGRAMS clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ @@ -998,7 +1346,7 @@ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \ uninstall uninstall-am diff -Nru mc-4.8.10/tests/lib/mcconfig/Makefile.in mc-4.8.11/tests/lib/mcconfig/Makefile.in --- mc-4.8.10/tests/lib/mcconfig/Makefile.in 2013-08-02 18:56:53.000000000 +0000 +++ mc-4.8.11/tests/lib/mcconfig/Makefile.in 2013-11-29 18:45:51.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,9 +80,9 @@ TESTS = config_string$(EXEEXT) user_configs_path$(EXEEXT) check_PROGRAMS = $(am__EXEEXT_1) subdir = tests/lib/mcconfig -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp $(top_srcdir)/config/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -166,12 +194,229 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no -am__tty_colors = $(am__tty_colors_dummy) +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -399,7 +644,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -439,9 +684,11 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + config_string$(EXEEXT): $(config_string_OBJECTS) $(config_string_DEPENDENCIES) $(EXTRA_config_string_DEPENDENCIES) @rm -f config_string$(EXEEXT) $(AM_V_CCLD)$(LINK) $(config_string_OBJECTS) $(config_string_LDADD) $(LIBS) + user_configs_path$(EXEEXT): $(user_configs_path_OBJECTS) $(user_configs_path_DEPENDENCIES) $(EXTRA_user_configs_path_DEPENDENCIES) @rm -f user_configs_path$(EXEEXT) $(AM_V_CCLD)$(LINK) $(user_configs_path_OBJECTS) $(user_configs_path_LDADD) $(LIBS) @@ -482,26 +729,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -513,15 +749,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -530,9 +762,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -548,98 +781,175 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +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) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +config_string.log: config_string$(EXEEXT) + @p='config_string$(EXEEXT)'; \ + b='config_string'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +user_configs_path.log: user_configs_path$(EXEEXT) + @p='user_configs_path$(EXEEXT)'; \ + b='user_configs_path'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@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) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -697,6 +1007,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -780,9 +1093,9 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool cscopelist \ - ctags distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -792,7 +1105,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + recheck tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/tests/lib/search/Makefile.in mc-4.8.11/tests/lib/search/Makefile.in --- mc-4.8.10/tests/lib/search/Makefile.in 2013-08-02 18:56:54.000000000 +0000 +++ mc-4.8.11/tests/lib/search/Makefile.in 2013-11-29 18:45:52.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,9 +82,9 @@ translate_replace_glob_to_regex$(EXEEXT) check_PROGRAMS = $(am__EXEEXT_1) subdir = tests/lib/search -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp $(top_srcdir)/config/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -181,12 +209,229 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no -am__tty_colors = $(am__tty_colors_dummy) +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -416,7 +661,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -456,12 +701,15 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + regex_process_escape_sequence$(EXEEXT): $(regex_process_escape_sequence_OBJECTS) $(regex_process_escape_sequence_DEPENDENCIES) $(EXTRA_regex_process_escape_sequence_DEPENDENCIES) @rm -f regex_process_escape_sequence$(EXEEXT) $(AM_V_CCLD)$(LINK) $(regex_process_escape_sequence_OBJECTS) $(regex_process_escape_sequence_LDADD) $(LIBS) + regex_replace_esc_seq$(EXEEXT): $(regex_replace_esc_seq_OBJECTS) $(regex_replace_esc_seq_DEPENDENCIES) $(EXTRA_regex_replace_esc_seq_DEPENDENCIES) @rm -f regex_replace_esc_seq$(EXEEXT) $(AM_V_CCLD)$(LINK) $(regex_replace_esc_seq_OBJECTS) $(regex_replace_esc_seq_LDADD) $(LIBS) + translate_replace_glob_to_regex$(EXEEXT): $(translate_replace_glob_to_regex_OBJECTS) $(translate_replace_glob_to_regex_DEPENDENCIES) $(EXTRA_translate_replace_glob_to_regex_DEPENDENCIES) @rm -f translate_replace_glob_to_regex$(EXEEXT) $(AM_V_CCLD)$(LINK) $(translate_replace_glob_to_regex_OBJECTS) $(translate_replace_glob_to_regex_LDADD) $(LIBS) @@ -503,26 +751,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -534,15 +771,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -551,9 +784,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -569,98 +803,182 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +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) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +regex_replace_esc_seq.log: regex_replace_esc_seq$(EXEEXT) + @p='regex_replace_esc_seq$(EXEEXT)'; \ + b='regex_replace_esc_seq'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +regex_process_escape_sequence.log: regex_process_escape_sequence$(EXEEXT) + @p='regex_process_escape_sequence$(EXEEXT)'; \ + b='regex_process_escape_sequence'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +translate_replace_glob_to_regex.log: translate_replace_glob_to_regex$(EXEEXT) + @p='translate_replace_glob_to_regex$(EXEEXT)'; \ + b='translate_replace_glob_to_regex'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@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) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -718,6 +1036,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -801,9 +1122,9 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool cscopelist \ - ctags distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -813,7 +1134,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + recheck tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/tests/lib/strutil/Makefile.in mc-4.8.11/tests/lib/strutil/Makefile.in --- mc-4.8.10/tests/lib/strutil/Makefile.in 2013-08-02 18:56:54.000000000 +0000 +++ mc-4.8.11/tests/lib/strutil/Makefile.in 2013-11-29 18:45:52.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,9 +80,9 @@ TESTS = replace__str_replace_all$(EXEEXT) parse_integer$(EXEEXT) check_PROGRAMS = $(am__EXEEXT_1) subdir = tests/lib/strutil -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp $(top_srcdir)/config/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -170,12 +198,229 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no -am__tty_colors = $(am__tty_colors_dummy) +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -402,7 +647,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -442,9 +687,11 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + parse_integer$(EXEEXT): $(parse_integer_OBJECTS) $(parse_integer_DEPENDENCIES) $(EXTRA_parse_integer_DEPENDENCIES) @rm -f parse_integer$(EXEEXT) $(AM_V_CCLD)$(LINK) $(parse_integer_OBJECTS) $(parse_integer_LDADD) $(LIBS) + replace__str_replace_all$(EXEEXT): $(replace__str_replace_all_OBJECTS) $(replace__str_replace_all_DEPENDENCIES) $(EXTRA_replace__str_replace_all_DEPENDENCIES) @rm -f replace__str_replace_all$(EXEEXT) $(AM_V_CCLD)$(LINK) $(replace__str_replace_all_OBJECTS) $(replace__str_replace_all_LDADD) $(LIBS) @@ -485,26 +732,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -516,15 +752,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -533,9 +765,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -551,98 +784,175 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +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) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +replace__str_replace_all.log: replace__str_replace_all$(EXEEXT) + @p='replace__str_replace_all$(EXEEXT)'; \ + b='replace__str_replace_all'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +parse_integer.log: parse_integer$(EXEEXT) + @p='parse_integer$(EXEEXT)'; \ + b='parse_integer'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@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) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -700,6 +1010,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -783,9 +1096,9 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool cscopelist \ - ctags distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -795,7 +1108,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + recheck tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/tests/lib/strutil/parse_integer.c mc-4.8.11/tests/lib/strutil/parse_integer.c --- mc-4.8.10/tests/lib/strutil/parse_integer.c 2013-08-02 15:02:39.000000000 +0000 +++ mc-4.8.11/tests/lib/strutil/parse_integer.c 2013-11-29 18:27:07.000000000 +0000 @@ -132,7 +132,7 @@ /* then */ fail_unless (invalid == data->invalid && actual_result == data->expected_result, - "actial ( %" PRIuMAX ") not equal to\nexpected (%" PRIuMAX ")", + "actial ( %" PRIuMAX ") not equal to\nexpected (%" PRIuMAX ")", actual_result, data->expected_result); } /* *INDENT-OFF* */ diff -Nru mc-4.8.10/tests/lib/vfs/Makefile.am mc-4.8.11/tests/lib/vfs/Makefile.am --- mc-4.8.10/tests/lib/vfs/Makefile.am 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/tests/lib/vfs/Makefile.am 2013-11-29 18:27:07.000000000 +0000 @@ -23,6 +23,7 @@ relative_cd \ tempdir \ vfs_parse_ls_lga \ + vfs_path_from_str_flags \ vfs_path_string_convert \ vfs_prefix_to_class \ vfs_split \ @@ -74,6 +75,9 @@ vfs_prefix_to_class_SOURCES = \ vfs_prefix_to_class.c +vfs_path_from_str_flags_SOURCES = \ + vfs_path_from_str_flags.c + vfs_path_string_convert_SOURCES = \ vfs_path_string_convert.c diff -Nru mc-4.8.10/tests/lib/vfs/Makefile.in mc-4.8.11/tests/lib/vfs/Makefile.in --- mc-4.8.10/tests/lib/vfs/Makefile.in 2013-08-02 18:56:55.000000000 +0000 +++ mc-4.8.11/tests/lib/vfs/Makefile.in 2013-11-29 18:45:52.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,17 +81,17 @@ path_cmp$(EXEEXT) path_len$(EXEEXT) \ path_manipulations$(EXEEXT) path_serialize$(EXEEXT) \ relative_cd$(EXEEXT) tempdir$(EXEEXT) \ - vfs_parse_ls_lga$(EXEEXT) vfs_path_string_convert$(EXEEXT) \ - vfs_prefix_to_class$(EXEEXT) vfs_split$(EXEEXT) \ - vfs_s_get_path$(EXEEXT) $(am__EXEEXT_1) + vfs_parse_ls_lga$(EXEEXT) vfs_path_from_str_flags$(EXEEXT) \ + vfs_path_string_convert$(EXEEXT) vfs_prefix_to_class$(EXEEXT) \ + vfs_split$(EXEEXT) vfs_s_get_path$(EXEEXT) $(am__EXEEXT_1) @CHARSET_TRUE@am__append_1 = path_recode \ @CHARSET_TRUE@ vfs_get_encoding check_PROGRAMS = $(am__EXEEXT_2) subdir = tests/lib/vfs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp $(top_srcdir)/config/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -129,9 +157,9 @@ path_cmp$(EXEEXT) path_len$(EXEEXT) \ path_manipulations$(EXEEXT) path_serialize$(EXEEXT) \ relative_cd$(EXEEXT) tempdir$(EXEEXT) \ - vfs_parse_ls_lga$(EXEEXT) vfs_path_string_convert$(EXEEXT) \ - vfs_prefix_to_class$(EXEEXT) vfs_split$(EXEEXT) \ - vfs_s_get_path$(EXEEXT) $(am__EXEEXT_1) + vfs_parse_ls_lga$(EXEEXT) vfs_path_from_str_flags$(EXEEXT) \ + vfs_path_string_convert$(EXEEXT) vfs_prefix_to_class$(EXEEXT) \ + vfs_split$(EXEEXT) vfs_s_get_path$(EXEEXT) $(am__EXEEXT_1) am_canonicalize_pathname_OBJECTS = canonicalize_pathname.$(OBJEXT) canonicalize_pathname_OBJECTS = $(am_canonicalize_pathname_OBJECTS) canonicalize_pathname_LDADD = $(LDADD) @@ -169,6 +197,11 @@ am_vfs_parse_ls_lga_OBJECTS = vfs_parse_ls_lga.$(OBJEXT) vfs_parse_ls_lga_OBJECTS = $(am_vfs_parse_ls_lga_OBJECTS) vfs_parse_ls_lga_LDADD = $(LDADD) +am_vfs_path_from_str_flags_OBJECTS = \ + vfs_path_from_str_flags.$(OBJEXT) +vfs_path_from_str_flags_OBJECTS = \ + $(am_vfs_path_from_str_flags_OBJECTS) +vfs_path_from_str_flags_LDADD = $(LDADD) am_vfs_path_string_convert_OBJECTS = \ vfs_path_string_convert.$(OBJEXT) vfs_path_string_convert_OBJECTS = \ @@ -222,7 +255,8 @@ $(path_manipulations_SOURCES) $(path_recode_SOURCES) \ $(path_serialize_SOURCES) $(relative_cd_SOURCES) \ $(tempdir_SOURCES) $(vfs_get_encoding_SOURCES) \ - $(vfs_parse_ls_lga_SOURCES) $(vfs_path_string_convert_SOURCES) \ + $(vfs_parse_ls_lga_SOURCES) $(vfs_path_from_str_flags_SOURCES) \ + $(vfs_path_string_convert_SOURCES) \ $(vfs_prefix_to_class_SOURCES) $(vfs_s_get_path_SOURCES) \ $(vfs_split_SOURCES) DIST_SOURCES = $(canonicalize_pathname_SOURCES) $(current_dir_SOURCES) \ @@ -230,7 +264,8 @@ $(path_manipulations_SOURCES) $(path_recode_SOURCES) \ $(path_serialize_SOURCES) $(relative_cd_SOURCES) \ $(tempdir_SOURCES) $(vfs_get_encoding_SOURCES) \ - $(vfs_parse_ls_lga_SOURCES) $(vfs_path_string_convert_SOURCES) \ + $(vfs_parse_ls_lga_SOURCES) $(vfs_path_from_str_flags_SOURCES) \ + $(vfs_path_string_convert_SOURCES) \ $(vfs_prefix_to_class_SOURCES) $(vfs_s_get_path_SOURCES) \ $(vfs_split_SOURCES) am__can_run_installinfo = \ @@ -238,12 +273,229 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no -am__tty_colors = $(am__tty_colors_dummy) +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -505,6 +757,9 @@ vfs_prefix_to_class_SOURCES = \ vfs_prefix_to_class.c +vfs_path_from_str_flags_SOURCES = \ + vfs_path_from_str_flags.c + vfs_path_string_convert_SOURCES = \ vfs_path_string_convert.c @@ -514,7 +769,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -554,48 +809,67 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + canonicalize_pathname$(EXEEXT): $(canonicalize_pathname_OBJECTS) $(canonicalize_pathname_DEPENDENCIES) $(EXTRA_canonicalize_pathname_DEPENDENCIES) @rm -f canonicalize_pathname$(EXEEXT) $(AM_V_CCLD)$(LINK) $(canonicalize_pathname_OBJECTS) $(canonicalize_pathname_LDADD) $(LIBS) + current_dir$(EXEEXT): $(current_dir_OBJECTS) $(current_dir_DEPENDENCIES) $(EXTRA_current_dir_DEPENDENCIES) @rm -f current_dir$(EXEEXT) $(AM_V_CCLD)$(LINK) $(current_dir_OBJECTS) $(current_dir_LDADD) $(LIBS) + path_cmp$(EXEEXT): $(path_cmp_OBJECTS) $(path_cmp_DEPENDENCIES) $(EXTRA_path_cmp_DEPENDENCIES) @rm -f path_cmp$(EXEEXT) $(AM_V_CCLD)$(LINK) $(path_cmp_OBJECTS) $(path_cmp_LDADD) $(LIBS) + path_len$(EXEEXT): $(path_len_OBJECTS) $(path_len_DEPENDENCIES) $(EXTRA_path_len_DEPENDENCIES) @rm -f path_len$(EXEEXT) $(AM_V_CCLD)$(LINK) $(path_len_OBJECTS) $(path_len_LDADD) $(LIBS) + path_manipulations$(EXEEXT): $(path_manipulations_OBJECTS) $(path_manipulations_DEPENDENCIES) $(EXTRA_path_manipulations_DEPENDENCIES) @rm -f path_manipulations$(EXEEXT) $(AM_V_CCLD)$(LINK) $(path_manipulations_OBJECTS) $(path_manipulations_LDADD) $(LIBS) + path_recode$(EXEEXT): $(path_recode_OBJECTS) $(path_recode_DEPENDENCIES) $(EXTRA_path_recode_DEPENDENCIES) @rm -f path_recode$(EXEEXT) $(AM_V_CCLD)$(LINK) $(path_recode_OBJECTS) $(path_recode_LDADD) $(LIBS) + path_serialize$(EXEEXT): $(path_serialize_OBJECTS) $(path_serialize_DEPENDENCIES) $(EXTRA_path_serialize_DEPENDENCIES) @rm -f path_serialize$(EXEEXT) $(AM_V_CCLD)$(LINK) $(path_serialize_OBJECTS) $(path_serialize_LDADD) $(LIBS) + relative_cd$(EXEEXT): $(relative_cd_OBJECTS) $(relative_cd_DEPENDENCIES) $(EXTRA_relative_cd_DEPENDENCIES) @rm -f relative_cd$(EXEEXT) $(AM_V_CCLD)$(LINK) $(relative_cd_OBJECTS) $(relative_cd_LDADD) $(LIBS) + tempdir$(EXEEXT): $(tempdir_OBJECTS) $(tempdir_DEPENDENCIES) $(EXTRA_tempdir_DEPENDENCIES) @rm -f tempdir$(EXEEXT) $(AM_V_CCLD)$(LINK) $(tempdir_OBJECTS) $(tempdir_LDADD) $(LIBS) + vfs_get_encoding$(EXEEXT): $(vfs_get_encoding_OBJECTS) $(vfs_get_encoding_DEPENDENCIES) $(EXTRA_vfs_get_encoding_DEPENDENCIES) @rm -f vfs_get_encoding$(EXEEXT) $(AM_V_CCLD)$(LINK) $(vfs_get_encoding_OBJECTS) $(vfs_get_encoding_LDADD) $(LIBS) + vfs_parse_ls_lga$(EXEEXT): $(vfs_parse_ls_lga_OBJECTS) $(vfs_parse_ls_lga_DEPENDENCIES) $(EXTRA_vfs_parse_ls_lga_DEPENDENCIES) @rm -f vfs_parse_ls_lga$(EXEEXT) $(AM_V_CCLD)$(LINK) $(vfs_parse_ls_lga_OBJECTS) $(vfs_parse_ls_lga_LDADD) $(LIBS) + +vfs_path_from_str_flags$(EXEEXT): $(vfs_path_from_str_flags_OBJECTS) $(vfs_path_from_str_flags_DEPENDENCIES) $(EXTRA_vfs_path_from_str_flags_DEPENDENCIES) + @rm -f vfs_path_from_str_flags$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(vfs_path_from_str_flags_OBJECTS) $(vfs_path_from_str_flags_LDADD) $(LIBS) + vfs_path_string_convert$(EXEEXT): $(vfs_path_string_convert_OBJECTS) $(vfs_path_string_convert_DEPENDENCIES) $(EXTRA_vfs_path_string_convert_DEPENDENCIES) @rm -f vfs_path_string_convert$(EXEEXT) $(AM_V_CCLD)$(LINK) $(vfs_path_string_convert_OBJECTS) $(vfs_path_string_convert_LDADD) $(LIBS) + vfs_prefix_to_class$(EXEEXT): $(vfs_prefix_to_class_OBJECTS) $(vfs_prefix_to_class_DEPENDENCIES) $(EXTRA_vfs_prefix_to_class_DEPENDENCIES) @rm -f vfs_prefix_to_class$(EXEEXT) $(AM_V_CCLD)$(LINK) $(vfs_prefix_to_class_OBJECTS) $(vfs_prefix_to_class_LDADD) $(LIBS) + vfs_s_get_path$(EXEEXT): $(vfs_s_get_path_OBJECTS) $(vfs_s_get_path_DEPENDENCIES) $(EXTRA_vfs_s_get_path_DEPENDENCIES) @rm -f vfs_s_get_path$(EXEEXT) $(AM_V_CCLD)$(LINK) $(vfs_s_get_path_OBJECTS) $(vfs_s_get_path_LDADD) $(LIBS) + vfs_split$(EXEEXT): $(vfs_split_OBJECTS) $(vfs_split_DEPENDENCIES) $(EXTRA_vfs_split_DEPENDENCIES) @rm -f vfs_split$(EXEEXT) $(AM_V_CCLD)$(LINK) $(vfs_split_OBJECTS) $(vfs_split_LDADD) $(LIBS) @@ -617,6 +891,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tempdir.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfs_get_encoding.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfs_parse_ls_lga.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfs_path_from_str_flags.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfs_path_string_convert.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfs_prefix_to_class.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfs_s_get_path.Po@am__quote@ @@ -649,26 +924,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -680,15 +944,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -697,9 +957,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -715,98 +976,273 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +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) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +canonicalize_pathname.log: canonicalize_pathname$(EXEEXT) + @p='canonicalize_pathname$(EXEEXT)'; \ + b='canonicalize_pathname'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +current_dir.log: current_dir$(EXEEXT) + @p='current_dir$(EXEEXT)'; \ + b='current_dir'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +path_cmp.log: path_cmp$(EXEEXT) + @p='path_cmp$(EXEEXT)'; \ + b='path_cmp'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +path_len.log: path_len$(EXEEXT) + @p='path_len$(EXEEXT)'; \ + b='path_len'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +path_manipulations.log: path_manipulations$(EXEEXT) + @p='path_manipulations$(EXEEXT)'; \ + b='path_manipulations'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +path_serialize.log: path_serialize$(EXEEXT) + @p='path_serialize$(EXEEXT)'; \ + b='path_serialize'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +relative_cd.log: relative_cd$(EXEEXT) + @p='relative_cd$(EXEEXT)'; \ + b='relative_cd'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tempdir.log: tempdir$(EXEEXT) + @p='tempdir$(EXEEXT)'; \ + b='tempdir'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +vfs_parse_ls_lga.log: vfs_parse_ls_lga$(EXEEXT) + @p='vfs_parse_ls_lga$(EXEEXT)'; \ + b='vfs_parse_ls_lga'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +vfs_path_from_str_flags.log: vfs_path_from_str_flags$(EXEEXT) + @p='vfs_path_from_str_flags$(EXEEXT)'; \ + b='vfs_path_from_str_flags'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +vfs_path_string_convert.log: vfs_path_string_convert$(EXEEXT) + @p='vfs_path_string_convert$(EXEEXT)'; \ + b='vfs_path_string_convert'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +vfs_prefix_to_class.log: vfs_prefix_to_class$(EXEEXT) + @p='vfs_prefix_to_class$(EXEEXT)'; \ + b='vfs_prefix_to_class'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +vfs_split.log: vfs_split$(EXEEXT) + @p='vfs_split$(EXEEXT)'; \ + b='vfs_split'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +vfs_s_get_path.log: vfs_s_get_path$(EXEEXT) + @p='vfs_s_get_path$(EXEEXT)'; \ + b='vfs_s_get_path'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +path_recode.log: path_recode$(EXEEXT) + @p='path_recode$(EXEEXT)'; \ + b='path_recode'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +vfs_get_encoding.log: vfs_get_encoding$(EXEEXT) + @p='vfs_get_encoding$(EXEEXT)'; \ + b='vfs_get_encoding'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@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) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -864,6 +1300,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -947,9 +1386,9 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool cscopelist \ - ctags distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -959,7 +1398,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + recheck tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/tests/lib/vfs/canonicalize_pathname.c mc-4.8.11/tests/lib/vfs/canonicalize_pathname.c --- mc-4.8.10/tests/lib/vfs/canonicalize_pathname.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/tests/lib/vfs/canonicalize_pathname.c 2013-10-15 09:52:41.000000000 +0000 @@ -27,6 +27,10 @@ #include "tests/mctest.h" +#ifdef HAVE_CHARSET +#include "lib/charsets.h" +#endif + #include "lib/strutil.h" #include "lib/util.h" #include "lib/vfs/xdirentry.h" @@ -48,6 +52,11 @@ init_localfs (); vfs_setup_work_dir (); +#ifdef HAVE_CHARSET + mc_global.sysconfig_dir = (char *) TEST_SHARE_DIR; + load_codepages_list (); +#endif + vfs_s_init_class (&vfs_test_ops, &test_subclass); vfs_test_ops.name = "testfs"; @@ -63,6 +72,10 @@ static void teardown (void) { +#ifdef HAVE_CHARSET + free_codepages_list (); +#endif + vfs_shut (); str_uninit_strings (); } @@ -117,6 +130,40 @@ "ftp://user/../../", ".." }, +#ifdef HAVE_CHARSET + { /* 10. Supported encoding */ + "/b/#enc:utf-8/../c", + "/c" + }, + { /* 11. Unsupported encoding */ + "/b/#enc:aaaa/../c", + "/b/c" + }, + { /* 12. Supported encoding */ + "/b/../#enc:utf-8/c", + "/#enc:utf-8/c" + }, + { /* 13. Unsupported encoding */ + "/b/../#enc:aaaa/c", + "/#enc:aaaa/c" + }, + { /* 14. Supported encoding */ + "/b/c/#enc:utf-8/..", + "/b" + }, + { /* 15. Unsupported encoding */ + "/b/c/#enc:aaaa/..", + "/b/c" + }, + { /* 16. Supported encoding */ + "/b/c/../#enc:utf-8", + "/b/#enc:utf-8" + }, + { /* 17. Unsupported encoding */ + "/b/c/../#enc:aaaa", + "/b/#enc:aaaa" + }, +#endif /* HAVE_CHARSET */ }; /* *INDENT-ON* */ diff -Nru mc-4.8.10/tests/lib/vfs/vfs_path_from_str_flags.c mc-4.8.11/tests/lib/vfs/vfs_path_from_str_flags.c --- mc-4.8.10/tests/lib/vfs/vfs_path_from_str_flags.c 1970-01-01 00:00:00.000000000 +0000 +++ mc-4.8.11/tests/lib/vfs/vfs_path_from_str_flags.c 2013-11-29 18:27:07.000000000 +0000 @@ -0,0 +1,134 @@ +/* lib/vfs - test vfs_path_from_str_flags() function + + Copyright (C) 2013 + The Free Software Foundation, Inc. + + Written by: + Slava Zanko , 2013 + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License + as published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#define TEST_SUITE_NAME "/lib/vfs" + +#include "tests/mctest.h" + +#include "lib/strutil.h" +#include "lib/vfs/xdirentry.h" +#include "lib/vfs/path.h" + +#include "src/vfs/local/local.c" + +const char *mc_config_get_home_dir (void); + +/* --------------------------------------------------------------------------------------------- */ + +/* @Mock */ +const char * +mc_config_get_home_dir (void) +{ + return "/mock/test"; +} + +/* --------------------------------------------------------------------------------------------- */ +/* @Before */ +static void +setup (void) +{ + str_init_strings (NULL); + + vfs_init (); + init_localfs (); + vfs_setup_work_dir (); +} + +/* --------------------------------------------------------------------------------------------- */ + +/* @After */ +static void +teardown (void) +{ + vfs_shut (); + str_uninit_strings (); +} + +/* --------------------------------------------------------------------------------------------- */ + +/* @DataSource("test_from_to_string_ds") */ +/* *INDENT-OFF* */ +static const struct test_strip_home_ds +{ + const char *input_string; + const char *expected_result; +} test_strip_home_ds[] = +{ + { /* 0. */ + "/mock/test/some/path", + "~/some/path" + }, + { /* 1. */ + "/mock/testttt/some/path", + "/mock/testttt/some/path" + }, +}; +/* *INDENT-ON* */ + +/* @Test */ +/* *INDENT-OFF* */ +START_PARAMETRIZED_TEST (test_strip_home, test_strip_home_ds) +/* *INDENT-ON* */ +{ + /* given */ + vfs_path_t *actual_result; + + /* when */ + actual_result = vfs_path_from_str_flags (data->input_string, VPF_STRIP_HOME); + + /* then */ + mctest_assert_str_eq (actual_result->str, data->expected_result); + + vfs_path_free (actual_result); +} +/* *INDENT-OFF* */ +END_PARAMETRIZED_TEST +/* *INDENT-ON* */ + +/* --------------------------------------------------------------------------------------------- */ + +int +main (void) +{ + int number_failed; + + Suite *s = suite_create (TEST_SUITE_NAME); + TCase *tc_core = tcase_create ("Core"); + SRunner *sr; + + tcase_add_checked_fixture (tc_core, setup, teardown); + + /* Add new tests here: *************** */ + mctest_add_parameterized_test (tc_core, test_strip_home, test_strip_home_ds); + /* *********************************** */ + + suite_add_tcase (s, tc_core); + sr = srunner_create (s); + srunner_set_log (sr, "vfs_path_from_str_flags.log"); + srunner_run_all (sr, CK_NORMAL); + number_failed = srunner_ntests_failed (sr); + srunner_free (sr); + return (number_failed == 0) ? 0 : 1; +} + +/* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.10/tests/lib/widget/Makefile.in mc-4.8.11/tests/lib/widget/Makefile.in --- mc-4.8.10/tests/lib/widget/Makefile.in 2013-08-02 18:56:55.000000000 +0000 +++ mc-4.8.11/tests/lib/widget/Makefile.in 2013-11-29 18:45:52.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,9 +80,9 @@ TESTS = complete_engine$(EXEEXT) check_PROGRAMS = $(am__EXEEXT_1) subdir = tests/lib/widget -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp $(top_srcdir)/config/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -163,12 +191,229 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no -am__tty_colors = $(am__tty_colors_dummy) +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -395,7 +640,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -435,6 +680,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + complete_engine$(EXEEXT): $(complete_engine_OBJECTS) $(complete_engine_DEPENDENCIES) $(EXTRA_complete_engine_DEPENDENCIES) @rm -f complete_engine$(EXEEXT) $(AM_V_CCLD)$(LINK) $(complete_engine_OBJECTS) $(complete_engine_LDADD) $(LIBS) @@ -474,26 +720,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -505,15 +740,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -522,9 +753,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -540,98 +772,168 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +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) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +complete_engine.log: complete_engine$(EXEEXT) + @p='complete_engine$(EXEEXT)'; \ + b='complete_engine'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@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) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -689,6 +991,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -772,9 +1077,9 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool cscopelist \ - ctags distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -784,7 +1089,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + recheck tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/tests/src/Makefile.in mc-4.8.11/tests/src/Makefile.in --- mc-4.8.10/tests/src/Makefile.in 2013-08-02 18:56:55.000000000 +0000 +++ mc-4.8.11/tests/src/Makefile.in 2013-11-29 18:45:52.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -58,9 +86,9 @@ execute__execute_get_external_cmd_opts_from_config$(EXEEXT) check_PROGRAMS = $(am__EXEEXT_1) subdir = tests/src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp $(top_srcdir)/config/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -181,13 +209,14 @@ DIST_SOURCES = $(execute__execute_external_editor_or_viewer_SOURCES) \ $(execute__execute_get_external_cmd_opts_from_config_SOURCES) \ $(execute__execute_with_vfs_arg_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -195,15 +224,234 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + check recheck distdir +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no -am__tty_colors = $(am__tty_colors_dummy) +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DIST_SUBDIRS = . filemanager editor DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ @@ -463,7 +711,7 @@ all: all-recursive .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -503,12 +751,15 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + execute__execute_external_editor_or_viewer$(EXEEXT): $(execute__execute_external_editor_or_viewer_OBJECTS) $(execute__execute_external_editor_or_viewer_DEPENDENCIES) $(EXTRA_execute__execute_external_editor_or_viewer_DEPENDENCIES) @rm -f execute__execute_external_editor_or_viewer$(EXEEXT) $(AM_V_CCLD)$(LINK) $(execute__execute_external_editor_or_viewer_OBJECTS) $(execute__execute_external_editor_or_viewer_LDADD) $(LIBS) + execute__execute_get_external_cmd_opts_from_config$(EXEEXT): $(execute__execute_get_external_cmd_opts_from_config_OBJECTS) $(execute__execute_get_external_cmd_opts_from_config_DEPENDENCIES) $(EXTRA_execute__execute_get_external_cmd_opts_from_config_DEPENDENCIES) @rm -f execute__execute_get_external_cmd_opts_from_config$(EXEEXT) $(AM_V_CCLD)$(LINK) $(execute__execute_get_external_cmd_opts_from_config_OBJECTS) $(execute__execute_get_external_cmd_opts_from_config_LDADD) $(LIBS) + execute__execute_with_vfs_arg$(EXEEXT): $(execute__execute_with_vfs_arg_OBJECTS) $(execute__execute_with_vfs_arg_DEPENDENCIES) $(EXTRA_execute__execute_with_vfs_arg_DEPENDENCIES) @rm -f execute__execute_with_vfs_arg$(EXEEXT) $(AM_V_CCLD)$(LINK) $(execute__execute_with_vfs_arg_OBJECTS) $(execute__execute_with_vfs_arg_LDADD) $(LIBS) @@ -556,14 +807,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -584,31 +834,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -624,12 +856,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -641,15 +868,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -658,9 +881,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -676,98 +900,182 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +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) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +execute__execute_with_vfs_arg.log: execute__execute_with_vfs_arg$(EXEEXT) + @p='execute__execute_with_vfs_arg$(EXEEXT)'; \ + b='execute__execute_with_vfs_arg'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +execute__execute_external_editor_or_viewer.log: execute__execute_external_editor_or_viewer$(EXEEXT) + @p='execute__execute_external_editor_or_viewer$(EXEEXT)'; \ + b='execute__execute_external_editor_or_viewer'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +execute__execute_get_external_cmd_opts_from_config.log: execute__execute_get_external_cmd_opts_from_config$(EXEEXT) + @p='execute__execute_get_external_cmd_opts_from_config$(EXEEXT)'; \ + b='execute__execute_get_external_cmd_opts_from_config'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@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) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -851,6 +1159,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -932,14 +1243,11 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool cscopelist \ - cscopelist-recursive ctags ctags-recursive distclean \ +.MAKE: $(am__recursive_targets) check-am install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-TESTS check-am clean clean-checkPROGRAMS clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ @@ -949,7 +1257,7 @@ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \ uninstall uninstall-am diff -Nru mc-4.8.10/tests/src/editor/Makefile.in mc-4.8.11/tests/src/editor/Makefile.in --- mc-4.8.10/tests/src/editor/Makefile.in 2013-08-02 18:56:56.000000000 +0000 +++ mc-4.8.11/tests/src/editor/Makefile.in 2013-11-29 18:45:52.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,9 +83,9 @@ TESTS = editcmd__edit_complete_word_cmd$(EXEEXT) check_PROGRAMS = $(am__EXEEXT_1) subdir = tests/src/editor -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/test-data.txt.in $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs $(srcdir)/test-data.txt.in \ + $(top_srcdir)/config/depcomp $(top_srcdir)/config/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -168,12 +196,229 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no -am__tty_colors = $(am__tty_colors_dummy) +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -400,7 +645,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -442,6 +687,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + editcmd__edit_complete_word_cmd$(EXEEXT): $(editcmd__edit_complete_word_cmd_OBJECTS) $(editcmd__edit_complete_word_cmd_DEPENDENCIES) $(EXTRA_editcmd__edit_complete_word_cmd_DEPENDENCIES) @rm -f editcmd__edit_complete_word_cmd$(EXEEXT) $(AM_V_CCLD)$(LINK) $(editcmd__edit_complete_word_cmd_OBJECTS) $(editcmd__edit_complete_word_cmd_LDADD) $(LIBS) @@ -481,26 +727,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -512,15 +747,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -529,9 +760,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -547,98 +779,168 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +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) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +editcmd__edit_complete_word_cmd.log: editcmd__edit_complete_word_cmd$(EXEEXT) + @p='editcmd__edit_complete_word_cmd$(EXEEXT)'; \ + b='editcmd__edit_complete_word_cmd'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@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) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -696,6 +998,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -779,9 +1084,9 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool cscopelist \ - ctags distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -791,7 +1096,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + recheck tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/tests/src/filemanager/Makefile.in mc-4.8.11/tests/src/filemanager/Makefile.in --- mc-4.8.10/tests/src/filemanager/Makefile.in 2013-08-02 18:56:56.000000000 +0000 +++ mc-4.8.11/tests/src/filemanager/Makefile.in 2013-11-29 18:45:52.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -57,9 +85,9 @@ cmd__get_random_hint$(EXEEXT) check_PROGRAMS = $(am__EXEEXT_1) subdir = tests/src/filemanager -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/config/depcomp \ - $(top_srcdir)/config/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp $(top_srcdir)/config/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \ @@ -184,12 +212,229 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no -am__tty_colors = $(am__tty_colors_dummy) +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -426,7 +671,7 @@ all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -466,15 +711,19 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + cmd__get_random_hint$(EXEEXT): $(cmd__get_random_hint_OBJECTS) $(cmd__get_random_hint_DEPENDENCIES) $(EXTRA_cmd__get_random_hint_DEPENDENCIES) @rm -f cmd__get_random_hint$(EXEEXT) $(AM_V_CCLD)$(LINK) $(cmd__get_random_hint_OBJECTS) $(cmd__get_random_hint_LDADD) $(LIBS) + do_cd_command$(EXEEXT): $(do_cd_command_OBJECTS) $(do_cd_command_DEPENDENCIES) $(EXTRA_do_cd_command_DEPENDENCIES) @rm -f do_cd_command$(EXEEXT) $(AM_V_CCLD)$(LINK) $(do_cd_command_OBJECTS) $(do_cd_command_LDADD) $(LIBS) + examine_cd$(EXEEXT): $(examine_cd_OBJECTS) $(examine_cd_DEPENDENCIES) $(EXTRA_examine_cd_DEPENDENCIES) @rm -f examine_cd$(EXEEXT) $(AM_V_CCLD)$(LINK) $(examine_cd_OBJECTS) $(examine_cd_LDADD) $(LIBS) + exec_get_export_variables_ext$(EXEEXT): $(exec_get_export_variables_ext_OBJECTS) $(exec_get_export_variables_ext_DEPENDENCIES) $(EXTRA_exec_get_export_variables_ext_DEPENDENCIES) @rm -f exec_get_export_variables_ext$(EXEEXT) $(AM_V_CCLD)$(LINK) $(exec_get_export_variables_ext_OBJECTS) $(exec_get_export_variables_ext_LDADD) $(LIBS) @@ -517,26 +766,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -548,15 +786,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -565,9 +799,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -583,98 +818,189 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +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) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +do_cd_command.log: do_cd_command$(EXEEXT) + @p='do_cd_command$(EXEEXT)'; \ + b='do_cd_command'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +examine_cd.log: examine_cd$(EXEEXT) + @p='examine_cd$(EXEEXT)'; \ + b='examine_cd'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +exec_get_export_variables_ext.log: exec_get_export_variables_ext$(EXEEXT) + @p='exec_get_export_variables_ext$(EXEEXT)'; \ + b='exec_get_export_variables_ext'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +cmd__get_random_hint.log: cmd__get_random_hint$(EXEEXT) + @p='cmd__get_random_hint$(EXEEXT)'; \ + b='cmd__get_random_hint'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@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) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -732,6 +1058,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -815,9 +1144,9 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool cscopelist \ - ctags distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -827,7 +1156,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + recheck tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru mc-4.8.10/tests/src/filemanager/exec_get_export_variables_ext.c mc-4.8.11/tests/src/filemanager/exec_get_export_variables_ext.c --- mc-4.8.10/tests/src/filemanager/exec_get_export_variables_ext.c 2013-06-25 21:29:14.000000000 +0000 +++ mc-4.8.11/tests/src/filemanager/exec_get_export_variables_ext.c 2013-11-29 18:27:07.000000000 +0000 @@ -49,10 +49,11 @@ vfs_setup_work_dir (); mc_global.mc_run_mode = MC_RUN_FULL; - current_panel = g_new0 (struct WPanel, 1); + current_panel = g_new0 (WPanel, 1); current_panel->cwd_vpath = vfs_path_from_str ("/home"); - current_panel->dir.list = g_new0 (file_entry, MIN_FILES); - current_panel->dir.size = MIN_FILES; + current_panel->dir.size = DIR_LIST_MIN_SIZE; + current_panel->dir.list = g_new0 (file_entry_t, current_panel->dir.size); + current_panel->dir.len = 0; } static void @@ -74,12 +75,12 @@ const char *expected_string; current_panel->selected = 0; + current_panel->dir.len = 3; current_panel->dir.list[0].fname = (char *) "selected file.txt"; current_panel->dir.list[1].fname = (char *) "tagged file1.txt"; current_panel->dir.list[1].f.marked = TRUE; current_panel->dir.list[2].fname = (char *) "tagged file2.txt"; current_panel->dir.list[2].f.marked = TRUE; - current_panel->count = 3; /* when */ filename_vpath = vfs_path_from_str ("/tmp/blabla.txt"); diff -Nru mc-4.8.10/version.h mc-4.8.11/version.h --- mc-4.8.10/version.h 2013-08-02 18:57:00.000000000 +0000 +++ mc-4.8.11/version.h 2013-11-29 18:45:53.000000000 +0000 @@ -1,4 +1,4 @@ #ifndef MC_CURRENT_VERSION /* This is an autogenerated file. Don't edit! */ -#define MC_CURRENT_VERSION "4.8.10" +#define MC_CURRENT_VERSION "4.8.11" #endif