<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/17153">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-sim-test: Recurse through subdirectories<br><br>Don't just iterate over all files in the current working<br>directory (cwd), but also recurse through all sub-directories.<br><br>Change-Id: I737b01d9a845e37d8be9d4709ef0de04e749daec<br>---<br>M utils/osmo-sim-test.c<br>1 file changed, 39 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/53/17153/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/utils/osmo-sim-test.c b/utils/osmo-sim-test.c</span><br><span>index cd98397..ea3ce2a 100644</span><br><span>--- a/utils/osmo-sim-test.c</span><br><span>+++ b/utils/osmo-sim-test.c</span><br><span>@@ -374,6 +374,44 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void iterate_fs(struct osim_chan_hdl *chan)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osim_file_desc *prev_cwd;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osim_file_desc *ofd;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* iterate over all files in current working directory */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(ofd, &chan->cwd->child_list, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *m;</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\n\n================ %s (%s) ==================\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ ofd->short_name, ofd->long_name);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ m = select_file(chan, ofd->fid);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msgb_apdu_sw(m) != 0x9000) {</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(m);</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ dump_fcp_template_msg(m);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(m);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If this is a DF, recurse into it */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (ofd->type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case TYPE_DF:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* the select above has just changed into this directory */</span><br><span style="color: hsl(120, 100%, 40%);">+ prev_cwd = chan->cwd;</span><br><span style="color: hsl(120, 100%, 40%);">+ chan->cwd = ofd;</span><br><span style="color: hsl(120, 100%, 40%);">+ iterate_fs(chan);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* "pop" the directory from the stack */</span><br><span style="color: hsl(120, 100%, 40%);">+ chan->cwd = prev_cwd;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ dump_file(chan, ofd->fid);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span> struct osim_reader_hdl *reader;</span><br><span>@@ -410,19 +448,7 @@</span><br><span> dump_fcp_template_msg(msg);</span><br><span> msgb_free(msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- struct osim_file_desc *ofd;</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(ofd, &chan->cwd->child_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *m;</span><br><span style="color: hsl(0, 100%, 40%);">- printf("\n\n================ %s (%s) ==================\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->short_name, ofd->long_name);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- m = select_file(chan, ofd->fid);</span><br><span style="color: hsl(0, 100%, 40%);">- dump_fcp_template_msg(m);</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(m);</span><br><span style="color: hsl(0, 100%, 40%);">- dump_file(chan, ofd->fid);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ iterate_fs(chan);</span><br><span> </span><br><span> exit(0);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/17153">change 17153</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/c/libosmocore/+/17153"/><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-Change-Id: I737b01d9a845e37d8be9d4709ef0de04e749daec </div>
<div style="display:none"> Gerrit-Change-Number: 17153 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>