mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 16/18] scripts: kwbimage: fix build with non-glibc systems
Date: Mon, 27 May 2019 11:57:42 +0200	[thread overview]
Message-ID: <20190527095744.5923-17-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20190527095744.5923-1-a.fatoum@pengutronix.de>

get_current_dir_name is a glibc extension, thus replace it
with a call to standard POSIX pathconf/malloc/gecwd.

The result slightly differs, because get_current_dir_name consults
the $PWD environment variable as as well, but that's ok, as it's
just an error message.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 scripts/kwbimage.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/kwbimage.c b/scripts/kwbimage.c
index 2a052a7ff385..6ba4abaa3076 100644
--- a/scripts/kwbimage.c
+++ b/scripts/kwbimage.c
@@ -860,12 +860,16 @@ static void *image_create_v1(struct image_cfg_element *image_cfg,
 
 		ret = stat(binarye->binary.file, &s);
 		if (ret < 0) {
-			char *cwd = get_current_dir_name();
+			char *buf, *cwd = NULL;
+			size_t size = (size_t)pathconf(".", _PC_PATH_MAX);
+			buf = malloc(size);
+			if (buf)
+				cwd = getcwd(buf, size);
 			fprintf(stderr,
 				"Didn't find the file '%s' in '%s' which is mandatory to generate the image\n"
 				"This file generally contains the DDR3 training code, and should be extracted from an existing bootable\n"
 				"image for your board. See 'kwbimage -x' to extract it from an existing image.\n",
-				binarye->binary.file, cwd);
+				binarye->binary.file, cwd ? cwd : "current working directory");
 			free(cwd);
 			return NULL;
 		}
-- 
2.20.1


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

  parent reply	other threads:[~2019-05-27  9:57 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-27  9:57 [PATCH 00/18] scripts: enable compilation on macOS Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 01/18] kbuild: suppress warnings from 'getconf LFS_*' Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 02/18] kbuild: Use ls(1) instead of stat(1) to obtain file size Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 03/18] scripts: extract symbol offsets using target, not host, nm Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 04/18] scripts: includes: restrict strlcpy prototype to glibc Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 05/18] scripts: compiler.h: don't include <stdint.h> twice Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 06/18] scripts: don't depend on system <asm/types.h> Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 07/18] scripts: bareboxcrc32: remove usage of loff_t Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 08/18] scripts: bareboximd: " Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 09/18] scripts: compiler.h: add endianness helpers for macOS Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 10/18] scripts: use "compiler.h" endianness helpers Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 11/18] scripts: mkimage: s/fdatasync/fsync/ on macOS & OpenBSD Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 12/18] scripts: removes uses of <asm*/errno.h> in favor of <errno.h> Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 13/18] scripts: omap3-usb-loader: don't depend on unportable le32toh Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 14/18] scripts: omap3-usb-loader: drop unneeded header Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 15/18] scripts: imx-usb-loader: don't depend on unportable headers Ahmad Fatoum
2019-05-27  9:57 ` Ahmad Fatoum [this message]
2019-05-27  9:57 ` [PATCH 17/18] scripts: compiler.h: use Linux <endian.h> as default Ahmad Fatoum
2019-05-27  9:57 ` [PATCH 18/18] scripts: compiler.h: support BSDs as well Ahmad Fatoum
2019-05-28  8:36 ` [PATCH 00/18] scripts: enable compilation on macOS Sascha 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=20190527095744.5923-17-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --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