commit 101affcea9ab7c4cbb8dc91e99056eb70fc15382 parent fded68c0bc22531f0a49cc89c739b25dce5f132e Author: Matyja Lukas Adam <lukas.matyja@students.bfh.ch> Date: Mon, 4 Dec 2023 14:33:03 +0100 [build] remove taler_util.h from include Diffstat:
38 files changed, 524 insertions(+), 834 deletions(-)
diff --git a/src/donau-tools/taler-donau-dbinit b/src/donau-tools/taler-donau-dbinit @@ -0,0 +1,210 @@ +#! /bin/bash + +# taler-donau-dbinit - temporary wrapper script for .libs/taler-donau-dbinit +# Generated by libtool (GNU libtool) 2.4.7 Debian-2.4.7-5 +# +# The taler-donau-dbinit program cannot be directly executed until all the libtool +# libraries that it depends on are installed. +# +# This wrapper script should never be moved out of the build directory. +# If it is, it will not operate correctly. + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s|\([`"$\\]\)|\\\1|g' + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +relink_command="" + +# This environment variable determines our operation mode. +if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then + # install mode needs the following variables: + generated_by_libtool_version='2.4.7' + notinst_deplibs=' ../../src/util/libtalerdonauutil.la ../../src/pq/libtalerpq.la ../../src/donaudb/libtalerdonaudb.la' +else + # When we are sourced in execute mode, $file and $ECHO are already set. + if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then + file="$0" + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + ECHO="printf %s\\n" + fi + +# Very basic option parsing. These options are (a) specific to +# the libtool wrapper, (b) are identical between the wrapper +# /script/ and the wrapper /executable/ that is used only on +# windows platforms, and (c) all begin with the string --lt- +# (application programs are unlikely to have options that match +# this pattern). +# +# There are only two supported options: --lt-debug and +# --lt-dump-script. There is, deliberately, no --lt-help. +# +# The first argument to this parsing function should be the +# script's ../../libtool value, followed by no. +lt_option_debug= +func_parse_lt_options () +{ + lt_script_arg0=$0 + shift + for lt_opt + do + case "$lt_opt" in + --lt-debug) lt_option_debug=1 ;; + --lt-dump-script) + lt_dump_D=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%/[^/]*$%%'` + test "X$lt_dump_D" = "X$lt_script_arg0" && lt_dump_D=. + lt_dump_F=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%^.*/%%'` + cat "$lt_dump_D/$lt_dump_F" + exit 0 + ;; + --lt-*) + $ECHO "Unrecognized --lt- option: '$lt_opt'" 1>&2 + exit 1 + ;; + esac + done + + # Print the debug banner immediately: + if test -n "$lt_option_debug"; then + echo "taler-donau-dbinit:taler-donau-dbinit:$LINENO: libtool wrapper (GNU libtool) 2.4.7 Debian-2.4.7-5" 1>&2 + fi +} + +# Used when --lt-debug. Prints its arguments to stdout +# (redirection is the responsibility of the caller) +func_lt_dump_args () +{ + lt_dump_args_N=1; + for lt_arg + do + $ECHO "taler-donau-dbinit:taler-donau-dbinit:$LINENO: newargv[$lt_dump_args_N]: $lt_arg" + lt_dump_args_N=`expr $lt_dump_args_N + 1` + done +} + +# Core function for launching the target application +func_exec_program_core () +{ + + if test -n "$lt_option_debug"; then + $ECHO "taler-donau-dbinit:taler-donau-dbinit:$LINENO: newargv[0]: $progdir/$program" 1>&2 + func_lt_dump_args ${1+"$@"} 1>&2 + fi + exec "$progdir/$program" ${1+"$@"} + + $ECHO "$0: cannot exec $program $*" 1>&2 + exit 1 +} + +# A function to encapsulate launching the target application +# Strips options in the --lt-* namespace from $@ and +# launches target application with the remaining arguments. +func_exec_program () +{ + case " $* " in + *\ --lt-*) + for lt_wr_arg + do + case $lt_wr_arg in + --lt-*) ;; + *) set x "$@" "$lt_wr_arg"; shift;; + esac + shift + done ;; + esac + func_exec_program_core ${1+"$@"} +} + + # Parse options + func_parse_lt_options "$0" ${1+"$@"} + + # Find the directory that this script lives in. + thisdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'` + test "x$thisdir" = "x$file" && thisdir=. + + # Follow symbolic links until we get to the real thisdir. + file=`ls -ld "$file" | /usr/bin/sed -n 's/.*-> //p'` + while test -n "$file"; do + destdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'` + + # If there was a directory component, then change thisdir. + if test "x$destdir" != "x$file"; then + case "$destdir" in + [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;; + *) thisdir="$thisdir/$destdir" ;; + esac + fi + + file=`$ECHO "$file" | /usr/bin/sed 's%^.*/%%'` + file=`ls -ld "$thisdir/$file" | /usr/bin/sed -n 's/.*-> //p'` + done + + # Usually 'no', except on cygwin/mingw when embedded into + # the cwrapper. + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no + if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then + # special case for '.' + if test "$thisdir" = "."; then + thisdir=`pwd` + fi + # remove .libs from thisdir + case "$thisdir" in + *[\\/].libs ) thisdir=`$ECHO "$thisdir" | /usr/bin/sed 's%[\\/][^\\/]*$%%'` ;; + .libs ) thisdir=. ;; + esac + fi + + # Try to get the absolute directory name. + absdir=`cd "$thisdir" && pwd` + test -n "$absdir" && thisdir="$absdir" + + program='taler-donau-dbinit' + progdir="$thisdir/.libs" + + + if test -f "$progdir/$program"; then + # Add our own library path to LD_LIBRARY_PATH + LD_LIBRARY_PATH="/home/enigma/Documents/Taler/donau/src/util/.libs:/home/enigma/Documents/Taler/donau/src/pq/.libs:/home/enigma/Documents/Taler/donau/src/donaudb/.libs:$LD_LIBRARY_PATH" + + # Some systems cannot cope with colon-terminated LD_LIBRARY_PATH + # The second colon is a workaround for a bug in BeOS R4 sed + LD_LIBRARY_PATH=`$ECHO "$LD_LIBRARY_PATH" | /usr/bin/sed 's/::*$//'` + + export LD_LIBRARY_PATH + + if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then + # Run the actual program with our arguments. + func_exec_program ${1+"$@"} + fi + else + # The program doesn't exist. + $ECHO "$0: error: '$progdir/$program' does not exist" 1>&2 + $ECHO "This script is just a wrapper for $program." 1>&2 + $ECHO "See the libtool documentation for more information." 1>&2 + exit 1 + fi +fi diff --git a/src/donau/donau-httpd b/src/donau/donau-httpd @@ -0,0 +1,210 @@ +#! /bin/bash + +# donau-httpd - temporary wrapper script for .libs/donau-httpd +# Generated by libtool (GNU libtool) 2.4.7 Debian-2.4.7-5 +# +# The donau-httpd program cannot be directly executed until all the libtool +# libraries that it depends on are installed. +# +# This wrapper script should never be moved out of the build directory. +# If it is, it will not operate correctly. + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s|\([`"$\\]\)|\\\1|g' + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +relink_command="" + +# This environment variable determines our operation mode. +if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then + # install mode needs the following variables: + generated_by_libtool_version='2.4.7' + notinst_deplibs=' ../../src/json/libtalerjson.la ../../src/donaudb/libtalerdonaudb.la ../../src/util/libtalerdonauutil.la' +else + # When we are sourced in execute mode, $file and $ECHO are already set. + if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then + file="$0" + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + ECHO="printf %s\\n" + fi + +# Very basic option parsing. These options are (a) specific to +# the libtool wrapper, (b) are identical between the wrapper +# /script/ and the wrapper /executable/ that is used only on +# windows platforms, and (c) all begin with the string --lt- +# (application programs are unlikely to have options that match +# this pattern). +# +# There are only two supported options: --lt-debug and +# --lt-dump-script. There is, deliberately, no --lt-help. +# +# The first argument to this parsing function should be the +# script's ../../libtool value, followed by no. +lt_option_debug= +func_parse_lt_options () +{ + lt_script_arg0=$0 + shift + for lt_opt + do + case "$lt_opt" in + --lt-debug) lt_option_debug=1 ;; + --lt-dump-script) + lt_dump_D=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%/[^/]*$%%'` + test "X$lt_dump_D" = "X$lt_script_arg0" && lt_dump_D=. + lt_dump_F=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%^.*/%%'` + cat "$lt_dump_D/$lt_dump_F" + exit 0 + ;; + --lt-*) + $ECHO "Unrecognized --lt- option: '$lt_opt'" 1>&2 + exit 1 + ;; + esac + done + + # Print the debug banner immediately: + if test -n "$lt_option_debug"; then + echo "donau-httpd:donau-httpd:$LINENO: libtool wrapper (GNU libtool) 2.4.7 Debian-2.4.7-5" 1>&2 + fi +} + +# Used when --lt-debug. Prints its arguments to stdout +# (redirection is the responsibility of the caller) +func_lt_dump_args () +{ + lt_dump_args_N=1; + for lt_arg + do + $ECHO "donau-httpd:donau-httpd:$LINENO: newargv[$lt_dump_args_N]: $lt_arg" + lt_dump_args_N=`expr $lt_dump_args_N + 1` + done +} + +# Core function for launching the target application +func_exec_program_core () +{ + + if test -n "$lt_option_debug"; then + $ECHO "donau-httpd:donau-httpd:$LINENO: newargv[0]: $progdir/$program" 1>&2 + func_lt_dump_args ${1+"$@"} 1>&2 + fi + exec "$progdir/$program" ${1+"$@"} + + $ECHO "$0: cannot exec $program $*" 1>&2 + exit 1 +} + +# A function to encapsulate launching the target application +# Strips options in the --lt-* namespace from $@ and +# launches target application with the remaining arguments. +func_exec_program () +{ + case " $* " in + *\ --lt-*) + for lt_wr_arg + do + case $lt_wr_arg in + --lt-*) ;; + *) set x "$@" "$lt_wr_arg"; shift;; + esac + shift + done ;; + esac + func_exec_program_core ${1+"$@"} +} + + # Parse options + func_parse_lt_options "$0" ${1+"$@"} + + # Find the directory that this script lives in. + thisdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'` + test "x$thisdir" = "x$file" && thisdir=. + + # Follow symbolic links until we get to the real thisdir. + file=`ls -ld "$file" | /usr/bin/sed -n 's/.*-> //p'` + while test -n "$file"; do + destdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'` + + # If there was a directory component, then change thisdir. + if test "x$destdir" != "x$file"; then + case "$destdir" in + [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;; + *) thisdir="$thisdir/$destdir" ;; + esac + fi + + file=`$ECHO "$file" | /usr/bin/sed 's%^.*/%%'` + file=`ls -ld "$thisdir/$file" | /usr/bin/sed -n 's/.*-> //p'` + done + + # Usually 'no', except on cygwin/mingw when embedded into + # the cwrapper. + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no + if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then + # special case for '.' + if test "$thisdir" = "."; then + thisdir=`pwd` + fi + # remove .libs from thisdir + case "$thisdir" in + *[\\/].libs ) thisdir=`$ECHO "$thisdir" | /usr/bin/sed 's%[\\/][^\\/]*$%%'` ;; + .libs ) thisdir=. ;; + esac + fi + + # Try to get the absolute directory name. + absdir=`cd "$thisdir" && pwd` + test -n "$absdir" && thisdir="$absdir" + + program='donau-httpd' + progdir="$thisdir/.libs" + + + if test -f "$progdir/$program"; then + # Add our own library path to LD_LIBRARY_PATH + LD_LIBRARY_PATH="/home/enigma/Documents/Taler/donau/src/json/.libs:/home/enigma/Documents/Taler/donau/src/donaudb/.libs:/home/enigma/Documents/Taler/donau/src/util/.libs:$LD_LIBRARY_PATH" + + # Some systems cannot cope with colon-terminated LD_LIBRARY_PATH + # The second colon is a workaround for a bug in BeOS R4 sed + LD_LIBRARY_PATH=`$ECHO "$LD_LIBRARY_PATH" | /usr/bin/sed 's/::*$//'` + + export LD_LIBRARY_PATH + + if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then + # Run the actual program with our arguments. + func_exec_program ${1+"$@"} + fi + else + # The program doesn't exist. + $ECHO "$0: error: '$progdir/$program' does not exist" 1>&2 + $ECHO "This script is just a wrapper for $program." 1>&2 + $ECHO "See the libtool documentation for more information." 1>&2 + exit 1 + fi +fi diff --git a/src/donau/donau-httpd.h b/src/donau/donau-httpd.h @@ -25,7 +25,7 @@ #include <microhttpd.h> #include "taler/taler_json_lib.h" -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_extensions.h" #include <gnunet/gnunet_mhd_compat.h> diff --git a/src/donau/donau-httpd_batch-issue_receipts.c b/src/donau/donau-httpd_batch-issue_receipts.c @@ -33,7 +33,7 @@ #include "taler-donau-httpd_batch-withdraw.h" #include "taler-donau-httpd_responses.h" #include "taler-donau-httpd_keys.h" -#include "taler_util.h" +#include <taler/taler_util.h> /** diff --git a/src/donau/donau-httpd_responses.c b/src/donau/donau-httpd_responses.c @@ -26,7 +26,7 @@ #include <microhttpd.h> #include <zlib.h> #include "donau-httpd_responses.h" -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "taler/taler_mhd_lib.h" #include "donau-httpd_keys.h" diff --git a/src/donaudb/pg_activate_signing_key.h b/src/donaudb/pg_activate_signing_key.h @@ -21,7 +21,7 @@ #ifndef PG_ACTIVATE_SIGNING_KEY_H #define PG_ACTIVATE_SIGNING_KEY_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" diff --git a/src/donaudb/pg_add_donation_unit_key.h b/src/donaudb/pg_add_donation_unit_key.h @@ -21,7 +21,7 @@ #ifndef PG_ADD_DONATION_UNIT_KEY_H #define PG_ADD_DONATION_UNIT_KEY_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" diff --git a/src/donaudb/pg_commit.h b/src/donaudb/pg_commit.h @@ -21,7 +21,7 @@ #ifndef PG_COMMIT_H #define PG_COMMIT_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" diff --git a/src/donaudb/pg_create_tables.h b/src/donaudb/pg_create_tables.h @@ -21,7 +21,7 @@ #ifndef PG_CREATE_TABLES_H #define PG_CREATE_TABLES_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" diff --git a/src/donaudb/pg_drop_tables.h b/src/donaudb/pg_drop_tables.h @@ -21,7 +21,7 @@ #ifndef PG_DROP_TABLES_H #define PG_DROP_TABLES_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" diff --git a/src/donaudb/pg_event_listen.h b/src/donaudb/pg_event_listen.h @@ -21,7 +21,7 @@ #ifndef PG_EVENT_LISTEN_H #define PG_EVENT_LISTEN_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" /** diff --git a/src/donaudb/pg_event_listen_cancel.h b/src/donaudb/pg_event_listen_cancel.h @@ -21,7 +21,7 @@ #ifndef PG_EVENT_LISTEN_CANCEL_H #define PG_EVENT_LISTEN_CANCEL_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" diff --git a/src/donaudb/pg_event_notify.h b/src/donaudb/pg_event_notify.h @@ -21,7 +21,7 @@ #ifndef PG_EVENT_NOTIFY_H #define PG_EVENT_NOTIFY_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" diff --git a/src/donaudb/pg_get_donation_unit_info.h b/src/donaudb/pg_get_donation_unit_info.h @@ -21,7 +21,7 @@ #ifndef PG_GET_DONATION_UNIT_INFO_H #define PG_GET_DONATION_UNIT_INFO_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" /** diff --git a/src/donaudb/pg_insert_charity.h b/src/donaudb/pg_insert_charity.h @@ -21,7 +21,7 @@ #ifndef PG_INSERT_CHARITY_H #define PG_INSERT_CHARITY_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" diff --git a/src/donaudb/pg_insert_history_entry.h b/src/donaudb/pg_insert_history_entry.h @@ -21,7 +21,7 @@ #ifndef PG_INSERT_HISTORY_ENTRY_H #define PG_INSERT_HISTORY_ENTRY_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" diff --git a/src/donaudb/pg_insert_issued_receipt.h b/src/donaudb/pg_insert_issued_receipt.h @@ -21,7 +21,7 @@ #ifndef PG_INSERT_ISSUED_RECEIPT_H #define PG_INSERT_ISSUED_RECEIPT_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" diff --git a/src/donaudb/pg_insert_submitted_receipt.h b/src/donaudb/pg_insert_submitted_receipt.h @@ -21,7 +21,7 @@ #ifndef PG_INSERT_SUBMITTED_RECEIPT_H #define PG_INSERT_SUBMITTED_RECEIPT_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" diff --git a/src/donaudb/pg_lookup_donation_unit_key.h b/src/donaudb/pg_lookup_donation_unit_key.h @@ -21,7 +21,7 @@ #ifndef PG_LOOKUP_DONATION_UNIT_KEY_H #define PG_LOOKUP_DONATION_UNIT_KEY_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" /** diff --git a/src/donaudb/pg_lookup_signing_key.h b/src/donaudb/pg_lookup_signing_key.h @@ -21,7 +21,7 @@ #ifndef PG_LOOKUP_SIGNING_KEY_H #define PG_LOOKUP_SIGNING_KEY_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" diff --git a/src/donaudb/pg_preflight.h b/src/donaudb/pg_preflight.h @@ -21,7 +21,7 @@ #ifndef PG_PREFLIGTH_H #define PG_PREFLIGTH_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" diff --git a/src/donaudb/pg_rollback.h b/src/donaudb/pg_rollback.h @@ -21,7 +21,7 @@ #ifndef PG_ROLLBACK_H #define PG_ROLLBACK_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" diff --git a/src/donaudb/pg_start.h b/src/donaudb/pg_start.h @@ -21,7 +21,7 @@ #ifndef PG_START_H #define PG_START_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" diff --git a/src/donaudb/pg_start_read_committed.h b/src/donaudb/pg_start_read_committed.h @@ -21,7 +21,7 @@ #ifndef PG_START_READ_COMMITTED_H #define PG_START_READ_COMMITTED_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" /** diff --git a/src/donaudb/pg_start_read_only.h b/src/donaudb/pg_start_read_only.h @@ -21,7 +21,7 @@ #ifndef PG_START_READ_ONLY_H #define PG_START_READ_ONLY_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" diff --git a/src/donaudb/pg_template.h b/src/donaudb/pg_template.h @@ -21,7 +21,7 @@ #ifndef PG_TEMPLATE_H #define PG_TEMPLATE_H -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" diff --git a/src/include/donau_service.h b/src/include/donau_service.h @@ -25,7 +25,7 @@ #define _DONAU_SERVICE_H #include <jansson.h> -#include "taler_util.h" +#include <taler/taler_util.h> #include "donau_util.h" #include "taler/taler_error_codes.h" #include <gnunet/gnunet_curl_lib.h> diff --git a/src/include/donau_util.h b/src/include/donau_util.h @@ -26,7 +26,7 @@ #include <gnunet/gnunet_util_lib.h> #include <microhttpd.h> -#include "taler_util.h" +#include <taler/taler_util.h> #include "donau_crypto_lib.h" #endif diff --git a/src/include/taler_util.h b/src/include/taler_util.h @@ -1,800 +0,0 @@ -/* - This file is part of TALER - Copyright (C) 2014-2023 Taler Systems SA - - TALER 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, or (at your option) any later version. - - TALER 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 - TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> -*/ -/** - * @file include/taler_util.h - * @brief Interface for common utility functions - * @author Sree Harsha Totakura <sreeharsha@totakura.in> - */ -#ifndef TALER_UTIL_H -#define TALER_UTIL_H - -#include <gnunet/gnunet_common.h> -#define __TALER_UTIL_LIB_H_INSIDE__ - -#include <gnunet/gnunet_util_lib.h> -#include <microhttpd.h> -#include "taler/taler_amount_lib.h" -#include "taler/taler_crypto_lib.h" - -/** - * Version of the Taler API, in hex. - * Thus 0.8.4-1 = 0x00080401. - */ -#define TALER_API_VERSION 0x00090200 - -/** - * Stringify operator. - * - * @param a some expression to stringify. Must NOT be a macro. - * @return same expression as a constant string. - */ -#define TALER_S(a) #a - -/** - * Stringify operator. - * - * @param a some expression to stringify. Can be a macro. - * @return macro-expanded expression as a constant string. - */ -#define TALER_QUOTE(a) TALER_S (a) - - -/* Define logging functions */ -#define TALER_LOG_DEBUG(...) \ - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__) - -#define TALER_LOG_INFO(...) \ - GNUNET_log (GNUNET_ERROR_TYPE_INFO, __VA_ARGS__) - -#define TALER_LOG_WARNING(...) \ - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, __VA_ARGS__) - -#define TALER_LOG_ERROR(...) \ - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, __VA_ARGS__) - - -/** - * Tests a given as assertion and if failed prints it as a warning with the - * given reason - * - * @param EXP the expression to test as assertion - * @param reason string to print as warning - */ -#define TALER_assert_as(EXP, reason) \ - do { \ - if (EXP) break; \ - TALER_LOG_ERROR ("%s at %s:%d\n", reason, __FILE__, __LINE__); \ - abort (); \ - } while (0) - - -/** - * HTTP header with an AML officer signature to approve the inquiry. - * Used only in GET Requests. - */ -#define TALER_AML_OFFICER_SIGNATURE_HEADER "Taler-AML-Officer-Signature" - -/** - * Header with signature for reserve history requests. - */ -#define TALER_RESERVE_HISTORY_SIGNATURE_HEADER "Taler-Reserve-History-Signature" - -/** - * Header with signature for coin history requests. - */ -#define TALER_COIN_HISTORY_SIGNATURE_HEADER "Taler-Coin-History-Signature" - -/** - * Log an error message at log-level 'level' that indicates - * a failure of the command 'cmd' with the message given - * by gcry_strerror(rc). - */ -#define TALER_LOG_GCRY_ERROR(cmd, rc) do { TALER_LOG_ERROR ( \ - "`%s' failed at %s:%d with error: %s\n", \ - cmd, __FILE__, __LINE__, \ - gcry_strerror (rc)); } while (0) - - -#define TALER_gcry_ok(cmd) \ - do {int rc; rc = cmd; if (! rc) break; \ - TALER_LOG_ERROR ("A Gcrypt call failed at %s:%d with error: %s\n", \ - __FILE__, \ - __LINE__, gcry_strerror (rc)); abort (); } while (0) - - -/** - * Initialize Gcrypt library. - */ -void -TALER_gcrypt_init (void); - - -/** - * Convert a buffer to an 8-character string - * representative of the contents. This is used - * for logging binary data when debugging. - * - * @param buf buffer to log - * @param buf_size number of bytes in @a buf - * @return text representation of buf, valid until next - * call to this function - */ -const char * -TALER_b2s (const void *buf, - size_t buf_size); - - -/** - * Convert a fixed-sized object to a string using - * #TALER_b2s(). - * - * @param obj address of object to convert - * @return string representing the binary obj buffer - */ -#define TALER_B2S(obj) TALER_b2s ((obj), sizeof (*(obj))) - - -/** - * Obtain denomination amount from configuration file. - * - * @param cfg configuration to extract data from - * @param section section of the configuration to access - * @param option option of the configuration to access - * @param[out] denom set to the amount found in configuration - * @return #GNUNET_OK on success, #GNUNET_SYSERR on error - */ -enum GNUNET_GenericReturnValue -TALER_config_get_amount (const struct GNUNET_CONFIGURATION_Handle *cfg, - const char *section, - const char *option, - struct TALER_Amount *denom); - - -/** - * Obtain denomination fee structure of a - * denomination from configuration file. All - * fee options must start with "fee_" and have - * names typical for the respective fees. - * - * @param cfg configuration to extract data from - * @param currency expected currency - * @param section section of the configuration to access - * @param[out] fees set to the denomination fees - * @return #GNUNET_OK on success, #GNUNET_SYSERR on error - */ -enum GNUNET_GenericReturnValue -TALER_config_get_denom_fees (const struct GNUNET_CONFIGURATION_Handle *cfg, - const char *currency, - const char *section, - struct TALER_DenomFeeSet *fees); - - -/** - * Check that all denominations in @a fees use - * @a currency - * - * @param currency desired currency - * @param fees fee set to check - * @return #GNUNET_OK on success - */ -enum GNUNET_GenericReturnValue -TALER_denom_fee_check_currency ( - const char *currency, - const struct TALER_DenomFeeSet *fees); - - -/** - * Load our currency from the @a cfg (in section [taler] - * the option "CURRENCY"). - * - * @param cfg configuration to use - * @param[out] currency where to write the result - * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure - */ -enum GNUNET_GenericReturnValue -TALER_config_get_currency (const struct GNUNET_CONFIGURATION_Handle *cfg, - char **currency); - - -/** - * Details about how to render a currency. - */ -struct TALER_CurrencySpecification -{ - /** - * Name of the currency. - */ - char currency[TALER_CURRENCY_LEN]; - - /** - * Human-readable long name of the currency, e.g. - * "Japanese Yen". - */ - char *name; - - /** - * how many digits the user may enter at most after the @e decimal_separator - */ - unsigned int num_fractional_input_digits; - - /** - * how many digits we render in normal scale after the @e decimal_separator - */ - unsigned int num_fractional_normal_digits; - - /** - * how many digits we render in after the @e decimal_separator even if all - * remaining digits are zero. - */ - unsigned int num_fractional_trailing_zero_digits; - - /** - * True to put the currency symbol before the number, - * false to put the currency symbol after the number. - */ - bool is_currency_name_leading; - - /** - * Mapping of powers of 10 to alternative currency names or symbols. - * Keys are the decimal powers, values the currency symbol to use. - * Map MUST contain an entry for "0" to the default currency symbol. - */ - json_t *map_alt_unit_names; - -}; - - -/** - * Parse information about supported currencies from - * our configuration. - * - * @param cfg configuration to parse - * @param[out] num_currencies set to number of enabled currencies, length of @e cspecs - * @param[out] cspecs set to currency specification array - * @return #GNUNET_OK on success, #GNUNET_NO if zero - * currency specifications were enabled, - * #GNUNET_SYSERR if the configuration was malformed - */ -enum GNUNET_GenericReturnValue -TALER_CONFIG_parse_currencies (const struct GNUNET_CONFIGURATION_Handle *cfg, - unsigned int *num_currencies, - struct TALER_CurrencySpecification **cspecs); - - -/** - * Free @a cspecs array. - * - * @param num_currencies length of @a cspecs array - * @param[in] cspecs array to free - */ -void -TALER_CONFIG_free_currencies ( - unsigned int num_currencies, - struct TALER_CurrencySpecification cspecs[static num_currencies]); - - -/** - * Convert a currency specification to the - * respective JSON object. - * - * @param cspec currency specification - * @return JSON object encoding @a cspec for `/config`. - */ -json_t * -TALER_CONFIG_currency_specs_to_json ( - const struct TALER_CurrencySpecification *cspec); - - -/** - * Check that @a map contains a valid currency scale - * map that maps integers from [-12,24] to currency - * symbols given as strings. - * - * @param map map to check - * @return #GNUNET_OK if @a map is valid - */ -enum GNUNET_GenericReturnValue -TALER_check_currency_scale_map (const json_t *map); - - -/** - * Allow user to specify an amount on the command line. - * - * @param shortName short name of the option - * @param name long name of the option - * @param argumentHelp help text for the option argument - * @param description long help text for the option - * @param[out] amount set to the amount specified at the command line - */ -struct GNUNET_GETOPT_CommandLineOption -TALER_getopt_get_amount (char shortName, - const char *name, - const char *argumentHelp, - const char *description, - struct TALER_Amount *amount); - - -/** - * Return default project data used by Taler. - */ -const struct GNUNET_OS_ProjectData * -TALER_project_data_default (void); - - -/** - * Initialize libtalerutil. - */ -void -TALER_OS_init (void); - - -/** - * Re-encode string at @a inp to match RFC 8785 (section 3.2.2.2). - * - * @param[in,out] inp pointer to string to re-encode - * @return number of bytes in resulting @a inp - */ -size_t -TALER_rfc8785encode (char **inp); - - -/** - * URL-encode a string according to rfc3986. - * - * @param s string to encode - * @returns the urlencoded string, the caller must free it with GNUNET_free() - */ -char * -TALER_urlencode (const char *s); - - -/** - * Test if all characters in @a url are valid for - * a URL. - * - * @param url URL to sanity-check - * @return true if @a url only contains valid characters - */ -bool -TALER_url_valid_charset (const char *url); - - -/** - * Check if @a lang matches the @a language_pattern, and if so with - * which preference. - * See also: https://tools.ietf.org/html/rfc7231#section-5.3.1 - * - * @param language_pattern a language preferences string - * like "fr-CH, fr;q=0.9, en;q=0.8, *;q=0.1" - * @param lang the 2-digit language to match - * @return q-weight given for @a lang in @a language_pattern, 1.0 if no weights are given; - * 0 if @a lang is not in @a language_pattern - */ -double -TALER_language_matches (const char *language_pattern, - const char *lang); - - -/** - * Find out if an MHD connection is using HTTPS (either - * directly or via proxy). - * - * @param connection MHD connection - * @returns #GNUNET_YES if the MHD connection is using https, - * #GNUNET_NO if the MHD connection is using http, - * #GNUNET_SYSERR if the connection type couldn't be determined - */ -enum GNUNET_GenericReturnValue -TALER_mhd_is_https (struct MHD_Connection *connection); - - -/** - * Make an absolute URL with query parameters. - * - * If a 'value' is given as NULL, both the key and the value are skipped. Note - * that a NULL value does not terminate the list, only a NULL key signals the - * end of the list of arguments. - * - * @param base_url absolute base URL to use - * @param path path of the url - * @param ... NULL-terminated key-value pairs (char *) for query parameters, - * only the value will be url-encoded - * @returns the URL, must be freed with #GNUNET_free - */ -char * -TALER_url_join (const char *base_url, - const char *path, - ...); - - -/** - * Make an absolute URL for the given parameters. - * - * If a 'value' is given as NULL, both the key and the value are skipped. Note - * that a NULL value does not terminate the list, only a NULL key signals the - * end of the list of arguments. - * - * @param proto protocol for the URL (typically https) - * @param host hostname for the URL - * @param prefix prefix for the URL - * @param path path for the URL - * @param ... NULL-terminated key-value pairs (char *) for query parameters, - * the value will be url-encoded - * @returns the URL, must be freed with #GNUNET_free - */ -char * -TALER_url_absolute_raw (const char *proto, - const char *host, - const char *prefix, - const char *path, - ...); - - -/** - * Make an absolute URL for the given parameters. - * - * If a 'value' is given as NULL, both the key and the value are skipped. Note - * that a NULL value does not terminate the list, only a NULL key signals the - * end of the list of arguments. - * - * @param proto protocol for the URL (typically https) - * @param host hostname for the URL - * @param prefix prefix for the URL - * @param path path for the URL - * @param args NULL-terminated key-value pairs (char *) for query parameters, - * the value will be url-encoded - * @returns the URL, must be freed with #GNUNET_free - */ -char * -TALER_url_absolute_raw_va (const char *proto, - const char *host, - const char *prefix, - const char *path, - va_list args); - - -/** - * Make an absolute URL for a given MHD connection. - * - * @param connection the connection to get the URL for - * @param path path of the url - * @param ... NULL-terminated key-value pairs (char *) for query parameters, - * the value will be url-encoded - * @returns the URL, must be freed with #GNUNET_free - */ -char * -TALER_url_absolute_mhd (struct MHD_Connection *connection, - const char *path, - ...); - - -/** - * Obtain the payment method from a @a payto_uri - * - * @param payto_uri the URL to parse - * @return NULL on error (malformed @a payto_uri) - */ -char * -TALER_payto_get_method (const char *payto_uri); - - -/** - * Obtain the account name from a payto URL. - * - * @param payto an x-taler-bank payto URL - * @return only the account name from the @a payto URL, NULL if not an x-taler-bank - * payto URL - */ -char * -TALER_xtalerbank_account_from_payto (const char *payto); - - -/** - * Obtain the receiver name from a payto URL. - * - * @param payto an x-taler-bank payto URL - * @return only the receiver name from the @a payto URL, NULL if not an x-taler-bank payto URL - */ -char * -TALER_payto_get_receiver_name (const char *payto); - - -/** - * Extract the subject value from the URI parameters. - * - * @param payto_uri the URL to parse - * @return NULL if the subject parameter is not found. - * The caller should free the returned value. - */ -char * -TALER_payto_get_subject (const char *payto_uri); - - -/** - * Check that a payto:// URI is well-formed. - * - * @param payto_uri the URL to check - * @return NULL on success, otherwise an error - * message to be freed by the caller! - */ -char * -TALER_payto_validate (const char *payto_uri); - - -/** - * Create payto://-URI for a given exchange base URL - * and a @a reserve_pub. - * - * @param exchange_url the base URL of the exchange - * @param reserve_pub the public key of the reserve - * @return payto://-URI for the reserve (without receiver-name!) - */ -char * -TALER_reserve_make_payto (const char *exchange_url, - const struct TALER_ReservePublicKeyP *reserve_pub); - - -/** - * Check that an IBAN number is well-formed. - * - * Validates given IBAN according to the European Banking Standards. See: - * http://www.europeanpaymentscouncil.eu/documents/ECBS%20IBAN%20standard%20EBS204_V3.2.pdf - * - * @param iban the IBAN to check - * @return NULL on success, otherwise an error - * message to be freed by the caller! - */ -char * -TALER_iban_validate (const char *iban); - - -/** - * Possible values for a binary filter. - */ -enum TALER_EXCHANGE_YesNoAll -{ - /** - * If condition is yes. - */ - TALER_EXCHANGE_YNA_YES = 1, - - /** - * If condition is no. - */ - TALER_EXCHANGE_YNA_NO = 2, - - /** - * Condition disabled. - */ - TALER_EXCHANGE_YNA_ALL = 3 -}; - - -/** - * Convert query argument to @a yna value. - * - * @param connection connection to take query argument from - * @param arg argument to try for - * @param default_val value to assign if the argument is not present - * @param[out] yna value to set - * @return true on success, false if the parameter was malformed - */ -bool -TALER_arg_to_yna (struct MHD_Connection *connection, - const char *arg, - enum TALER_EXCHANGE_YesNoAll default_val, - enum TALER_EXCHANGE_YesNoAll *yna); - - -/** - * Convert YNA value to a string. - * - * @param yna value to convert - * @return string representation ("yes"/"no"/"all"). - */ -const char * -TALER_yna_to_string (enum TALER_EXCHANGE_YesNoAll yna); - - -#ifdef __APPLE__ -/** - * Returns the first occurrence of `c` in `s`, or returns the null-byte - * terminating the string if it does not occur. - * - * @param s the string to search in - * @param c the character to search for - * @return char* the first occurrence of `c` in `s` - */ -char *strchrnul (const char *s, int c); - -#endif - -/** - * @brief Parses a date information into days after 1970-01-01 (or 0) - * - * The input MUST be of the form - * - * 1) YYYY-MM-DD, representing a valid date - * 2) YYYY-MM-00, representing a valid month in a particular year - * 3) YYYY-00-00, representing a valid year. - * - * In the cases 2) and 3) the out parameter is set to the beginning of the - * time, f.e. 1950-00-00 == 1950-01-01 and 1888-03-00 == 1888-03-01 - * - * The output will set to the number of days after 1970-01-01 or 0, if the input - * represents a date belonging to the largest allowed age group. - * - * @param in Input string representation of the date - * @param mask Age mask - * @param[out] out Where to write the result - * @return GNUNET_OK on success, GNUNET_SYSERR otherwise - */ -enum GNUNET_GenericReturnValue -TALER_parse_coarse_date ( - const char *in, - const struct TALER_AgeMask *mask, - uint32_t *out); - - -/** - * @brief Parses a string as a list of age groups. - * - * The string must consist of a colon-separated list of increasing integers - * between 0 and 31. Each entry represents the beginning of a new age group. - * F.e. the string - * - * "8:10:12:14:16:18:21" - * - * represents the following list of eight age groups: - * - * | Group | Ages | - * | -----:|:------------- | - * | 0 | 0, 1, ..., 7 | - * | 1 | 8, 9 | - * | 2 | 10, 11 | - * | 3 | 12, 13 | - * | 4 | 14, 15 | - * | 5 | 16, 17 | - * | 6 | 18, 19, 20 | - * | 7 | 21, ... | - * - * which is then encoded as a bit mask with the corresponding bits set: - * - * 31 24 16 8 0 - * | | | | | - * oooooooo oo1oo1o1 o1o1o1o1 ooooooo1 - * - * @param groups String representation of age groups - * @param[out] mask Mask representation for age restriction. - * @return Error, if age groups were invalid, OK otherwise. - */ -enum GNUNET_GenericReturnValue -TALER_parse_age_group_string ( - const char *groups, - struct TALER_AgeMask *mask); - -/** - * @brief Encodes the age mask into a string, like "8:10:12:14:16:18:21" - * - * NOTE: This function uses a static buffer. It is not safe to call this - * function concurrently. - * - * @param mask Age mask - * @return String representation of the age mask. - * Can be used as value in the TALER config. - */ -const char * -TALER_age_mask_to_string ( - const struct TALER_AgeMask *mask); - -/* - * @brief returns the age group of a given age for a given age mask - * - * @param mask Age mask - * @param age The given age - * @return age group - */ -uint8_t -TALER_get_age_group ( - const struct TALER_AgeMask *mask, - uint8_t age); - -/** - * @brief Parses a JSON object { "age_groups": "a:b:...y:z" }. - * - * @param root is the json object - * @param[out] mask on success, will contain the age mask - * @return #GNUNET_OK on success and #GNUNET_SYSERR on failure. - */ -enum GNUNET_GenericReturnValue -TALER_JSON_parse_age_groups (const json_t *root, - struct TALER_AgeMask *mask); - - -/* @brief Return the lowest age in the corresponding group for a given age - * according the given age mask. - * - * @param[IN] mask age mask - * @param[IN] age age to check - * @return lowest age in corresponding age group - */ -uint8_t -TALER_get_lowest_age ( - const struct TALER_AgeMask *mask, - uint8_t age); - -/* @brief Get the lowest age for the largest age group - * - * @param mask the age mask - * @return lowest age for the largest age group - */ -#define TALER_adult_age(mask) \ - sizeof((mask)->bits) * 8 - __builtin_clz ((mask)->bits) - 1 - -/** - * Handle to an external process that will assist - * with some JSON-to-JSON conversion. - */ -struct TALER_JSON_ExternalConversion; - -/** - * Type of a callback that receives a JSON @a result. - * - * @param cls closure - * @param status_type how did the process die - * @param code termination status code from the process - * @param result some JSON result, NULL if we failed to get an JSON output - */ -typedef void -(*TALER_JSON_JsonCallback) (void *cls, - enum GNUNET_OS_ProcessStatusType status_type, - unsigned long code, - const json_t *result); - - -/** - * Launch some external helper @a binary to convert some @a input - * and eventually call @a cb with the result. - * - * @param input JSON to serialize and pass to the helper process - * @param cb function to call on the result - * @param cb_cls closure for @a cb - * @param binary name of the binary to execute - * @param ... NULL-terminated list of arguments for the @a binary, - * usually starting with again the name of the binary - * @return handle to cancel the operation (and kill the helper) - */ -struct TALER_JSON_ExternalConversion * -TALER_JSON_external_conversion_start (const json_t *input, - TALER_JSON_JsonCallback cb, - void *cb_cls, - const char *binary, - ...); - -/** - * Abort external conversion, killing the process and preventing - * the callback from being called. Must not be called after the - * callback was invoked. - * - * @param[in] ec external conversion handle to cancel - */ -void -TALER_JSON_external_conversion_stop ( - struct TALER_JSON_ExternalConversion *ec); - -#undef __TALER_UTIL_LIB_H_INSIDE__ - -#endif diff --git a/src/json/json.c b/src/json/json.c @@ -21,7 +21,7 @@ */ #include "taler/platform.h" #include <gnunet/gnunet_util_lib.h> -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include <unistr.h> diff --git a/src/json/json_helper.c b/src/json/json_helper.c @@ -22,7 +22,7 @@ */ #include "taler/platform.h" #include <gnunet/gnunet_util_lib.h> -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" diff --git a/src/json/json_pack.c b/src/json/json_pack.c @@ -20,7 +20,7 @@ */ #include "taler/platform.h" #include <gnunet/gnunet_util_lib.h> -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" diff --git a/src/json/test_json.c b/src/json/test_json.c @@ -20,7 +20,7 @@ * @author Christian Grothoff <christian@grothoff.org> */ #include "taler/platform.h" -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" diff --git a/src/lib/donau_api_handle.h b/src/lib/donau_api_handle.h @@ -24,7 +24,7 @@ #include <gnunet/gnunet_curl_lib.h> #include "donau_service.h" -#include "taler_util.h" +#include <taler/taler_util.h> // #include "taler_curl_lib.h" diff --git a/src/pq/test_pq.c b/src/pq/test_pq.c @@ -19,7 +19,7 @@ * @author Christian Grothoff <christian@grothoff.org> */ #include "taler/platform.h" -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler_pq_lib.h" diff --git a/src/testing/test_donau_api.c b/src/testing/test_donau_api.c @@ -24,7 +24,7 @@ * @author Marcello Stanisci */ #include "taler/platform.h" -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler_signatures.h" #include "taler_donau_service.h" #include "taler/taler_json_lib.h" diff --git a/src/testing/testing_api_cmd_insert_deposit.c b/src/testing/testing_api_cmd_insert_deposit.c @@ -23,7 +23,7 @@ * @author Christian Grothoff */ #include "taler/platform.h" -#include "taler_util.h" +#include <taler/taler_util.h> #include "taler/taler_json_lib.h" #include <gnunet/gnunet_curl_lib.h> #include "taler_signatures.h" diff --git a/src/util/donau_os_installation.c b/src/util/donau_os_installation.c @@ -0,0 +1,70 @@ +/* + This file is part of GNU Taler. + Copyright (C) 2016 Taler Systems SA + + Taler 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, or (at your + option) any later version. + + Taler 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 Taler; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ +/** + * @file os_installation.c + * @brief initialize libgnunet OS subsystem for Taler. + * @author Christian Grothoff + */ +#include "platform.h" +#include <gnunet/gnunet_util_lib.h> + + +/** + * Default project data used for installation path detection + * for Donau of GNU Taler. + */ +static const struct GNUNET_OS_ProjectData donau_pd = { + .libname = "libtalerutil", + .project_dirname = "taler-donau", + .binary_name = "taler-donau-httpd", + .env_varname = "TALER_PREFIX", + .base_config_varname = "TALER_BASE_CONFIG", + .bug_email = "taler@gnu.org", + .homepage = "http://www.gnu.org/s/taler/", + .config_file = "taler.conf", + .user_config_file = "~/.config/donau.conf", + .version = PACKAGE_VERSION "-" VCS_VERSION, + .is_gnu = 1, + .gettext_domain = "taler", + .gettext_path = NULL, +}; + + +/** + * Return default project data used by Taler. + */ +const struct GNUNET_OS_ProjectData * +TALER_project_data_default (void) +{ + return &taler_pd; +} + + +/** + * Initialize libtalerutil. + */ +void __attribute__ ((constructor)) +DONAU_OS_init () +{ + GNUNET_OS_init (&donau_pd); +} + + +/* end of os_installation.c */