diff options
author | Ron Yorston <rmy@pobox.com> | 2017-08-22 14:56:12 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2017-08-22 14:56:12 +0100 |
commit | ce9af1cc5ea23f754587448cf35b5120c77bfeef (patch) | |
tree | 69e5eaba5e75ab909ed92d5045393471b8ff3c13 /coreutils/realpath.c | |
parent | c170026700eabb10147dd848c45c06995b43a32e (diff) | |
parent | e837a0dbbebf4229306df98fe9ee3b9bb30630c4 (diff) | |
download | busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.tar.gz busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.tar.bz2 busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'coreutils/realpath.c')
-rw-r--r-- | coreutils/realpath.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/coreutils/realpath.c b/coreutils/realpath.c index 6a61c3dc8..f9c630135 100644 --- a/coreutils/realpath.c +++ b/coreutils/realpath.c | |||
@@ -13,7 +13,7 @@ | |||
13 | //config: Return the canonicalized absolute pathname. | 13 | //config: Return the canonicalized absolute pathname. |
14 | //config: This isn't provided by GNU shellutils, but where else does it belong. | 14 | //config: This isn't provided by GNU shellutils, but where else does it belong. |
15 | 15 | ||
16 | //applet:IF_REALPATH(APPLET(realpath, BB_DIR_USR_BIN, BB_SUID_DROP)) | 16 | //applet:IF_REALPATH(APPLET_NOFORK(realpath, realpath, BB_DIR_USR_BIN, BB_SUID_DROP, realpath)) |
17 | 17 | ||
18 | //kbuild:lib-$(CONFIG_REALPATH) += realpath.o | 18 | //kbuild:lib-$(CONFIG_REALPATH) += realpath.o |
19 | 19 | ||
@@ -36,6 +36,7 @@ int realpath_main(int argc UNUSED_PARAM, char **argv) | |||
36 | } | 36 | } |
37 | 37 | ||
38 | do { | 38 | do { |
39 | /* NOFORK: only one alloc is allowed; must free */ | ||
39 | char *resolved_path = xmalloc_realpath(*argv); | 40 | char *resolved_path = xmalloc_realpath(*argv); |
40 | if (resolved_path != NULL) { | 41 | if (resolved_path != NULL) { |
41 | puts(resolved_path); | 42 | puts(resolved_path); |