summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2020-10-14 12:46:41 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2020-10-14 12:46:41 +0200
commitd2bb6342d6a812f3ff0dcf17180c0b01b85cacfb (patch)
tree662664ac398af8749af7f3c69bb298394a0fc057 /lib
parente9299c644a17b7ae6a91d3a4b6ccdd9acba443fe (diff)
parent8fc0a99f32ea083b2e0eee217c813cf36aa8c521 (diff)
downloadbarebox-d2bb6342d6a812f3ff0dcf17180c0b01b85cacfb.tar.gz
barebox-d2bb6342d6a812f3ff0dcf17180c0b01b85cacfb.tar.xz
Merge branch 'for-next/misc' into master
Diffstat (limited to 'lib')
-rw-r--r--lib/Kconfig2
-rw-r--r--lib/string.c13
2 files changed, 14 insertions, 1 deletions
diff --git a/lib/Kconfig b/lib/Kconfig
index 90552f3c27..887f50ff00 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -111,7 +111,7 @@ config LIBFDT
config RATP
select CRC_ITU_T
- select COMPILE_MEMORY
+ select DEV_MEM
select COMMAND_SUPPORT
select POLLER
depends on CONSOLE_FULL
diff --git a/lib/string.c b/lib/string.c
index 003070fa53..d250e58643 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -100,6 +100,19 @@ char * strcpy(char * dest,const char *src)
#endif
EXPORT_SYMBOL(strcpy);
+/**
+ * stpcpy - Copy a %NUL terminated string, but return pointer to %NUL
+ * @dest: Where to copy the string to
+ * @src: Where to copy the string from
+ */
+char *stpcpy(char *dest, const char *src)
+{
+ while ((*dest++ = *src++) != '\0')
+ /* nothing */;
+ return dest - 1;
+}
+EXPORT_SYMBOL(stpcpy);
+
#ifndef __HAVE_ARCH_STRNCPY
/**
* strncpy - Copy a length-limited, %NUL-terminated string