diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-08-01 12:33:46 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-08-01 12:33:46 +0000 |
commit | 9f028b17045b8e5c329a84010a182b0e69044728 (patch) | |
tree | bc8ccfd316f1b6ec6e5df4f44c7ef3e4bb0bec25 /src/util | |
parent | e666ca695d41c606c4fdc54fb52d04c0b8b85625 (diff) | |
download | gnunet-9f028b17045b8e5c329a84010a182b0e69044728.tar.gz gnunet-9f028b17045b8e5c329a84010a182b0e69044728.zip |
differ
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/Makefile.am | 9 | ||||
-rw-r--r-- | src/util/gnunet-config-diff.c | 28 |
2 files changed, 37 insertions, 0 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index bbe00cb2d..7371faf2e 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am | |||
@@ -25,6 +25,15 @@ if USE_COVERAGE | |||
25 | XLIB = -lgcov | 25 | XLIB = -lgcov |
26 | endif | 26 | endif |
27 | 27 | ||
28 | noinst_PROGRAMS = \ | ||
29 | gnunet-config-diff | ||
30 | |||
31 | gnunet_config_diff_SOURCES = \ | ||
32 | gnunet-config-diff.c | ||
33 | gnunet_config_diff_LDADD = \ | ||
34 | $(top_builddir)/src/util/libgnunetutil.la | ||
35 | |||
36 | |||
28 | lib_LTLIBRARIES = libgnunetutil.la | 37 | lib_LTLIBRARIES = libgnunetutil.la |
29 | 38 | ||
30 | libgnunetutil_la_SOURCES = \ | 39 | libgnunetutil_la_SOURCES = \ |
diff --git a/src/util/gnunet-config-diff.c b/src/util/gnunet-config-diff.c new file mode 100644 index 000000000..3c0af8f24 --- /dev/null +++ b/src/util/gnunet-config-diff.c | |||
@@ -0,0 +1,28 @@ | |||
1 | #include "platform.h" | ||
2 | #include <gnunet_util_lib.h> | ||
3 | |||
4 | int main(int argc, | ||
5 | char **argv) | ||
6 | { | ||
7 | struct GNUNET_CONFIGURATION_Handle *i1; | ||
8 | struct GNUNET_CONFIGURATION_Handle *i2; | ||
9 | |||
10 | if (argc != 3) | ||
11 | { | ||
12 | fprintf (stderr, | ||
13 | "Invoke using `%s DEFAULTS-IN DIFFS'\n", | ||
14 | argv[0]); | ||
15 | return 1; | ||
16 | } | ||
17 | i1 = GNUNET_CONFIGURATION_create (); | ||
18 | i2 = GNUNET_CONFIGURATION_create (); | ||
19 | if ( (GNUNET_OK != | ||
20 | GNUNET_CONFIGURATION_load (i1, argv[1])) || | ||
21 | (GNUNET_OK != | ||
22 | GNUNET_CONFIGURATION_load (i2, argv[2])) ) | ||
23 | return 1; | ||
24 | if (GNUNET_OK != | ||
25 | GNUNET_CONFIGURATION_write_diffs (i1, i2, argv[2])) | ||
26 | return 2; | ||
27 | return 0; | ||
28 | } | ||