<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12897">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add multipatch capability to osmo-config-merge<br><br>That's pretty straightforward and convenient extention: handle all<br>extra positional arguments as patch file names. This makes it similar to<br>'cp' and other basic tools. For example:<br>osmo-config-merge base.cfg patch1.cfg patch2.cfg patch3.cfg<br>will apply 3 patches to th base config file.<br><br>Change-Id: I212cbdc3bf6f251c1a3175737ac74242fb004c6d<br>---<br>M utils/osmo-config-merge.c<br>1 file changed, 43 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/97/12897/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/utils/osmo-config-merge.c b/utils/osmo-config-merge.c</span><br><span>index afaf86b..b29a331 100644</span><br><span>--- a/utils/osmo-config-merge.c</span><br><span>+++ b/utils/osmo-config-merge.c</span><br><span>@@ -49,6 +49,7 @@</span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/msgfile.h></span><br><span> </span><br><span> struct node {</span><br><span> struct node *parent; /* back-pointer */</span><br><span>@@ -57,6 +58,11 @@</span><br><span> char *line;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_patch_entry {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head list;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct node *tree;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* allocate a new node */</span><br><span> static struct node *node_alloc(void *ctx)</span><br><span> {</span><br><span>@@ -225,49 +231,65 @@</span><br><span> </span><br><span> static void exit_usage(int rc)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Usage: osmo-config-merge <config-file> <config-patch> [--debug]\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Usage: osmo-config-merge <config-file> <config-patch>...<config-patch> [--debug]\n");</span><br><span> exit(rc);</span><br><span> }</span><br><span> </span><br><span> </span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- const char *base_fname, *patch_fname;</span><br><span style="color: hsl(0, 100%, 40%);">- struct node *base_tree, *patch_tree;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct node *base_tree;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_config_list *trees;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_patch_entry *entry;</span><br><span> bool debug_enabled = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned i;</span><br><span> void *ctx;</span><br><span> </span><br><span> if (argc < 3)</span><br><span> exit_usage(1);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- base_fname = argv[1];</span><br><span style="color: hsl(0, 100%, 40%);">- patch_fname = argv[2];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (argc > 3) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!strcmp(argv[3], "--debug"))</span><br><span style="color: hsl(0, 100%, 40%);">- debug_enabled = true;</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- exit_usage(1);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> ctx = talloc_named_const(NULL, 0, "root");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- base_tree = file_read(ctx, base_fname);</span><br><span style="color: hsl(0, 100%, 40%);">- patch_tree = file_read(ctx, patch_fname);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!base_tree || ! patch_tree) {</span><br><span style="color: hsl(120, 100%, 40%);">+ base_tree = file_read(ctx, argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+ trees = talloc_zero(ctx, struct osmo_config_list);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!base_tree || !trees) {</span><br><span> talloc_free(ctx);</span><br><span> return 2;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&trees->entry);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 2; i < argc; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(argv[3], "--debug"))</span><br><span style="color: hsl(120, 100%, 40%);">+ debug_enabled = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ else {</span><br><span style="color: hsl(120, 100%, 40%);">+ entry = talloc_zero(trees, struct osmo_patch_entry);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!entry)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 3;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ entry->tree = file_read(ctx, argv[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!entry->tree) {</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add_tail(&entry->list, &trees->entry);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (llist_empty(&trees->entry))</span><br><span style="color: hsl(120, 100%, 40%);">+ exit_usage(1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (debug_enabled) {</span><br><span> fprintf(stderr, "====== dumping tree (base)\n");</span><br><span> dump_node(base_tree, stderr, true);</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "====== dumping tree (patch)\n");</span><br><span style="color: hsl(0, 100%, 40%);">- dump_node(patch_tree, stderr, true);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- append_patch(base_tree, patch_tree);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(entry, &trees->entry, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ append_patch(base_tree, entry->tree);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (debug_enabled) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "====== dumping tree (patch)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ dump_node(entry->tree, stderr, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> if (debug_enabled)</span><br><span> fprintf(stderr, "====== dumping tree (patched)\n");</span><br><span>@@ -275,7 +297,7 @@</span><br><span> fflush(stdout);</span><br><span> </span><br><span> /* make AddressSanitizer / LeakSanitizer happy by recursively freeing the trees */</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(patch_tree);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(trees);</span><br><span> talloc_free(base_tree);</span><br><span> talloc_free(ctx);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12897">change 12897</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12897"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I212cbdc3bf6f251c1a3175737ac74242fb004c6d </div>
<div style="display:none"> Gerrit-Change-Number: 12897 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>