aboutsummaryrefslogtreecommitdiff
path: root/libbb/concat_path_file.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2017-11-03 14:16:08 +0000
committerRon Yorston <rmy@pobox.com>2017-11-03 14:16:08 +0000
commitd6ce08aeb85b3698ddaa281016b70e16aeb9fb35 (patch)
tree02ad9bc0684859515fe891f3d6b0a1086e0db156 /libbb/concat_path_file.c
parentab450021a99ba66126cc6d668fb06ec3829a572b (diff)
parenta5060b8364faa7c677c8950f1315c451403b0660 (diff)
downloadbusybox-w32-d6ce08aeb85b3698ddaa281016b70e16aeb9fb35.tar.gz
busybox-w32-d6ce08aeb85b3698ddaa281016b70e16aeb9fb35.tar.bz2
busybox-w32-d6ce08aeb85b3698ddaa281016b70e16aeb9fb35.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'libbb/concat_path_file.c')
-rw-r--r--libbb/concat_path_file.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c
index 9ed295996..5b4b7f113 100644
--- a/libbb/concat_path_file.c
+++ b/libbb/concat_path_file.c
@@ -7,6 +7,7 @@
7 * 7 *
8 * Licensed under GPLv2 or later, see file LICENSE in this source tree. 8 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
9 */ 9 */
10#include "libbb.h"
10 11
11/* Concatenate path and filename to new allocated buffer. 12/* Concatenate path and filename to new allocated buffer.
12 * Add '/' only as needed (no duplicate // are produced). 13 * Add '/' only as needed (no duplicate // are produced).
@@ -14,8 +15,6 @@
14 * filename should not be NULL. 15 * filename should not be NULL.
15 */ 16 */
16 17
17#include "libbb.h"
18
19char* FAST_FUNC concat_path_file(const char *path, const char *filename) 18char* FAST_FUNC concat_path_file(const char *path, const char *filename)
20{ 19{
21 char *lc; 20 char *lc;