[GNUnet-SVN] r16274 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2011-08-01 14:33:46 +0200 (Mon, 01 Aug 2011)
New Revision: 16274

Added:
   gnunet/src/util/gnunet-config-diff.c
Modified:
   gnunet/src/util/Makefile.am
Log:
differ

Modified: gnunet/src/util/Makefile.am
===================================================================
--- gnunet/src/util/Makefile.am 2011-08-01 12:18:45 UTC (rev 16273)
+++ gnunet/src/util/Makefile.am 2011-08-01 12:33:46 UTC (rev 16274)
@@ -25,6 +25,15 @@
   XLIB = -lgcov
 endif
 
+noinst_PROGRAMS = \
+ gnunet-config-diff
+
+gnunet_config_diff_SOURCES = \
+ gnunet-config-diff.c
+gnunet_config_diff_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
+
 lib_LTLIBRARIES = libgnunetutil.la
 
 libgnunetutil_la_SOURCES = \

Added: gnunet/src/util/gnunet-config-diff.c
===================================================================
--- gnunet/src/util/gnunet-config-diff.c                                (rev 0)
+++ gnunet/src/util/gnunet-config-diff.c        2011-08-01 12:33:46 UTC (rev 
16274)
@@ -0,0 +1,28 @@
+#include "platform.h"
+#include <gnunet_util_lib.h>
+
+int main(int argc,
+        char **argv)
+{
+  struct GNUNET_CONFIGURATION_Handle *i1;
+  struct GNUNET_CONFIGURATION_Handle *i2;
+
+  if (argc != 3)
+    {
+      fprintf (stderr,
+              "Invoke using `%s DEFAULTS-IN DIFFS'\n",
+              argv[0]);
+      return 1;
+    }
+  i1 = GNUNET_CONFIGURATION_create ();
+  i2 = GNUNET_CONFIGURATION_create ();
+  if ( (GNUNET_OK !=
+       GNUNET_CONFIGURATION_load (i1, argv[1])) ||
+       (GNUNET_OK !=
+       GNUNET_CONFIGURATION_load (i2, argv[2])) )
+    return 1;
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_write_diffs (i1, i2, argv[2]))
+    return 2;
+  return 0;
+}