mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: "Baeuerle, Florian" <Florian.Baeuerle@allegion.com>
To: "barebox@lists.infradead.org" <barebox@lists.infradead.org>
Subject: [PATCH 2/2] envfs: fix problem #2
Date: Tue, 8 Jan 2019 09:48:46 +0000	[thread overview]
Message-ID: <20190108094829.20913-2-florian.baeuerle@allegion.com> (raw)
In-Reply-To: <20190108094829.20913-1-florian.baeuerle@allegion.com>

Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
 lib/recursive_action.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/recursive_action.c b/lib/recursive_action.c
index 4ccddc39b..9505c8628 100644
--- a/lib/recursive_action.c
+++ b/lib/recursive_action.c
@@ -149,7 +149,7 @@ int recursive_action(const char *fileName,
 
 		if (DO_SORT(flags)) {
 			struct dirlist *e = xmalloc(sizeof(*e));
-			e->dirname = xstrdup(next->d_name);
+			e->dirname = nextFile;
 			list_add(&e->list, &dirs);
 		} else {
 			/* descend into it, forcing recursion. */
@@ -157,8 +157,8 @@ int recursive_action(const char *fileName,
 						fileAction, dirAction, userData, depth+1)) {
 				status = 0;
 			}
+			free(nextFile);
 		}
-		free(nextFile);
 	}
 
 	if (DO_SORT(flags)) {
-- 
2.19.2

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2019-01-08  9:48 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-13 15:47 bareboxenv -s: output depends on filesystem Baeuerle, Florian
2018-12-17 10:53 ` Sascha Hauer
2018-12-18 13:22   ` [PATCH 1/2] recursive_action: add ACTION_SORT flag Baeuerle, Florian
2018-12-18 13:22     ` [PATCH 2/2] envfs: new flag for sorting env before saving Baeuerle, Florian
2018-12-19 12:42     ` [PATCH 1/2] recursive_action: add ACTION_SORT flag Baeuerle, Florian
2018-12-19 14:02     ` [PATCH v2 " Baeuerle, Florian
2018-12-19 14:02       ` [PATCH v2 2/2] envfs: new flag for sorting env before saving Baeuerle, Florian
2019-01-03 10:59       ` [PATCH v2 1/2] recursive_action: add ACTION_SORT flag Sascha Hauer
2019-01-03 11:53         ` Baeuerle, Florian
2019-01-07  7:58           ` s.hauer
2019-01-08  9:47             ` Baeuerle, Florian
2019-01-08  9:48               ` [PATCH 1/2] envfs: fix problem #1 Baeuerle, Florian
2019-01-08  9:48                 ` Baeuerle, Florian [this message]
2019-01-08 15:40               ` [PATCH v2 1/2] recursive_action: add ACTION_SORT flag s.hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190108094829.20913-2-florian.baeuerle@allegion.com \
    --to=florian.baeuerle@allegion.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox