commit f7d61a876473f5e53126818dc88453839ad1d49c
parent 05b07145229761205c4c245294b818df76c7c84f
Author: Christian Grothoff <christian@grothoff.org>
Date: Wed, 20 Nov 2024 15:11:54 +0100
-get donau to build again
Diffstat:
14 files changed, 50 insertions(+), 53 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -20,7 +20,7 @@ AC_PREREQ([2.69])
AC_INIT([donau],[0.9.2],[taler-bug@gnunet.org])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_SRCDIR([src/util/charity_signatures.c])
-AC_CONFIG_HEADERS([taler_config.h])
+AC_CONFIG_HEADERS([donau_config.h])
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
AC_CANONICAL_BUILD
diff --git a/src/donaudb/donaudb_plugin.c b/src/donaudb/donaudb_plugin.c
@@ -18,7 +18,8 @@
* @brief Logic to load database plugin
* @author Johannes Casaburi
*/
-#include <taler/platform.h>
+#include "donau_config.h"
+#include "donau_util.h"
#include "donaudb_plugin.h"
#include <ltdl.h>
@@ -45,7 +46,8 @@ DONAUDB_plugin_load (const struct GNUNET_CONFIGURATION_Handle *cfg)
"libtaler_plugin_donaudb_%s",
plugin_name);
GNUNET_free (plugin_name);
- plugin = GNUNET_PLUGIN_load (lib_name,
+ plugin = GNUNET_PLUGIN_load (DONAU_project_data (),
+ lib_name,
(void *) cfg);
if (NULL != plugin)
plugin->library_name = lib_name;
diff --git a/src/donaudb/plugin_donaudb_postgres.c b/src/donaudb/plugin_donaudb_postgres.c
@@ -19,7 +19,7 @@
* @brief Low-level (statement-level) Postgres database access for the donau
* @author Johannes Casaburi
*/
-#include <taler/platform.h>
+#include "donau_config.h"
#include <poll.h>
#include <pthread.h>
#include <libpq-fe.h>
@@ -183,6 +183,7 @@ libtaler_plugin_donaudb_postgres_init (void *cls)
}
if (GNUNET_OK !=
TALER_config_get_currency (cfg,
+ "donau",
&pg->currency))
{
GNUNET_free (pg->donau_url);
diff --git a/src/include/donau_util.h b/src/include/donau_util.h
@@ -14,7 +14,7 @@
TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
/**
- * @file include/taler_util.h
+ * @file include/donau_util.h
* @brief Interface for common utility functions
* @author Sree Harsha Totakura <sreeharsha@totakura.in>
*/
@@ -33,15 +33,9 @@
* Return default project data used by Taler.
*/
const struct GNUNET_OS_ProjectData *
-DONAU_project_data_default (void);
+DONAU_project_data (void);
-/**
- * Initialize libdonauutil.
- */
-void
-DONAU_OS_init (void);
-
// FIXME: remove public key, only needed for testing.
/**
* Generates the String for the QR Code containing the donation statement.
diff --git a/src/json/donau_json.c b/src/json/donau_json.c
@@ -18,7 +18,7 @@
* @brief helper functions for JSON processing using libjansson
* @author Lukas Matyja
*/
-#include <taler/platform.h>
+#include "donau_config.h"
#include <gnunet/gnunet_util_lib.h>
#include <taler/taler_util.h>
#include <taler/taler_json_lib.h>
@@ -558,4 +558,4 @@ DONAU_JSON_pack_blinded_donation_identifier (
}
-/* end of json/donau_json.c */
-\ No newline at end of file
+/* end of json/donau_json.c */
diff --git a/src/json/json.c b/src/json/json.c
@@ -19,7 +19,7 @@
* @author Sree Harsha Totakura <sreeharsha@totakura.in>
* @author Christian Grothoff
*/
-#include <taler/platform.h>
+#include "donau_config.h"
#include <gnunet/gnunet_util_lib.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
@@ -19,7 +19,7 @@
* @author Christian Grothoff
* @author Lukas Matyja
*/
-#include <taler/platform.h>
+#include "donau_config.h"
#include <gnunet/gnunet_util_lib.h>
#include <taler/taler_util.h>
#include <taler/taler_json_lib.h>
diff --git a/src/pq/pq_result_helper.c b/src/pq/pq_result_helper.c
@@ -18,7 +18,7 @@
* @brief functions to initialize parameter arrays
* @author Johannes Casaburi
*/
-#include <taler/platform.h>
+#include "donau_config.h"
#include <taler/taler_pq_lib.h>
#include <donau_util.h>
diff --git a/src/util/charity_signatures.c b/src/util/charity_signatures.c
@@ -19,9 +19,8 @@
* @author Christian Grothoff
* @author Lukas Matyja
*/
-#include <taler/platform.h>
-#include <taler/taler_util.h>
#include "donau_util.h"
+#include <taler/taler_util.h>
#include <gnunet/gnunet_common.h>
#include <taler/taler_signatures.h>
#include "donau_signatures.h"
diff --git a/src/util/donau-config.c b/src/util/donau-config.c
@@ -23,8 +23,19 @@
* @brief tool to access and manipulate Taler configuration files
* @author Christian Grothoff
*/
-#include "platform.h"
-#include <taler/taler_util_lib.h>
+#include "donau_config.h"
+#include "donau_util.h"
+#include <taler/taler_util.h>
+
+
+/* LSB-style exit status codes */
+#ifndef EXIT_INVALIDARGUMENT
+/**
+ * Command-line arguments are invalid.
+ * Restarting useless.
+ */
+#define EXIT_INVALIDARGUMENT 2
+#endif
/**
@@ -43,12 +54,16 @@ main (int argc,
.global_ret = EXIT_SUCCESS
};
struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_option_help (DONAU_project_data (),
+ "donau-config [OPTIONS]"),
+ GNUNET_GETOPT_option_version (DONAU_project_data ()->version),
+ GNUNET_CONFIGURATION_CONFIG_OPTIONS (&cs),
GNUNET_GETOPT_OPTION_END
};
enum GNUNET_GenericReturnValue ret;
- TALER_OS_init ();
- ret = GNUNET_PROGRAM_run (argc,
+ ret = GNUNET_PROGRAM_run (DONAU_project_data (),
+ argc,
argv,
"donau-config [OPTIONS]",
gettext_noop (
diff --git a/src/util/donau_crypto.c b/src/util/donau_crypto.c
@@ -18,7 +18,7 @@
* @brief Cryptographic utility functions
* @author Lukas Matyja
*/
-#include <taler/platform.h>
+#include "donau_config.h"
#include <taler/taler_util.h>
#include "donau_util.h"
#include <gcrypt.h>
@@ -295,4 +295,4 @@ DONAU_donation_unit_ewv_copy (struct DONAU_BatchIssueValues *bi_dst,
}
bi_dst->blinding_inputs
= GNUNET_CRYPTO_blinding_input_values_incref (bi_src->blinding_inputs);
-}
-\ No newline at end of file
+}
diff --git a/src/util/donau_os_installation.c b/src/util/donau_os_installation.c
@@ -23,7 +23,7 @@
* @author Christian Grothoff
* @author Lukas Matyja
*/
-#include <taler/platform.h>
+#include "donau_config.h"
#include <taler/taler_util.h>
#include <gnunet/gnunet_util_lib.h>
@@ -53,21 +53,10 @@ static const struct GNUNET_OS_ProjectData donau_pd = {
* Return default project data used by Donau.
*/
const struct GNUNET_OS_ProjectData *
-DONAU_project_data_default (void)
+DONAU_project_data (void)
{
return &donau_pd;
}
-/**
- * Initialize libtalerutil.
- */
-void __attribute__ ((constructor))
-DONAU_OS_init ()
-{
- GNUNET_OS_init (TALER_project_data_default ());
- GNUNET_OS_init (&donau_pd);
-}
-
-
/* end of donau_os_installation.c */
diff --git a/src/util/donau_signatures.c b/src/util/donau_signatures.c
@@ -19,7 +19,7 @@
* @author Christian Grothoff
* @author Lukas Matyja
*/
-#include <taler/platform.h>
+#include "donau_config.h"
#include <taler/taler_util.h>
#include <taler/taler_signatures.h>
#include "donau_util.h"
diff --git a/src/util/qr.c b/src/util/qr.c
@@ -18,7 +18,7 @@
* @brief Utility functions for donation statement QR Code
* @author Lukas Matyja
*/
-#include <taler/platform.h>
+#include "donau_config.h"
#include <taler/taler_util.h>
#include "donau_util.h"
#include "donau_service.h"
@@ -60,15 +60,15 @@ generate_QR_string (const struct DONAU_DonauPublicKeyP *pub_key,
char *qr_string = GNUNET_malloc (total_size + 1);
GNUNET_assert (0 <= GNUNET_snprintf (qr_string,
- total_size,
- "%llu/%s/%s/%s/%s/%s",
- (unsigned long long)
- donation_statement->year,
- total_amount_string,
- donation_statement->donor_tax_id,
- donation_statement->salt,
- sig_str,
- pub_str));
+ total_size,
+ "%llu/%s/%s/%s/%s/%s",
+ (unsigned long long)
+ donation_statement->year,
+ total_amount_string,
+ donation_statement->donor_tax_id,
+ donation_statement->salt,
+ sig_str,
+ pub_str));
return qr_string;
-}
-\ No newline at end of file
+}
