summaryrefslogtreecommitdiff
path: root/g13
diff options
context:
space:
mode:
Diffstat (limited to 'g13')
-rw-r--r--g13/Makefile.in1069
-rw-r--r--g13/encfs-1.5_annotate.diff293
-rw-r--r--g13/encfs-1.7.3_annotate.diff249
-rw-r--r--g13/g13-syshelp.c113
-rw-r--r--g13/g13.c148
5 files changed, 1186 insertions, 686 deletions
diff --git a/g13/Makefile.in b/g13/Makefile.in
new file mode 100644
index 0000000..26489ec
--- /dev/null
+++ b/g13/Makefile.in
@@ -0,0 +1,1069 @@
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# g13/Makefile.am
+# Copyright (C) 2009 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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 <https://www.gnu.org/licenses/>.
+
+# cmacros.am - C macro definitions
+# Copyright (C) 2004 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG 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.
+#
+# GnuPG 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 <https://www.gnu.org/licenses/>.
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) 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 \
+ *\\[\ \ ]*) \
+ 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; \
+ 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@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = g13$(EXEEXT)
+sbin_PROGRAMS = g13-syshelp$(EXEEXT)
+noinst_PROGRAMS = $(am__EXEEXT_1)
+@DISABLE_TESTS_FALSE@TESTS = $(am__EXEEXT_1)
+@HAVE_DOSISH_SYSTEM_FALSE@am__append_1 = -DGNUPG_BINDIR="\"$(bindir)\"" \
+@HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBEXECDIR="\"$(libexecdir)\"" \
+@HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LIBDIR="\"$(libdir)/@PACKAGE@\"" \
+@HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_DATADIR="\"$(datadir)/@PACKAGE@\"" \
+@HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_SYSCONFDIR="\"$(sysconfdir)/@PACKAGE@\"" \
+@HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_LOCALSTATEDIR="\"$(localstatedir)\""
+
+
+# If a specific protect tool program has been defined, pass its name
+# to cc. Note that these macros should not be used directly but via
+# the gnupg_module_name function.
+@GNUPG_AGENT_PGM_TRUE@am__append_2 = -DGNUPG_DEFAULT_AGENT="\"@GNUPG_AGENT_PGM@\""
+@GNUPG_PINENTRY_PGM_TRUE@am__append_3 = -DGNUPG_DEFAULT_PINENTRY="\"@GNUPG_PINENTRY_PGM@\""
+@GNUPG_SCDAEMON_PGM_TRUE@am__append_4 = -DGNUPG_DEFAULT_SCDAEMON="\"@GNUPG_SCDAEMON_PGM@\""
+@GNUPG_DIRMNGR_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
+@GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
+@GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
+subdir = g13
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/ksba.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/ldap.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libassuan.m4 \
+ $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/npth.m4 $(top_srcdir)/m4/ntbtls.m4 \
+ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sys_socket_h.m4 \
+ $(top_srcdir)/m4/tar-ustar.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
+am__EXEEXT_1 = t-g13tuple$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS)
+am_g13_OBJECTS = g13.$(OBJEXT) g13-common.$(OBJEXT) keyblob.$(OBJEXT) \
+ g13tuple.$(OBJEXT) server.$(OBJEXT) create.$(OBJEXT) \
+ mount.$(OBJEXT) suspend.$(OBJEXT) mountinfo.$(OBJEXT) \
+ call-syshelp.$(OBJEXT) runner.$(OBJEXT) backend.$(OBJEXT) \
+ be-encfs.$(OBJEXT) be-truecrypt.$(OBJEXT) be-dmcrypt.$(OBJEXT)
+g13_OBJECTS = $(am_g13_OBJECTS)
+am__DEPENDENCIES_1 =
+g13_DEPENDENCIES = $(libcommonpth) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+am_g13_syshelp_OBJECTS = g13-syshelp.$(OBJEXT) g13-common.$(OBJEXT) \
+ keyblob.$(OBJEXT) g13tuple.$(OBJEXT) sh-cmd.$(OBJEXT) \
+ sh-blockdev.$(OBJEXT) sh-dmcrypt.$(OBJEXT)
+g13_syshelp_OBJECTS = $(am_g13_syshelp_OBJECTS)
+g13_syshelp_DEPENDENCIES = $(libcommon) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_t_g13tuple_OBJECTS = t-g13tuple.$(OBJEXT) g13tuple.$(OBJEXT)
+t_g13tuple_OBJECTS = $(am_t_g13tuple_OBJECTS)
+am__DEPENDENCIES_2 = $(libcommon) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+t_g13tuple_DEPENDENCIES = $(am__DEPENDENCIES_2)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/backend.Po ./$(DEPDIR)/be-dmcrypt.Po \
+ ./$(DEPDIR)/be-encfs.Po ./$(DEPDIR)/be-truecrypt.Po \
+ ./$(DEPDIR)/call-syshelp.Po ./$(DEPDIR)/create.Po \
+ ./$(DEPDIR)/g13-common.Po ./$(DEPDIR)/g13-syshelp.Po \
+ ./$(DEPDIR)/g13.Po ./$(DEPDIR)/g13tuple.Po \
+ ./$(DEPDIR)/keyblob.Po ./$(DEPDIR)/mount.Po \
+ ./$(DEPDIR)/mountinfo.Po ./$(DEPDIR)/runner.Po \
+ ./$(DEPDIR)/server.Po ./$(DEPDIR)/sh-blockdev.Po \
+ ./$(DEPDIR)/sh-cmd.Po ./$(DEPDIR)/sh-dmcrypt.Po \
+ ./$(DEPDIR)/suspend.Po ./$(DEPDIR)/t-g13tuple.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
+SOURCES = $(g13_SOURCES) $(g13_syshelp_SOURCES) $(t_g13tuple_SOURCES)
+DIST_SOURCES = $(g13_SOURCES) $(g13_syshelp_SOURCES) \
+ $(t_g13tuple_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ 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); \
+ 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__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/am/cmacros.am \
+ $(top_srcdir)/build-aux/depcomp \
+ $(top_srcdir)/build-aux/mkinstalldirs
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+AWK_HEX_NUMBER_OPTION = @AWK_HEX_NUMBER_OPTION@
+BUILD_FILEVERSION = @BUILD_FILEVERSION@
+BUILD_HOSTNAME = @BUILD_HOSTNAME@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BUILD_REVISION = @BUILD_REVISION@
+BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
+BUILD_VERSION = @BUILD_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DL_LIBS = @DL_LIBS@
+DNSLIBS = @DNSLIBS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENCFS = @ENCFS@
+EXEEXT = @EXEEXT@
+FUSERMOUNT = @FUSERMOUNT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUPG_AGENT_PGM = @GNUPG_AGENT_PGM@
+GNUPG_DIRMNGR_LDAP_PGM = @GNUPG_DIRMNGR_LDAP_PGM@
+GNUPG_DIRMNGR_PGM = @GNUPG_DIRMNGR_PGM@
+GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
+GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
+GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
+GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
+GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
+GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
+GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@
+GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+KSBA_CFLAGS = @KSBA_CFLAGS@
+KSBA_CONFIG = @KSBA_CONFIG@
+KSBA_LIBS = @KSBA_LIBS@
+LBER_LIBS = @LBER_LIBS@
+LDAPLIBS = @LDAPLIBS@
+LDAP_CPPFLAGS = @LDAP_CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
+LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
+LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE = @LIBREADLINE@
+LIBS = @LIBS@
+LIBUSB_CPPFLAGS = @LIBUSB_CPPFLAGS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
+LIBUTIL_LIBS = @LIBUTIL_LIBS@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NETLIBS = @NETLIBS@
+NPTH_CFLAGS = @NPTH_CFLAGS@
+NPTH_CONFIG = @NPTH_CONFIG@
+NPTH_LIBS = @NPTH_LIBS@
+NTBTLS_CFLAGS = @NTBTLS_CFLAGS@
+NTBTLS_CONFIG = @NTBTLS_CONFIG@
+NTBTLS_LIBS = @NTBTLS_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_GT = @PACKAGE_GT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SENDMAIL = @SENDMAIL@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHRED = @SHRED@
+SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
+SQLITE3_LIBS = @SQLITE3_LIBS@
+STRIP = @STRIP@
+SYSROOT = @SYSROOT@
+SYS_SOCKET_H = @SYS_SOCKET_H@
+TAR = @TAR@
+USE_C99_CFLAGS = @USE_C99_CFLAGS@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+W32SOCKLIBS = @W32SOCKLIBS@
+WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YAT2M = @YAT2M@
+ZLIBS = @ZLIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = $(datadir)/locale
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = ChangeLog-2011 all-tests.scm
+
+# NB: AM_CFLAGS may also be used by tools running on the build
+# platform to create source files.
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" $(am__append_1) \
+ $(am__append_2) $(am__append_3) $(am__append_4) \
+ $(am__append_5) $(am__append_6) $(am__append_7)
+@HAVE_W32CE_SYSTEM_FALSE@extra_sys_libs =
+
+# Under Windows we use LockFileEx. WindowsCE provides this only on
+# the WindowsMobile 6 platform and thus we need to use the coredll6
+# import library. We also want to use a stacksize of 256k instead of
+# the 2MB which is the default with cegcc. 256k is the largest stack
+# we use with pth.
+@HAVE_W32CE_SYSTEM_TRUE@extra_sys_libs = -lcoredll6
+@HAVE_W32CE_SYSTEM_FALSE@extra_bin_ldflags =
+@HAVE_W32CE_SYSTEM_TRUE@extra_bin_ldflags = -Wl,--stack=0x40000
+resource_objs =
+
+# Convenience macros
+libcommon = ../common/libcommon.a
+libcommonpth = ../common/libcommonpth.a
+libcommontls = ../common/libcommontls.a
+libcommontlsnpth = ../common/libcommontlsnpth.a
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)
+g13_SOURCES = \
+ g13.c g13.h \
+ g13-common.c g13-common.h \
+ keyblob.c keyblob.h \
+ g13tuple.c g13tuple.h \
+ server.c server.h \
+ create.c create.h \
+ mount.c mount.h \
+ suspend.c suspend.h \
+ mountinfo.c mountinfo.h \
+ call-syshelp.c call-syshelp.h \
+ runner.c runner.h \
+ backend.c backend.h \
+ be-encfs.c be-encfs.h \
+ be-truecrypt.c be-truecrypt.h \
+ be-dmcrypt.c be-dmcrypt.h
+
+g13_LDADD = $(libcommonpth) \
+ $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
+ $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
+
+g13_syshelp_SOURCES = \
+ g13-syshelp.c g13-syshelp.h \
+ g13-common.c g13-common.h \
+ keyblob.c keyblob.h \
+ g13tuple.c g13tuple.h \
+ sh-cmd.c \
+ sh-blockdev.c \
+ sh-dmcrypt.c
+
+g13_syshelp_LDADD = $(libcommon) \
+ $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) \
+ $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
+
+module_tests = t-g13tuple
+t_common_ldadd = $(libcommon) $(LIBGCRYPT_LIBS) \
+ $(LIBASSUAN_LIBS) $(LIBICONV)
+
+t_g13tuple_SOURCES = t-g13tuple.c g13tuple.c
+t_g13tuple_LDADD = $(t_common_ldadd)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj .rc
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/am/cmacros.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu g13/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu g13/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+ esac;
+$(top_srcdir)/am/cmacros.am $(am__empty):
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+clean-noinstPROGRAMS:
+ -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-sbinPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(sbindir)" && rm -f $$files
+
+clean-sbinPROGRAMS:
+ -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
+
+g13$(EXEEXT): $(g13_OBJECTS) $(g13_DEPENDENCIES) $(EXTRA_g13_DEPENDENCIES)
+ @rm -f g13$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(g13_OBJECTS) $(g13_LDADD) $(LIBS)
+
+g13-syshelp$(EXEEXT): $(g13_syshelp_OBJECTS) $(g13_syshelp_DEPENDENCIES) $(EXTRA_g13_syshelp_DEPENDENCIES)
+ @rm -f g13-syshelp$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(g13_syshelp_OBJECTS) $(g13_syshelp_LDADD) $(LIBS)
+
+t-g13tuple$(EXEEXT): $(t_g13tuple_OBJECTS) $(t_g13tuple_DEPENDENCIES) $(EXTRA_t_g13tuple_DEPENDENCIES)
+ @rm -f t-g13tuple$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(t_g13tuple_OBJECTS) $(t_g13tuple_LDADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/backend.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/be-dmcrypt.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/be-encfs.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/be-truecrypt.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/call-syshelp.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/create.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g13-common.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g13-syshelp.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g13.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g13tuple.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyblob.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mountinfo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runner.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sh-blockdev.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sh-cmd.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sh-dmcrypt.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suspend.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-g13tuple.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ set x; \
+ here=`pwd`; \
+ $(am__define_uniq_tagged_files); \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+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
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
+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 "; \
+ 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"; \
+ 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)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+ if test "$$skip" -eq 1; then \
+ skipped="($$skip test was not run)"; \
+ else \
+ skipped="($$skip tests were not run)"; \
+ 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
+
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \
+ clean-sbinPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+ -rm -f ./$(DEPDIR)/backend.Po
+ -rm -f ./$(DEPDIR)/be-dmcrypt.Po
+ -rm -f ./$(DEPDIR)/be-encfs.Po
+ -rm -f ./$(DEPDIR)/be-truecrypt.Po
+ -rm -f ./$(DEPDIR)/call-syshelp.Po
+ -rm -f ./$(DEPDIR)/create.Po
+ -rm -f ./$(DEPDIR)/g13-common.Po
+ -rm -f ./$(DEPDIR)/g13-syshelp.Po
+ -rm -f ./$(DEPDIR)/g13.Po
+ -rm -f ./$(DEPDIR)/g13tuple.Po
+ -rm -f ./$(DEPDIR)/keyblob.Po
+ -rm -f ./$(DEPDIR)/mount.Po
+ -rm -f ./$(DEPDIR)/mountinfo.Po
+ -rm -f ./$(DEPDIR)/runner.Po
+ -rm -f ./$(DEPDIR)/server.Po
+ -rm -f ./$(DEPDIR)/sh-blockdev.Po
+ -rm -f ./$(DEPDIR)/sh-cmd.Po
+ -rm -f ./$(DEPDIR)/sh-dmcrypt.Po
+ -rm -f ./$(DEPDIR)/suspend.Po
+ -rm -f ./$(DEPDIR)/t-g13tuple.Po
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f ./$(DEPDIR)/backend.Po
+ -rm -f ./$(DEPDIR)/be-dmcrypt.Po
+ -rm -f ./$(DEPDIR)/be-encfs.Po
+ -rm -f ./$(DEPDIR)/be-truecrypt.Po
+ -rm -f ./$(DEPDIR)/call-syshelp.Po
+ -rm -f ./$(DEPDIR)/create.Po
+ -rm -f ./$(DEPDIR)/g13-common.Po
+ -rm -f ./$(DEPDIR)/g13-syshelp.Po
+ -rm -f ./$(DEPDIR)/g13.Po
+ -rm -f ./$(DEPDIR)/g13tuple.Po
+ -rm -f ./$(DEPDIR)/keyblob.Po
+ -rm -f ./$(DEPDIR)/mount.Po
+ -rm -f ./$(DEPDIR)/mountinfo.Po
+ -rm -f ./$(DEPDIR)/runner.Po
+ -rm -f ./$(DEPDIR)/server.Po
+ -rm -f ./$(DEPDIR)/sh-blockdev.Po
+ -rm -f ./$(DEPDIR)/sh-cmd.Po
+ -rm -f ./$(DEPDIR)/sh-dmcrypt.Po
+ -rm -f ./$(DEPDIR)/suspend.Po
+ -rm -f ./$(DEPDIR)/t-g13tuple.Po
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-sbinPROGRAMS
+
+.MAKE: check-am install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \
+ check-am clean clean-binPROGRAMS clean-generic \
+ clean-noinstPROGRAMS clean-sbinPROGRAMS cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-binPROGRAMS 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-sbinPROGRAMS install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-sbinPROGRAMS
+
+.PRECIOUS: Makefile
+
+
+@HAVE_W32_SYSTEM_TRUE@.rc.o:
+@HAVE_W32_SYSTEM_TRUE@ $(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
+
+$(PROGRAMS) : $(libcommon) $(libcommonpth)
+
+# 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 --git a/g13/encfs-1.5_annotate.diff b/g13/encfs-1.5_annotate.diff
deleted file mode 100644
index 031147d..0000000
--- a/g13/encfs-1.5_annotate.diff
+++ /dev/null
@@ -1,293 +0,0 @@
-2009-10-14 Werner Koch <wk@gnupg.org>
-
- * encfs/main.cpp (processArgs): Add option --annotate.
- (EncFS_Args, processArgs): Support annotate option.
- (main): Print status messages.
- * encfs/FileUtils.h (EncFS_Opts): Add field ANNOTATE.
- * encfs/FileUtils.cpp (userAllowMkdir): Add arg PROMPTNO.
- (createV6Config): Add arg ANNOTATE.
- (initFS): Pass it down.
- * encfs/encfsctl.cpp (cmd_export): Adjust call to userAllowMkdir.
- (do_chpasswd): Add arg ANNOTATE.
- (chpasswd, chpasswdAutomaticly): Pass false for ANNOTATE.
-
- * encfs/SSL_Cipher.cpp (TimedPBKDF2, newKey): Solve build
- problems by using const_cast for SALT. Suggested by Valient.
-
-
-diff -urp encfs-1.5.2.orig/encfs/FileUtils.cpp encfs-1.5.2/encfs/FileUtils.cpp
---- encfs-1.5.2.orig/encfs/FileUtils.cpp 2008-09-10 07:53:58.000000000 +0200
-+++ encfs-1.5.2/encfs/FileUtils.cpp 2009-10-12 19:29:12.000000000 +0200
-@@ -280,13 +280,24 @@ std::string parentDirectory( const std::
- return path.substr(0, last);
- }
-
--bool userAllowMkdir( const char *path, mode_t mode )
-+bool userAllowMkdir(int promptno, const char *path, mode_t mode )
- {
- // TODO: can we internationalize the y/n names? Seems strange to prompt in
- // their own language but then have to respond 'y' or 'n'.
- // xgroup(setup)
- cerr << autosprintf( _("The directory \"%s\" does not exist. Should it be created? (y,n) "), path );
- char answer[10];
-+ switch (promptno)
-+ {
-+ case 1:
-+ cerr << endl << "$PROMPT$ create_root_dir" << endl;
-+ break;
-+ case 2:
-+ cerr << endl << "$PROMPT$ create_mount_point" << endl;
-+ break;
-+ default:
-+ break;
-+ }
- fgets( answer, sizeof(answer), stdin );
-
- if(toupper(answer[0]) == 'Y')
-@@ -934,7 +945,7 @@ bool selectZeroBlockPassThrough()
- RootPtr createV6Config( EncFS_Context *ctx, const std::string &rootDir,
- bool enableIdleTracking, bool forceDecode,
- const std::string &passwordProgram,
-- bool useStdin, bool reverseEncryption )
-+ bool useStdin, bool annotate, bool reverseEncryption )
- {
- RootPtr rootInfo;
-
-@@ -949,7 +960,10 @@ RootPtr createV6Config( EncFS_Context *c
- " enter \"p\" for pre-configured paranoia mode,\n"
- " anything else, or an empty line will select standard mode.\n"
- "?> ");
--
-+
-+ if (annotate)
-+ cerr << "$PROMPT$ config_option" << endl;
-+
- char answer[10] = {0};
- fgets( answer, sizeof(answer), stdin );
- cout << "\n";
-@@ -1135,7 +1149,11 @@ RootPtr createV6Config( EncFS_Context *c
- CipherKey userKey;
- rDebug( "useStdin: %i", useStdin );
- if(useStdin)
-+ {
-+ if (annotate)
-+ cerr << "$PROMPT$ new_passwd" << endl;
- userKey = config.getUserKey( useStdin );
-+ }
- else if(!passwordProgram.empty())
- userKey = config.getUserKey( passwordProgram, rootDir );
- else
-@@ -1585,6 +1603,8 @@ RootPtr initFS( EncFS_Context *ctx, cons
- if(opts->passwordProgram.empty())
- {
- rDebug( "useStdin: %i", opts->useStdin );
-+ if (opts->annotate)
-+ cerr << "$PROMPT$ passwd" << endl;
- userKey = config.getUserKey( opts->useStdin );
- } else
- userKey = config.getUserKey( opts->passwordProgram, opts->rootDir );
-@@ -1649,7 +1669,7 @@ RootPtr initFS( EncFS_Context *ctx, cons
- // creating a new encrypted filesystem
- rootInfo = createV6Config( ctx, opts->rootDir, opts->idleTracking,
- opts->forceDecode, opts->passwordProgram, opts->useStdin,
-- opts->reverseEncryption );
-+ opts->annotate, opts->reverseEncryption );
- }
- }
-
-diff -urp encfs-1.5.2.orig/encfs/FileUtils.h encfs-1.5.2/encfs/FileUtils.h
---- encfs-1.5.2.orig/encfs/FileUtils.h 2008-08-23 23:48:12.000000000 +0200
-+++ encfs-1.5.2/encfs/FileUtils.h 2009-10-12 19:29:55.000000000 +0200
-@@ -35,8 +35,9 @@ const char *lastPathElement( const char
- std::string parentDirectory( const std::string &path );
-
- // ask the user for permission to create the directory. If they say ok, then
--// do it and return true.
--bool userAllowMkdir( const char *dirPath, mode_t mode );
-+// do it and return true. If PROMPTNO is 1 show a prompt asking for
-+// the root directory, if 2 ask for the mount point.
-+bool userAllowMkdir(int promptno, const char *dirPath, mode_t mode );
-
- enum ConfigType
- {
-@@ -155,6 +156,7 @@ struct EncFS_Opts
-
- std::string passwordProgram; // path to password program (or empty)
- bool useStdin; // read password from stdin rather then prompting
-+ bool annotate; // print annotation lines prompt to stderr.
-
- bool ownerCreate; // set owner of new files to caller
-
-@@ -167,6 +169,7 @@ struct EncFS_Opts
- checkKey = true;
- forceDecode = false;
- useStdin = false;
-+ annotate = false;
- ownerCreate = false;
- reverseEncryption = false;
- }
-diff -urp encfs-1.5.2.orig/encfs/SSL_Cipher.cpp encfs-1.5.2/encfs/SSL_Cipher.cpp
---- encfs-1.5.2.orig/encfs/SSL_Cipher.cpp 2008-08-23 23:48:12.000000000 +0200
-+++ encfs-1.5.2/encfs/SSL_Cipher.cpp 2009-10-12 11:23:25.000000000 +0200
-@@ -144,8 +144,10 @@ int TimedPBKDF2(const char *pass, int pa
- for(;;)
- {
- gettimeofday( &start, 0 );
-- int res = PKCS5_PBKDF2_HMAC_SHA1(pass, passlen, salt, saltlen,
-- iter, keylen, out);
-+ int res = PKCS5_PBKDF2_HMAC_SHA1(pass, passlen,
-+ const_cast<unsigned char*>(salt),
-+ saltlen,
-+ iter, keylen, out);
- if(res != 1)
- return -1;
-
-@@ -423,9 +425,10 @@ CipherKey SSL_Cipher::newKey(const char
- } else
- {
- // known iteration length
-- if(PKCS5_PBKDF2_HMAC_SHA1(password, passwdLength, salt, saltLen,
-- iterationCount, _keySize + _ivLength,
-- KeyData(key)) != 1)
-+ if(PKCS5_PBKDF2_HMAC_SHA1(password, passwdLength,
-+ const_cast<unsigned char*>(salt), saltLen,
-+ iterationCount, _keySize + _ivLength,
-+ KeyData(key)) != 1)
- {
- rWarning("openssl error, PBKDF2 failed");
- return CipherKey();
-
-
-diff -urp encfs-1.5.2.orig/encfs/encfsctl.cpp encfs-1.5.2/encfs/encfsctl.cpp
---- encfs-1.5.2.orig/encfs/encfsctl.cpp 2008-08-23 23:48:12.000000000 +0200
-+++ encfs-1.5.2/encfs/encfsctl.cpp 2009-10-12 19:29:11.000000000 +0200
-@@ -564,7 +564,7 @@ static int cmd_export( int argc, char **
-
- string destDir = argv[2];
- // if the dir doesn't exist, then create it (with user permission)
-- if(!checkDir(destDir) && !userAllowMkdir(destDir.c_str(), 0700))
-+ if(!checkDir(destDir) && !userAllowMkdir(0, destDir.c_str(), 0700))
- return EXIT_FAILURE;
-
- return traverseDirs(rootInfo, "/", destDir);
-@@ -641,7 +641,7 @@ static int cmd_showcruft( int argc, char
- return EXIT_SUCCESS;
- }
-
--static int do_chpasswd( bool useStdin, int argc, char **argv )
-+static int do_chpasswd( bool useStdin, bool annotate, int argc, char **argv )
- {
- (void)argc;
- string rootDir = argv[1];
-@@ -669,6 +669,8 @@ static int do_chpasswd( bool useStdin, i
-
- // ask for existing password
- cout << _("Enter current Encfs password\n");
-+ if (annotate)
-+ cerr << "$PROMPT$ passwd" << endl;
- CipherKey userKey = config.getUserKey( useStdin );
- if(!userKey)
- return EXIT_FAILURE;
-@@ -690,7 +692,11 @@ static int do_chpasswd( bool useStdin, i
- config.kdfIterations = 0; // generate new
-
- if( useStdin )
-+ {
-+ if (annotate)
-+ cerr << "$PROMPT$ new_passwd" << endl;
- userKey = config.getUserKey( true );
-+ }
- else
- userKey = config.getNewUserKey();
-
-@@ -729,12 +735,12 @@ static int do_chpasswd( bool useStdin, i
-
- static int chpasswd( int argc, char **argv )
- {
-- return do_chpasswd( false, argc, argv );
-+ return do_chpasswd( false, false, argc, argv );
- }
-
- static int chpasswdAutomaticly( int argc, char **argv )
- {
-- return do_chpasswd( true, argc, argv );
-+ return do_chpasswd( true, false, argc, argv );
- }
-
-
-diff -urp encfs-1.5.2.orig/encfs/main.cpp encfs-1.5.2/encfs/main.cpp
---- encfs-1.5.2.orig/encfs/main.cpp 2008-08-06 08:36:13.000000000 +0200
-+++ encfs-1.5.2/encfs/main.cpp 2009-10-14 14:19:09.000000000 +0200
-@@ -104,6 +104,7 @@ struct EncFS_Args
- if(opts->forceDecode) ss << "(forceDecode) ";
- if(opts->ownerCreate) ss << "(ownerCreate) ";
- if(opts->useStdin) ss << "(useStdin) ";
-+ if(opts->annotate) ss << "(annotate) ";
- if(opts->reverseEncryption) ss << "(reverseEncryption) ";
- if(opts->mountOnDemand) ss << "(mountOnDemand) ";
- for(int i=0; i<fuseArgc; ++i)
-@@ -196,6 +197,7 @@ bool processArgs(int argc, char *argv[],
- out->opts->forceDecode = false;
- out->opts->ownerCreate = false;
- out->opts->useStdin = false;
-+ out->opts->annotate = false;
- out->opts->reverseEncryption = false;
-
- bool useDefaultFlags = true;
-@@ -223,6 +225,7 @@ bool processArgs(int argc, char *argv[],
- {"extpass", 1, 0, 'p'}, // external password program
- // {"single-thread", 0, 0, 's'}, // single-threaded mode
- {"stdinpass", 0, 0, 'S'}, // read password from stdin
-+ {"annotate", 0, 0, 513}, // Print annotation lines to stderr
- {"verbose", 0, 0, 'v'}, // verbose mode
- {"version", 0, 0, 'V'}, //version
- {"reverse", 0, 0, 'r'}, // reverse encryption
-@@ -255,6 +258,9 @@ bool processArgs(int argc, char *argv[],
- case 'S':
- out->opts->useStdin = true;
- break;
-+ case 513:
-+ out->opts->annotate = true;
-+ break;
- case 'f':
- out->isDaemon = false;
- // this option was added in fuse 2.x
-@@ -403,13 +409,15 @@ bool processArgs(int argc, char *argv[],
-
- // check that the directories exist, or that we can create them..
- if(!isDirectory( out->opts->rootDir.c_str() ) &&
-- !userAllowMkdir( out->opts->rootDir.c_str() ,0700))
-+ !userAllowMkdir(out->opts->annotate? 1:0,
-+ out->opts->rootDir.c_str() ,0700))
- {
- rWarning(_("Unable to locate root directory, aborting."));
- return false;
- }
- if(!isDirectory( out->mountPoint.c_str() ) &&
-- !userAllowMkdir( out->mountPoint.c_str(),0700))
-+ !userAllowMkdir(out->opts->annotate? 2:0,
-+ out->mountPoint.c_str(), 0700))
- {
- rWarning(_("Unable to locate mount point, aborting."));
- return false;
-@@ -610,6 +618,9 @@ int main(int argc, char *argv[])
- {
- time_t startTime, endTime;
-
-+ if (encfsArgs->opts->annotate)
-+ cerr << "$STATUS$ fuse_main_start" << endl;
-+
- // FIXME: workaround for fuse_main returning an error on normal
- // exit. Only print information if fuse_main returned
- // immediately..
-@@ -622,6 +633,9 @@ int main(int argc, char *argv[])
-
- time( &endTime );
-
-+ if (encfsArgs->opts->annotate)
-+ cerr << "$STATUS$ fuse_main_end" << endl;
-+
- if(res == 0)
- returnCode = EXIT_SUCCESS;
-
-
diff --git a/g13/encfs-1.7.3_annotate.diff b/g13/encfs-1.7.3_annotate.diff
deleted file mode 100644
index 0239538..0000000
--- a/g13/encfs-1.7.3_annotate.diff
+++ /dev/null
@@ -1,249 +0,0 @@
-2010-11-10 Werner Koch <wk@gnupg.org>
-
- Port my patch for 1.5 dated 2009-10-14 to 1.7.3.
-
- * encfs/main.cpp (processArgs): Add option --annotate.
- (EncFS_Args, processArgs): Support annotate option.
- (main): Print status messages.
- * encfs/FileUtils.h (EncFS_Opts): Add field ANNOTATE.
- * encfs/FileUtils.cpp (userAllowMkdir): Add arg PROMPTNO.
- (createV6Config): Make use of ANNOTATE option.
- (initFS): Ditto.
- * encfs/encfsctl.cpp (cmd_export): Adjust call to userAllowMkdir.
- (do_chpasswd): Add arg ANNOTATE.
- (chpasswd, chpasswdAutomaticly): Pass false for ANNOTATE.
-
-
-diff -urpN orig/encfs-1.7.3/encfs/FileUtils.cpp encfs-1.7.3/encfs/FileUtils.cpp
---- orig/encfs-1.7.3/encfs/FileUtils.cpp 2010-11-04 04:28:54.000000000 +0100
-+++ encfs-1.7.3/encfs/FileUtils.cpp 2010-11-10 11:43:32.000000000 +0100
-@@ -314,14 +314,27 @@ std::string parentDirectory( const std::
- return path.substr(0, last);
- }
-
--bool userAllowMkdir( const char *path, mode_t mode )
-+bool userAllowMkdir(int promptno, const char *path, mode_t mode )
- {
- // TODO: can we internationalize the y/n names? Seems strange to prompt in
- // their own language but then have to respond 'y' or 'n'.
- // xgroup(setup)
- cerr << autosprintf( _("The directory \"%s\" does not exist. Should it be created? (y,n) "), path );
- char answer[10];
-- char *res = fgets( answer, sizeof(answer), stdin );
-+ char *res;
-+
-+ switch (promptno)
-+ {
-+ case 1:
-+ cerr << endl << "$PROMPT$ create_root_dir" << endl;
-+ break;
-+ case 2:
-+ cerr << endl << "$PROMPT$ create_mount_point" << endl;
-+ break;
-+ default:
-+ break;
-+ }
-+ res = fgets( answer, sizeof(answer), stdin );
-
- if(res != 0 && toupper(answer[0]) == 'Y')
- {
-@@ -976,6 +989,7 @@ RootPtr createV6Config( EncFS_Context *c
- bool useStdin = opts->useStdin;
- bool reverseEncryption = opts->reverseEncryption;
- ConfigMode configMode = opts->configMode;
-+ bool annotate = opts->annotate;
-
- RootPtr rootInfo;
-
-@@ -994,6 +1008,9 @@ RootPtr createV6Config( EncFS_Context *c
- " anything else, or an empty line will select standard mode.\n"
- "?> ");
-
-+ if (annotate)
-+ cerr << "$PROMPT$ config_option" << endl;
-+
- char *res = fgets( answer, sizeof(answer), stdin );
- (void)res;
- cout << "\n";
-@@ -1179,7 +1196,11 @@ RootPtr createV6Config( EncFS_Context *c
- CipherKey userKey;
- rDebug( "useStdin: %i", useStdin );
- if(useStdin)
-+ {
-+ if (annotate)
-+ cerr << "$PROMPT$ new_passwd" << endl;
- userKey = config->getUserKey( useStdin );
-+ }
- else if(!passwordProgram.empty())
- userKey = config->getUserKey( passwordProgram, rootDir );
- else
-@@ -1618,6 +1639,8 @@ RootPtr initFS( EncFS_Context *ctx, cons
- if(opts->passwordProgram.empty())
- {
- rDebug( "useStdin: %i", opts->useStdin );
-+ if (opts->annotate)
-+ cerr << "$PROMPT$ passwd" << endl;
- userKey = config->getUserKey( opts->useStdin );
- } else
- userKey = config->getUserKey( opts->passwordProgram, opts->rootDir );
-diff -urpN orig/encfs-1.7.3/encfs/FileUtils.h encfs-1.7.3/encfs/FileUtils.h
---- orig/encfs-1.7.3/encfs/FileUtils.h 2010-09-05 22:47:01.000000000 +0200
-+++ encfs-1.7.3/encfs/FileUtils.h 2010-11-10 11:45:16.000000000 +0100
-@@ -36,7 +36,7 @@ std::string parentDirectory( const std::
-
- // ask the user for permission to create the directory. If they say ok, then
- // do it and return true.
--bool userAllowMkdir( const char *dirPath, mode_t mode );
-+bool userAllowMkdir(int promptno, const char *dirPath, mode_t mode );
-
- class Cipher;
- class DirNode;
-@@ -72,6 +72,7 @@ struct EncFS_Opts
-
- std::string passwordProgram; // path to password program (or empty)
- bool useStdin; // read password from stdin rather then prompting
-+ bool annotate; // print annotation line prompt to stderr.
-
- bool ownerCreate; // set owner of new files to caller
-
-@@ -87,6 +88,7 @@ struct EncFS_Opts
- checkKey = true;
- forceDecode = false;
- useStdin = false;
-+ annotate = false;
- ownerCreate = false;
- reverseEncryption = false;
- configMode = Config_Prompt;
-diff -urpN orig/encfs-1.7.3/encfs/encfsctl.cpp encfs-1.7.3/encfs/encfsctl.cpp
---- orig/encfs-1.7.3/encfs/encfsctl.cpp 2010-08-30 08:27:49.000000000 +0200
-+++ encfs-1.7.3/encfs/encfsctl.cpp 2010-11-10 11:53:36.000000000 +0100
-@@ -616,7 +616,7 @@ static int cmd_export( int argc, char **
-
- string destDir = argv[2];
- // if the dir doesn't exist, then create it (with user permission)
-- if(!checkDir(destDir) && !userAllowMkdir(destDir.c_str(), 0700))
-+ if(!checkDir(destDir) && !userAllowMkdir(0, destDir.c_str(), 0700))
- return EXIT_FAILURE;
-
- return traverseDirs(rootInfo, "/", destDir);
-@@ -693,7 +693,7 @@ static int cmd_showcruft( int argc, char
- return EXIT_SUCCESS;
- }
-
--static int do_chpasswd( bool useStdin, int argc, char **argv )
-+static int do_chpasswd( bool useStdin, bool annotate, int argc, char **argv )
- {
- (void)argc;
- string rootDir = argv[1];
-@@ -721,6 +721,8 @@ static int do_chpasswd( bool useStdin, i
-
- // ask for existing password
- cout << _("Enter current Encfs password\n");
-+ if (annotate)
-+ cerr << "$PROMPT$ passwd" << endl;
- CipherKey userKey = config->getUserKey( useStdin );
- if(!userKey)
- return EXIT_FAILURE;
-@@ -742,7 +744,11 @@ static int do_chpasswd( bool useStdin, i
- config->kdfIterations = 0; // generate new
-
- if( useStdin )
-+ {
-+ if (annotate)
-+ cerr << "$PROMPT$ new_passwd" << endl;
- userKey = config->getUserKey( true );
-+ }
- else
- userKey = config->getNewUserKey();
-
-@@ -781,12 +787,12 @@ static int do_chpasswd( bool useStdin, i
-
- static int chpasswd( int argc, char **argv )
- {
-- return do_chpasswd( false, argc, argv );
-+ return do_chpasswd( false, false, argc, argv );
- }
-
- static int chpasswdAutomaticly( int argc, char **argv )
- {
-- return do_chpasswd( true, argc, argv );
-+ return do_chpasswd( true, false, argc, argv );
- }
-
-
-diff -urpN orig/encfs-1.7.3/encfs/main.cpp encfs-1.7.3/encfs/main.cpp
---- orig/encfs-1.7.3/encfs/main.cpp 2009-11-29 23:04:12.000000000 +0100
-+++ encfs-1.7.3/encfs/main.cpp 2010-11-10 11:58:59.000000000 +0100
-@@ -104,6 +104,7 @@ struct EncFS_Args
- if(opts->forceDecode) ss << "(forceDecode) ";
- if(opts->ownerCreate) ss << "(ownerCreate) ";
- if(opts->useStdin) ss << "(useStdin) ";
-+ if(opts->annotate) ss << "(annotate) ";
- if(opts->reverseEncryption) ss << "(reverseEncryption) ";
- if(opts->mountOnDemand) ss << "(mountOnDemand) ";
- for(int i=0; i<fuseArgc; ++i)
-@@ -196,6 +197,7 @@ bool processArgs(int argc, char *argv[],
- out->opts->forceDecode = false;
- out->opts->ownerCreate = false;
- out->opts->useStdin = false;
-+ out->opts->annotate = false;
- out->opts->reverseEncryption = false;
-
- bool useDefaultFlags = true;
-@@ -223,6 +225,7 @@ bool processArgs(int argc, char *argv[],
- {"extpass", 1, 0, 'p'}, // external password program
- // {"single-thread", 0, 0, 's'}, // single-threaded mode
- {"stdinpass", 0, 0, 'S'}, // read password from stdin
-+ {"annotate", 0, 0, 513}, // Print annotation lines to stderr
- {"verbose", 0, 0, 'v'}, // verbose mode
- {"version", 0, 0, 'V'}, //version
- {"reverse", 0, 0, 'r'}, // reverse encryption
-@@ -263,6 +266,9 @@ bool processArgs(int argc, char *argv[],
- case 'S':
- out->opts->useStdin = true;
- break;
-+ case 513:
-+ out->opts->annotate = true;
-+ break;
- case 'f':
- out->isDaemon = false;
- // this option was added in fuse 2.x
-@@ -411,13 +417,15 @@ bool processArgs(int argc, char *argv[],
-
- // check that the directories exist, or that we can create them..
- if(!isDirectory( out->opts->rootDir.c_str() ) &&
-- !userAllowMkdir( out->opts->rootDir.c_str() ,0700))
-+ !userAllowMkdir(out->opts->annotate? 1:0,
-+ out->opts->rootDir.c_str() ,0700))
- {
- rWarning(_("Unable to locate root directory, aborting."));
- return false;
- }
- if(!isDirectory( out->mountPoint.c_str() ) &&
-- !userAllowMkdir( out->mountPoint.c_str(),0700))
-+ !userAllowMkdir(out->opts->annotate? 2:0,
-+ out->mountPoint.c_str(),0700))
- {
- rWarning(_("Unable to locate mount point, aborting."));
- return false;
-@@ -631,6 +639,9 @@ int main(int argc, char *argv[])
- {
- time_t startTime, endTime;
-
-+ if (encfsArgs->opts->annotate)
-+ cerr << "$STATUS$ fuse_main_start" << endl;
-+
- // FIXME: workaround for fuse_main returning an error on normal
- // exit. Only print information if fuse_main returned
- // immediately..
-@@ -643,6 +654,9 @@ int main(int argc, char *argv[])
-
- time( &endTime );
-
-+ if (encfsArgs->opts->annotate)
-+ cerr << "$STATUS$ fuse_main_end" << endl;
-+
- if(res == 0)
- returnCode = EXIT_SUCCESS;
-
-
diff --git a/g13/g13-syshelp.c b/g13/g13-syshelp.c
index e6755d5..65d5c25 100644
--- a/g13/g13-syshelp.c
+++ b/g13/g13-syshelp.c
@@ -15,6 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
#include <config.h>
@@ -145,9 +146,11 @@ my_strusage( int level )
switch (level)
{
+ case 9: p = "GPL-3.0-or-later"; break;
case 11: p = "@G13@-syshelp (@GNUPG@)";
break;
case 13: p = VERSION; break;
+ case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
case 17: p = PRINTABLE_OS_NAME; break;
case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n");
break;
@@ -225,12 +228,10 @@ main ( int argc, char **argv)
gpg_error_t err = 0;
/* const char *fname; */
int may_coredump;
- FILE *configfp = NULL;
- char *configname = NULL;
- unsigned configlineno;
- int parse_debug = 0;
+ char *last_configname = NULL;
+ const char *configname = NULL;
+ int debug_argparser = 0;
int no_more_options = 0;
- int default_config =1;
char *logfile = NULL;
/* int debug_wait = 0; */
int use_random_seed = 1;
@@ -265,30 +266,32 @@ main ( int argc, char **argv)
log_fatal ("error allocating session environment block: %s\n",
strerror (errno));
- /* Fixme: We enable verbose mode here because there is currently no
- way to do this when starting g13-syshelp. To fix that we should
- add a g13-syshelp.conf file in /etc/gnupg. */
- opt.verbose = 1;
-
/* First check whether we have a debug option on the commandline. */
orig_argc = argc;
orig_argv = argv;
pargs.argc = &argc;
pargs.argv = &argv;
pargs.flags= (ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
- while (arg_parse( &pargs, opts))
+ while (gnupg_argparse (NULL, &pargs, opts))
{
- if (pargs.r_opt == oDebug || pargs.r_opt == oDebugAll)
- parse_debug++;
+ switch (pargs.r_opt)
+ {
+ case oDebug:
+ case oDebugAll:
+ debug_argparser++;
+ break;
+ }
}
+ /* Reset the flags. */
+ pargs.flags &= ~(ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
/* Initialize the secure memory. */
gcry_control (GCRYCTL_INIT_SECMEM, 16384, 0);
maybe_setuid = 0;
/*
- Now we are now working under our real uid
- */
+ * Now we are now working under our real uid
+ */
/* Setup malloc hooks. */
{
@@ -311,47 +314,40 @@ main ( int argc, char **argv)
ctrl.no_server = 1;
ctrl.status_fd = -1; /* No status output. */
- if (default_config )
- configname = make_filename (gnupg_sysconfdir (),
- G13_NAME"-syshelp.conf", NULL);
+ /* The configuraton directories for use by gpgrt_argparser. */
+ gnupg_set_confdir (GNUPG_CONFDIR_SYS, gnupg_sysconfdir ());
+ gnupg_set_confdir (GNUPG_CONFDIR_USER, gnupg_homedir ());
argc = orig_argc;
argv = orig_argv;
pargs.argc = &argc;
pargs.argv = &argv;
- pargs.flags = 1; /* Do not remove the args. */
-
- next_pass:
- if (configname)
- {
- configlineno = 0;
- configfp = gnupg_fopen (configname, "r");
- if (!configfp)
- {
- if (default_config)
- {
- if (parse_debug)
- log_info (_("NOTE: no default option file '%s'\n"), configname);
- }
- else
- {
- log_error (_("option file '%s': %s\n"),
- configname, strerror(errno));
- g13_exit(2);
- }
- xfree (configname);
- configname = NULL;
- }
- if (parse_debug && configname)
- log_info (_("reading options from '%s'\n"), configname);
- default_config = 0;
- }
+ pargs.flags |= (ARGPARSE_FLAG_RESET
+ | ARGPARSE_FLAG_KEEP
+ | ARGPARSE_FLAG_SYS
+ | ARGPARSE_FLAG_USER);
while (!no_more_options
- && optfile_parse (configfp, configname, &configlineno, &pargs, opts))
+ && gnupg_argparser (&pargs, opts, G13_NAME"-syshelp" EXTSEP_S "conf"))
{
switch (pargs.r_opt)
{
+ case ARGPARSE_CONFFILE:
+ {
+ if (debug_argparser)
+ log_info (_("reading options from '%s'\n"),
+ pargs.r_type? pargs.r.ret_str: "[cmdline]");
+ if (pargs.r_type)
+ {
+ xfree (last_configname);
+ last_configname = xstrdup (pargs.r.ret_str);
+ configname = last_configname;
+ }
+ else
+ configname = NULL;
+ }
+ break;
+
case oQuiet: opt.quiet = 1; break;
case oDryRun: opt.dry_run = 1; break;
@@ -404,26 +400,21 @@ main ( int argc, char **argv)
case oNoRandomSeedFile: use_random_seed = 0; break;
default:
- pargs.err = configfp? ARGPARSE_PRINT_WARNING:ARGPARSE_PRINT_ERROR;
+ pargs.err = configname? ARGPARSE_PRINT_WARNING:ARGPARSE_PRINT_ERROR;
break;
}
}
+ gnupg_argparse (NULL, &pargs, NULL); /* Release internal state. */
- if (configfp)
- {
- fclose (configfp);
- configfp = NULL;
- /* Keep a copy of the config filename. */
- opt.config_filename = configname;
- configname = NULL;
- goto next_pass;
- }
- xfree (configname);
- configname = NULL;
-
- if (!opt.config_filename)
+ if (!last_configname)
opt.config_filename = make_filename (gnupg_homedir (),
- G13_NAME".conf", NULL);
+ G13_NAME"-syshelp" EXTSEP_S "conf",
+ NULL);
+ else
+ {
+ opt.config_filename = last_configname;
+ last_configname = NULL;
+ }
if (log_get_errorcount(0))
g13_exit(2);
diff --git a/g13/g13.c b/g13/g13.c
index c4cd34b..6500916 100644
--- a/g13/g13.c
+++ b/g13/g13.c
@@ -15,6 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
#include <config.h>
@@ -138,7 +139,7 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_s_n (oDryRun, "dry-run", N_("do not make any changes")),
- ARGPARSE_s_s (oOptions, "options", N_("|FILE|read options from FILE")),
+ ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")),
ARGPARSE_s_s (oDebug, "debug", "@"),
ARGPARSE_s_s (oDebugLevel, "debug-level",
@@ -163,7 +164,7 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_s_n (oNoVerbose, "no-verbose", "@"),
ARGPARSE_s_n (oNoSecmemWarn, "no-secmem-warning", "@"),
ARGPARSE_s_n (oNoGreeting, "no-greeting", "@"),
- ARGPARSE_s_n (oNoOptions, "no-options", "@"),
+ ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
ARGPARSE_s_s (oHomedir, "homedir", "@"),
ARGPARSE_s_s (oAgentProgram, "agent-program", "@"),
ARGPARSE_s_s (oGpgProgram, "gpg-program", "@"),
@@ -235,9 +236,11 @@ my_strusage( int level )
switch (level)
{
+ case 9: p = "GPL-3.0-or-later"; break;
case 11: p = "@G13@ (@GNUPG@)";
break;
case 13: p = VERSION; break;
+ case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
case 17: p = PRINTABLE_OS_NAME; break;
case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n");
break;
@@ -343,12 +346,10 @@ main ( int argc, char **argv)
gpg_error_t err = 0;
/* const char *fname; */
int may_coredump;
- FILE *configfp = NULL;
- char *configname = NULL;
- unsigned configlineno;
- int parse_debug = 0;
+ char *last_configname = NULL;
+ const char *configname = NULL;
+ int debug_argparser = 0;
int no_more_options = 0;
- int default_config =1;
char *logfile = NULL;
int greeting = 0;
int nogreeting = 0;
@@ -360,8 +361,6 @@ main ( int argc, char **argv)
struct server_control_s ctrl;
strlist_t recipients = NULL;
- /*mtrace();*/
-
early_system_init ();
gnupg_reopen_std (G13_NAME);
set_strusage (my_strusage);
@@ -395,29 +394,31 @@ main ( int argc, char **argv)
pargs.argc = &argc;
pargs.argv = &argv;
pargs.flags= 1|(1<<6); /* Do not remove the args, ignore version. */
- while (arg_parse( &pargs, opts))
+ pargs.flags= (ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
+ while (gnupg_argparse (NULL, &pargs, opts))
{
- if (pargs.r_opt == oDebug || pargs.r_opt == oDebugAll)
- parse_debug++;
- else if (pargs.r_opt == oOptions)
- { /* Yes, there is one, so we do not try the default one but
- read the config file when it is encountered at the
- commandline. */
- default_config = 0;
- }
- else if (pargs.r_opt == oNoOptions)
- default_config = 0; /* --no-options */
- else if (pargs.r_opt == oHomedir)
- gnupg_set_homedir (pargs.r.ret_str);
+ switch (pargs.r_opt)
+ {
+ case oDebug:
+ case oDebugAll:
+ debug_argparser++;
+ break;
+
+ case oHomedir:
+ gnupg_set_homedir (pargs.r.ret_str);
+ break;
+ }
}
+ /* Reset the flags. */
+ pargs.flags &= ~(ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
/* Initialize the secure memory. */
gcry_control (GCRYCTL_INIT_SECMEM, 16384, 0);
maybe_setuid = 0;
/*
- Now we are now working under our real uid
- */
+ * Now we are now working under our real uid
+ */
/* Setup malloc hooks. */
{
@@ -440,47 +441,39 @@ main ( int argc, char **argv)
ctrl.no_server = 1;
ctrl.status_fd = -1; /* No status output. */
- /* Set the default option file */
- if (default_config )
- configname = make_filename (gnupg_homedir (), G13_NAME".conf", NULL);
+ /* The configuraton directories for use by gpgrt_argparser. */
+ gnupg_set_confdir (GNUPG_CONFDIR_SYS, gnupg_sysconfdir ());
+ gnupg_set_confdir (GNUPG_CONFDIR_USER, gnupg_homedir ());
argc = orig_argc;
argv = orig_argv;
pargs.argc = &argc;
pargs.argv = &argv;
- pargs.flags = 1; /* Do not remove the args. */
-
- next_pass:
- if (configname)
- {
- configlineno = 0;
- configfp = gnupg_fopen (configname, "r");
- if (!configfp)
- {
- if (default_config)
- {
- if (parse_debug)
- log_info (_("Note: no default option file '%s'\n"), configname);
- }
- else
- {
- log_error (_("option file '%s': %s\n"),
- configname, strerror(errno));
- g13_exit(2);
- }
- xfree (configname);
- configname = NULL;
- }
- if (parse_debug && configname)
- log_info (_("reading options from '%s'\n"), configname);
- default_config = 0;
- }
-
+ pargs.flags |= (ARGPARSE_FLAG_RESET
+ | ARGPARSE_FLAG_KEEP
+ | ARGPARSE_FLAG_SYS
+ | ARGPARSE_FLAG_USER);
while (!no_more_options
- && optfile_parse (configfp, configname, &configlineno, &pargs, opts))
+ && gnupg_argparser (&pargs, opts, G13_NAME EXTSEP_S "conf"))
{
switch (pargs.r_opt)
{
+ case ARGPARSE_CONFFILE:
+ {
+ if (debug_argparser)
+ log_info (_("reading options from '%s'\n"),
+ pargs.r_type? pargs.r.ret_str: "[cmdline]");
+ if (pargs.r_type)
+ {
+ xfree (last_configname);
+ last_configname = xstrdup (pargs.r.ret_str);
+ configname = last_configname;
+ }
+ else
+ configname = NULL;
+ }
+ break;
+
case aGPGConfList:
case aGPGConfTest:
set_cmd (&cmd, pargs.r_opt);
@@ -538,17 +531,6 @@ main ( int argc, char **argv)
case oStatusFD: ctrl.status_fd = pargs.r.ret_int; break;
case oLoggerFD: log_set_fd (pargs.r.ret_int ); break;
- case oNoOptions: break; /* no-options */
- case oOptions:
- /* Config files may not be nested (silently ignore them). */
- if (!configfp)
- {
- xfree(configname);
- configname = xstrdup (pargs.r.ret_str);
- goto next_pass;
- }
- break;
-
case oHomedir: gnupg_set_homedir (pargs.r.ret_str); break;
case oAgentProgram: opt.agent_program = pargs.r.ret_str; break;
@@ -592,12 +574,16 @@ main ( int argc, char **argv)
break;
default:
- pargs.err = configfp? ARGPARSE_PRINT_WARNING:ARGPARSE_PRINT_ERROR;
+ if (configname)
+ pargs.err = ARGPARSE_PRINT_WARNING;
+ else
+ pargs.err = ARGPARSE_PRINT_ERROR;
break;
}
}
+ gnupg_argparse (NULL, &pargs, NULL); /* Release internal state. */
- /* XXX Construct GPG arguments. */
+ /* Construct GPG arguments. */
{
strlist_t last;
last = append_to_strlist (&opt.gpg_arguments, "-z");
@@ -607,21 +593,15 @@ main ( int argc, char **argv)
(void) last;
}
- if (configfp)
+ if (!last_configname)
+ opt.config_filename = make_filename (gnupg_homedir (),
+ G13_NAME EXTSEP_S "conf",
+ NULL);
+ else
{
- fclose (configfp);
- configfp = NULL;
- /* Keep a copy of the config filename. */
- opt.config_filename = configname;
- configname = NULL;
- goto next_pass;
+ opt.config_filename = last_configname;
+ last_configname = NULL;
}
- xfree (configname);
- configname = NULL;
-
- if (!opt.config_filename)
- opt.config_filename = make_filename (gnupg_homedir (),
- G13_NAME".conf", NULL);
if (log_get_errorcount(0))
g13_exit(2);
@@ -659,7 +639,9 @@ main ( int argc, char **argv)
if (logfile)
{
log_set_file (logfile);
- log_set_prefix (NULL, GPGRT_LOG_WITH_PREFIX | GPGRT_LOG_WITH_TIME | GPGRT_LOG_WITH_PID);
+ log_set_prefix (NULL, (GPGRT_LOG_WITH_PREFIX
+ | GPGRT_LOG_WITH_TIME
+ | GPGRT_LOG_WITH_PID ));
}
if (gnupg_faked_time_p ())
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 00:41:10 +0000