From c756a8a89d6970090b060a179dcabb93a67d8f21 Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Thu, 10 Nov 2022 09:38:50 -0500 Subject: make splash split on control characters splits on spaces also considers \r\n\f\v\t as mandatory breaks I'm still working on the strptokspn function my goal is to use it directly rather than storing the matched char and modifying the source string with \0 in order to tokenize the output --Done Change-Id: I7f378b5b9c4df8f10899b9a55a98950afb3931dc --- firmware/SOURCES | 64 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 31 deletions(-) (limited to 'firmware/SOURCES') diff --git a/firmware/SOURCES b/firmware/SOURCES index bbd67631a9..4aa7c38daf 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -205,39 +205,10 @@ target/hosted/samsungypr/ypr1/wmcodec-ypr1.c target/hosted/maemo/maemo-thread.c #endif -/* Standard library */ -#if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(__MINGW32__) || defined(__CYGWIN__) -libc/strtok.c -#endif /* PLATFORM_NATIVE || __MINGW32__ || __CYGWIN__ */ -#if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(HAVE_ROCKBOX_C_LIBRARY) -libc/atoi.c -libc/errno.c -#if (CONFIG_PLATFORM & PLATFORM_NATIVE) -/* our ctype.[ch] comes from newlib and is incompitble with most desktop's ctype */ -libc/ctype.c -/* alsa on linux requires a more advanced sprintf, i.e. not ours */ -libc/sprintf.c -#endif - -libc/memchr.c -libc/memcmp.c - -libc/qsort.c -libc/random.c -libc/strcat.c -libc/strchr.c -libc/strcmp.c -libc/strcpy.c - -libc/strncmp.c -libc/strrchr.c -libc/strstr.c -libc/mktime.c -libc/gmtime.c -#endif /* CONFIG_PLATFORM || HAVE_ROCKBOX_C_LIBRARY */ - /* Common */ #ifndef BOOTLOADER +common/strptokspn.c +#define HAVE_STRTOK_R common/ap_int.c #endif common/version.c @@ -277,6 +248,37 @@ common/zip.c common/adler32.c common/inflate.c +/* Standard library */ +#if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(__MINGW32__) || defined(__CYGWIN__) +libc/strtok.c +#endif /* PLATFORM_NATIVE || __MINGW32__ || __CYGWIN__ */ +#if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(HAVE_ROCKBOX_C_LIBRARY) +libc/atoi.c +libc/errno.c +#if (CONFIG_PLATFORM & PLATFORM_NATIVE) +/* our ctype.[ch] comes from newlib and is incompitble with most desktop's ctype */ +libc/ctype.c +/* alsa on linux requires a more advanced sprintf, i.e. not ours */ +libc/sprintf.c +#endif + +libc/memchr.c +libc/memcmp.c + +libc/qsort.c +libc/random.c +libc/strcat.c +libc/strchr.c +libc/strcmp.c +libc/strcpy.c + +libc/strncmp.c +libc/strrchr.c +libc/strstr.c +libc/mktime.c +libc/gmtime.c +#endif /* CONFIG_PLATFORM || HAVE_ROCKBOX_C_LIBRARY */ + /* Display */ scroll_engine.c -- cgit v1.2.3