- devel - example.com

[PATCH] sysconf: Support _SC_(AV)?PHYS_PAGES.
by Nicolas Cavallari 17 Jun '16

17 Jun '16

Do it by following the trail of the existing commented code, which implemented it by calling get_phys_pages() and get_avphys_pages(). This patch implements these two functions, which are also glibc extensions. Some program/libraries (e.g. libuv) assumes that sysconf(_SC_PHYS_PAGES) works on linux and never check for -1, thus they report an insane amount of memory. Signed-off-by: Nicolas Cavallari <nicolas.cavallari(a)green-communications.fr> --- include/sys/sysinfo.h | 2 -- libc/unistd/sysconf.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/include/sys/sysinfo.h b/include/sys/sysinfo.h index 00e3633..4e756e9 100644 --- a/include/sys/sysinfo.h +++ b/include/sys/sysinfo.h @@ -56,13 +56,11 @@ extern int sysinfo (struct sysinfo *__info) __THROW; #define get_nprocs() (sysconf(_SC_NPROCESSORS_ONLN)) -#if 0 /* Return number of physical pages of memory in the system. */ extern long int get_phys_pages (void) __THROW; /* Return number of available physical pages of memory in the system. */ extern long int get_avphys_pages (void) __THROW; -#endif __END_DECLS diff --git a/libc/unistd/sysconf.c b/libc/unistd/sysconf.c index 503b395..3d3b1a5 100644 --- a/libc/unistd/sysconf.c +++ b/libc/unistd/sysconf.c @@ -43,6 +43,32 @@ #include <dirent.h> #include "internal/parse_config.h" +long int get_phys_pages(void) +{ + struct sysinfo si; + int ps = getpagesize();; + + sysinfo(&si); + + if (ps >= si.mem_unit) + return si.totalram / (ps / si.mem_unit); + else + return si.totalram * (si.mem_unit / ps); +} + +long int get_avphys_pages(void) +{ + struct sysinfo si; + int ps = getpagesize();; + + sysinfo(&si); + + if (ps >= si.mem_unit) + return si.freeram / (ps / si.mem_unit); + else + return si.freeram * (si.mem_unit / ps); +} + static int nprocessors_onln(void) { char **l = NULL; @@ -747,18 +773,10 @@ long int sysconf(int name) RETURN_FUNCTION(nprocessors_onln()); case _SC_PHYS_PAGES: -#if 0 RETURN_FUNCTION(get_phys_pages()); -#else - RETURN_NEG_1; -#endif case _SC_AVPHYS_PAGES: -#if 0 RETURN_FUNCTION(get_avphys_pages()); -#else - RETURN_NEG_1; -#endif case _SC_ATEXIT_MAX: return __UCLIBC_MAX_ATEXIT; -- 2.8.1

2 1

[PATCH] test: regex: Make testregex return error count
by Vlad Zakharov 17 Jun '16

17 Jun '16

Testregex returned 0 even when some sub-tests inside the testregex failed. Now it returns error count. Signed-off-by: Vlad Zakharov <vzakhar(a)synopsys.com> --- test/regex/testregex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/regex/testregex.c b/test/regex/testregex.c index 993ac26..d18761d 100644 --- a/test/regex/testregex.c +++ b/test/regex/testregex.c @@ -2115,7 +2115,7 @@ old_main(int unused_param_argc, char** argv) if (fp != stdin) fclose(fp); } - return 0; + return state.errors; } int main(int argc, char **argv) -- 2.5.5

2 1

uClibc-ng - small C library for embedded systems branch master updated. v1.0.15-22-g0d3be3a
by wbx＠helium.openadk.org 17 Jun '16

17 Jun '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, master has been updated via 0d3be3a1d996093aa2ecd41ef8ae7192760aa79c (commit) via 199ffd4d10f8ef734032025e0a6847a9e2017bdd (commit) via 5e3d8e668238f1ebbf96843ceb0a699d73a16a38 (commit) via 766da4190705a32fbddd5d0fe61175d76ad31090 (commit) via 14b15ceb1e98ff9a3cacd99bc1a77ce02e8c8684 (commit) from e1eceda87b2fa64ab17f3e32c81b9a97edc7cac7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0d3be3a1d996093aa2ecd41ef8ae7192760aa79c Author: Vlad Zakharov <Vladislav.Zakharov(a)synopsys.com> Date: Thu Jun 16 18:29:09 2016 +0300 test: regex: Make testregex return error count Testregex returned 0 even when some sub-tests inside the testregex failed. Now it returns error count. Signed-off-by: Vlad Zakharov <vzakhar(a)synopsys.com> commit 199ffd4d10f8ef734032025e0a6847a9e2017bdd Author: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> Date: Fri Jun 10 16:00:22 2016 +0300 Fix hardcoded mmap offset mmap offset must be a multiple of the page size. It was hardcoded to 4K, so mmap2 test failed on non-4K page size architectures. Now we get page size using sysconf(_SC_PAGE_SIZE). Build and run tests done on nsim arc hs38. Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> commit 5e3d8e668238f1ebbf96843ceb0a699d73a16a38 Author: Nicolas Cavallari <nicolas.cavallari(a)green-communications.fr> Date: Tue Jun 14 15:12:18 2016 +0200 sysconf: Support _SC_(AV)?PHYS_PAGES. Do it by following the trail of the existing commented code, which implemented it by calling get_phys_pages() and get_avphys_pages(). This patch implements these two functions, which are also glibc extensions. Some program/libraries (e.g. libuv) assumes that sysconf(_SC_PHYS_PAGES) works on linux and never check for -1, thus they report an insane amount of memory. Signed-off-by: Nicolas Cavallari <nicolas.cavallari(a)green-communications.fr> commit 766da4190705a32fbddd5d0fe61175d76ad31090 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Wed Jun 15 20:42:29 2016 +0200 test: mmap2 is not ARM specific commit 14b15ceb1e98ff9a3cacd99bc1a77ce02e8c8684 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Mon Jun 13 22:32:54 2016 +0200 add MAINTAINERS information ----------------------------------------------------------------------- Summary of changes: MAINTAINERS | 11 +++++++++++ include/sys/sysinfo.h | 2 -- libc/unistd/sysconf.c | 34 ++++++++++++++++++++++++++-------- test/mmap/Makefile.in | 4 ---- test/mmap/{mmap-arm.c => mmap2.c} | 2 +- test/regex/testregex.c | 2 +- 6 files changed, 39 insertions(+), 16 deletions(-) create mode 100644 MAINTAINERS rename test/mmap/{mmap-arm.c => mmap2.c} (97%) diff --git a/MAINTAINERS b/MAINTAINERS new file mode 100644 index 0000000..cecfb24 --- /dev/null +++ b/MAINTAINERS @@ -0,0 +1,11 @@ +Maintainer: Waldemar Brodkorb <wbx(a)uclibc-ng.org> + +Acrhitecture specific maintainers, Acked-By needed for any architecture +specific changes: + +ARC: +Alexey Brodkin <Alexey.Brodkin(a)synopsys.com> +Vineet Gupta <Vineet.Gupta1(a)synopsys.com> + +Xtensa: +Max Filippov <jcmvbkbc(a)gmail.com> diff --git a/include/sys/sysinfo.h b/include/sys/sysinfo.h index 00e3633..4e756e9 100644 --- a/include/sys/sysinfo.h +++ b/include/sys/sysinfo.h @@ -56,13 +56,11 @@ extern int sysinfo (struct sysinfo *__info) __THROW; #define get_nprocs() (sysconf(_SC_NPROCESSORS_ONLN)) -#if 0 /* Return number of physical pages of memory in the system. */ extern long int get_phys_pages (void) __THROW; /* Return number of available physical pages of memory in the system. */ extern long int get_avphys_pages (void) __THROW; -#endif __END_DECLS diff --git a/libc/unistd/sysconf.c b/libc/unistd/sysconf.c index 503b395..3d3b1a5 100644 --- a/libc/unistd/sysconf.c +++ b/libc/unistd/sysconf.c @@ -43,6 +43,32 @@ #include <dirent.h> #include "internal/parse_config.h" +long int get_phys_pages(void) +{ + struct sysinfo si; + int ps = getpagesize();; + + sysinfo(&si); + + if (ps >= si.mem_unit) + return si.totalram / (ps / si.mem_unit); + else + return si.totalram * (si.mem_unit / ps); +} + +long int get_avphys_pages(void) +{ + struct sysinfo si; + int ps = getpagesize();; + + sysinfo(&si); + + if (ps >= si.mem_unit) + return si.freeram / (ps / si.mem_unit); + else + return si.freeram * (si.mem_unit / ps); +} + static int nprocessors_onln(void) { char **l = NULL; @@ -747,18 +773,10 @@ long int sysconf(int name) RETURN_FUNCTION(nprocessors_onln()); case _SC_PHYS_PAGES: -#if 0 RETURN_FUNCTION(get_phys_pages()); -#else - RETURN_NEG_1; -#endif case _SC_AVPHYS_PAGES: -#if 0 RETURN_FUNCTION(get_avphys_pages()); -#else - RETURN_NEG_1; -#endif case _SC_ATEXIT_MAX: return __UCLIBC_MAX_ATEXIT; diff --git a/test/mmap/Makefile.in b/test/mmap/Makefile.in index 7bb34ac..581f3b0 100644 --- a/test/mmap/Makefile.in +++ b/test/mmap/Makefile.in @@ -1,6 +1,2 @@ # uClibc mmap tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. - -ifneq ($(TARGET_ARCH),arm) -TESTS_DISABLED += mmap-arm -endif diff --git a/test/mmap/mmap-arm.c b/test/mmap/mmap2.c similarity index 97% rename from test/mmap/mmap-arm.c rename to test/mmap/mmap2.c index 8b94c61..1d5f5db 100644 --- a/test/mmap/mmap-arm.c +++ b/test/mmap/mmap2.c @@ -18,7 +18,7 @@ #define FATAL do { fprintf(stderr, "Error at line %d, file %s (%d) [%s]\n", \ __LINE__, __FILE__, errno, strerror(errno)); exit(1); } while(0) -#define MAP_SIZE 4096UL +#define MAP_SIZE sysconf(_SC_PAGESIZE) #define MAP_MASK (MAP_SIZE - 1) int main(int argc, char **argv) { diff --git a/test/regex/testregex.c b/test/regex/testregex.c index 993ac26..d18761d 100644 --- a/test/regex/testregex.c +++ b/test/regex/testregex.c @@ -2115,7 +2115,7 @@ old_main(int unused_param_argc, char** argv) if (fp != stdin) fclose(fp); } - return 0; + return state.errors; } int main(int argc, char **argv) hooks/post-receive -- uClibc-ng - small C library for embedded systems

1 0

tst-ethers test failing
by Eugeniy Paltsev 16 Jun '16

16 Jun '16

Hello, I'm running uclibc-1.0.15 testsuite on ARC and see "tst-ethers" fails. From what I may see "tst-ethers" test requires /etc/ethers to exist and to have host "teeth", otherwise it fails. This test passed on ARC and other architectures, as I can see at http:/ /tests.embedded-test.org/uClibc-ng/1.0.15/ , so I'm wondering if there's some dependency we need to have in place for this test to pass successfully? Or, maybe, we should create /etc/ethers file with host "teeth" at the beginning of the test, if they does not exists? --- Best regards, Paltsev Eugeniy

2 3

Re: [uclibc-ng-devel] Patchwork instance for uClibc-ng
by Alexey Brodkin 16 Jun '16

16 Jun '16

Hi Waldemar, 21 мая 2016 г. 11:39 пользователь Peter Korsgaard <peter(a)korsgaard.com> написал: > > >>>>> "Waldemar" == Waldemar Brodkorb <wbx(a)uclibc-ng.org> writes: > > Hi, > > >> It should be pretty simple - we did this for "linux-arc" recently. > > > So how would I register the project? > > I haven't seen a description how to do it on their website. > > I think you can just email Jeremy Kerr (jk(a)ozlabs.org) who maintains the > patchwork instance on ozlabs. Indeed, that's what we did back in the day. -Alexey

2 5

Tests: testregex does not fails
by Vlad Zakharov 16 Jun '16

16 Jun '16

Hello, I found an issue when running uClibc test "regex/testregex". I launched tests using "uclibcng-testrunner.sh" script. And the script printed that "testregex" had been passed successfully. But when I opened "testregex.out" file I found, that many "testregex" sub-tests failed. This behavior is caused because test returns 0 exit code even when sub- tests fail. As a result we don't know was the "testregex" execution successful or not though it is marked as "PASSED". The problem was found when running tests on ARC HS38 with Linux 4.6.1. It also was reproduced on ARMv5 with Linux 4.5.3. -- Best regards, Vlad Zakharov <Vladislav.Zakharov(a)synopsys.com>

3 4

Re: [uclibc-ng-devel] [PATCH] package/util-linux: Fix libmount build under uClibc
by Alexey Brodkin 13 Jun '16

13 Jun '16

Hi Waldemar, On Mon, 2016-05-30 at 14:12 +0300, Alexey Brodkin wrote: > Hello, > > On Thu, 2016-05-26 at 14:55 +0300, Alexey Brodkin wrote: > > > > Hello, > > > > On Mon, 2016-05-23 at 17:46 +0300, Alexey Brodkin wrote: > > > > > > > > > This fixes util-linux building with uClibc. > > > Patch is taken as it is from Buildroot: > > > https://git.busybox.net/buildroot/plain/package/util-linux/0001-Fix-libmoun… > > > 6f > > > ea > > > bf114623866568121f49712f5df > > > > > > Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> > > > --- > > > .../004-Fix-libmount-build-under-uClibc.patch | 153 +++++++++++++++++++++ > > > 1 file changed, 153 insertions(+) > > > create mode 100644 package/utils/util-linux/patches/004-Fix-libmount-build-under-uClibc.patch We are discussing one issue with "util-linux" package building. The problem is in "util-linux" wants to use alloc modifier (either "%as" or "%ms") in scanf(). Looks like uClibc still doesn't support neither "%ms" nor "%as" (this one is obsolete glibc-specific so let's not bother with it anyways). Now to work-around this missing requirement we used to use an off-the-tree patch like this one in Buildroot: https://git.busybox.net/buildroot/tree/package/util-linux/0001-Fix-libmount… OpenWRT: https://git.lede-project.org/?p=source.git;a=blob;f=package/utils/util-linu… 959bf0c8ce269e8039d4d05ef58e1d527;hb=8a7b28071fba84e297796c46d46e12b0967804e8 Gentoo: https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/util-linu… ch?revision=1.2 The question to you is where do you think we should fix mentioned problem: 1) In uClibc-ng with addition of "%ms" support in scanf or 2) Try to upstream mentioned patch in "util-linux"? Regards, Alexey

4 9

[PATCH] Fix return value of fwrite when a 'hard' error occurs
by Jan Vangorp 13 Jun '16

13 Jun '16

When a 'hard' error occurs, fwrite reports that all data was written or buffered even if that is not the case. It should report how much data was actually written and buffered. Signed-off-by: Jan Vangorp <jan.vangorp_ext(a)softathome.com> --- libc/stdio/_WRITE.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libc/stdio/_WRITE.c b/libc/stdio/_WRITE.c index 113f0eb..f95bd1b 100644 --- a/libc/stdio/_WRITE.c +++ b/libc/stdio/_WRITE.c @@ -76,6 +76,7 @@ size_t attribute_hidden __stdio_WRITE(register FILE *stream, */ if (errno != EINTR && errno != EAGAIN) { /* do we have other "soft" errors? */ + bufsize -= todo; break; } #ifdef __STDIO_BUFFERS -- 1.9.1

2 3

[PATCH] Fix infinite loop when fopencookie custom write returns 0 on error
by Jan Vangorp 13 Jun '16

13 Jun '16

The man page for fopencookie prescribes that custom write functions should return 0 on error (and should definitely not return a negative value) [1]. However, the uClibc implementation expects a negative return value in case of an error (libc/stdio/_WRITE.c). If the write function returns 0 on error, we drop into an infinite loop if the error persists. This patch wraps the user supplied write function such that a 0 return value is converted to -1. errno is first set to EAGAIN such that if the custom write function does not set errno in case of error, this is treated as a "soft" error. Custom write functions that cater towards uClibc and _do_ return a negative value are not affected. If no custom write function is supplied, set errno to EINVAL such that this condition is treated as a "hard" error. Previously the behaviour depended on whether the last error before the write happened to be a "hard" or a "soft" error. [1] http://git.kernel.org/cgit/docs/man-pages/man-pages.git/tree/man3/fopencook… Signed-off-by: Jan Vangorp <jan.vangorp_ext(a)softathome.com> --- libc/stdio/_stdio.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/libc/stdio/_stdio.h b/libc/stdio/_stdio.h index 310510d..727e331 100644 --- a/libc/stdio/_stdio.h +++ b/libc/stdio/_stdio.h @@ -110,6 +110,18 @@ do { \ cfile->__gcs.NAME(cfile->__cookie, ##ARGS); \ } +#define __STDIO_STREAM_CUSTOM_WRITE_FUNC(S, ARGS...) \ + if (__STDIO_STREAM_IS_CUSTOM((S))) { \ + _IO_cookie_file_t *cfile = (_IO_cookie_file_t *) (S); \ + if (cfile->__gcs.write == NULL) { \ + __set_errno(EINVAL); \ + return -1; \ + } \ + __set_errno(EAGAIN); \ + ssize_t w = cfile->__gcs.write(cfile->__cookie, ##ARGS); \ + return (w == 0 ? -1 : w); \ + } + typedef struct { struct __STDIO_FILE_STRUCT __fp; void *__cookie; @@ -121,6 +133,7 @@ typedef struct { #undef __STDIO_STREAM_GLIBC_CUSTOM_FILEDES #define __STDIO_STREAM_IS_CUSTOM(S) (0) #define __STDIO_STREAM_CUSTOM_IO_FUNC(S, NAME, RC, ARGS...) +#define __STDIO_STREAM_CUSTOM_WRITE_FUNC(S, ARGS...) #endif /* __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__ */ @@ -135,7 +148,7 @@ static inline ssize_t __READ(FILE *stream, char *buf, size_t bufsize) static inline ssize_t __WRITE(FILE *stream, const char *buf, size_t bufsize) { - __STDIO_STREAM_CUSTOM_IO_FUNC(stream, write, -1, buf, bufsize); + __STDIO_STREAM_CUSTOM_WRITE_FUNC(stream, buf, bufsize); return write(stream->__filedes, buf, bufsize); } -- 1.9.1

2 1

uClibc-ng - small C library for embedded systems branch master updated. v1.0.15-17-ge1eceda
by wbx＠helium.openadk.org 13 Jun '16

13 Jun '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, master has been updated via e1eceda87b2fa64ab17f3e32c81b9a97edc7cac7 (commit) via 96f2821683ec41a28b5aa6ec92245e47dfee989b (commit) via 568ceebf6adfc58c64a95133311268db626cdec2 (commit) from 0f541b5c48b7b0df80e2aaa8fdbf653a8b8bcd03 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e1eceda87b2fa64ab17f3e32c81b9a97edc7cac7 Author: Max Filippov <jcmvbkbc(a)gmail.com> Date: Thu Jun 2 18:24:28 2016 +0300 tests: add %ms scanf format test Signed-off-by: Max Filippov <jcmvbkbc(a)gmail.com> commit 96f2821683ec41a28b5aa6ec92245e47dfee989b Author: Jan Vangorp <jan.vangorp_ext(a)softathome.com> Date: Thu Jun 9 00:00:49 2016 +0200 Fix return value of fwrite when a 'hard' error occurs When a 'hard' error occurs, fwrite reports that all data was written or buffered even if that is not the case. It should report how much data was actually written and buffered. Signed-off-by: Jan Vangorp <jan.vangorp_ext(a)softathome.com> commit 568ceebf6adfc58c64a95133311268db626cdec2 Author: Jan Vangorp <jan.vangorp_ext(a)softathome.com> Date: Thu Jun 9 00:00:18 2016 +0200 Fix infinite loop when fopencookie custom write returns 0 on error The man page for fopencookie prescribes that custom write functions should return 0 on error (and should definitely not return a negative value) [1]. However, the uClibc implementation expects a negative return value in case of an error (libc/stdio/_WRITE.c). If the write function returns 0 on error, we drop into an infinite loop if the error persists. This patch wraps the user supplied write function such that a 0 return value is converted to -1. errno is first set to EAGAIN such that if the custom write function does not set errno in case of error, this is treated as a "soft" error. Custom write functions that cater towards uClibc and _do_ return a negative value are not affected. If no custom write function is supplied, set errno to EINVAL such that this condition is treated as a "hard" error. Previously the behaviour depended on whether the last error before the write happened to be a "hard" or a "soft" error. [1] http://git.kernel.org/cgit/docs/man-pages/man-pages.git/tree/man3/fopencook… Signed-off-by: Jan Vangorp <jan.vangorp_ext(a)softathome.com> ----------------------------------------------------------------------- Summary of changes: libc/stdio/_WRITE.c | 1 + libc/stdio/_stdio.h | 15 ++++++++++++++- test/stdio/scanf_m.c | 17 ++++++++++------- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/libc/stdio/_WRITE.c b/libc/stdio/_WRITE.c index 113f0eb..f95bd1b 100644 --- a/libc/stdio/_WRITE.c +++ b/libc/stdio/_WRITE.c @@ -76,6 +76,7 @@ size_t attribute_hidden __stdio_WRITE(register FILE *stream, */ if (errno != EINTR && errno != EAGAIN) { /* do we have other "soft" errors? */ + bufsize -= todo; break; } #ifdef __STDIO_BUFFERS diff --git a/libc/stdio/_stdio.h b/libc/stdio/_stdio.h index 310510d..727e331 100644 --- a/libc/stdio/_stdio.h +++ b/libc/stdio/_stdio.h @@ -110,6 +110,18 @@ do { \ cfile->__gcs.NAME(cfile->__cookie, ##ARGS); \ } +#define __STDIO_STREAM_CUSTOM_WRITE_FUNC(S, ARGS...) \ + if (__STDIO_STREAM_IS_CUSTOM((S))) { \ + _IO_cookie_file_t *cfile = (_IO_cookie_file_t *) (S); \ + if (cfile->__gcs.write == NULL) { \ + __set_errno(EINVAL); \ + return -1; \ + } \ + __set_errno(EAGAIN); \ + ssize_t w = cfile->__gcs.write(cfile->__cookie, ##ARGS); \ + return (w == 0 ? -1 : w); \ + } + typedef struct { struct __STDIO_FILE_STRUCT __fp; void *__cookie; @@ -121,6 +133,7 @@ typedef struct { #undef __STDIO_STREAM_GLIBC_CUSTOM_FILEDES #define __STDIO_STREAM_IS_CUSTOM(S) (0) #define __STDIO_STREAM_CUSTOM_IO_FUNC(S, NAME, RC, ARGS...) +#define __STDIO_STREAM_CUSTOM_WRITE_FUNC(S, ARGS...) #endif /* __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__ */ @@ -135,7 +148,7 @@ static inline ssize_t __READ(FILE *stream, char *buf, size_t bufsize) static inline ssize_t __WRITE(FILE *stream, const char *buf, size_t bufsize) { - __STDIO_STREAM_CUSTOM_IO_FUNC(stream, write, -1, buf, bufsize); + __STDIO_STREAM_CUSTOM_WRITE_FUNC(stream, buf, bufsize); return write(stream->__filedes, buf, bufsize); } diff --git a/test/stdio/scanf_m.c b/test/stdio/scanf_m.c index 0ce78b6..e1dde27 100644 --- a/test/stdio/scanf_m.c +++ b/test/stdio/scanf_m.c @@ -5,20 +5,23 @@ int main(void) { const char *buf = "hello world"; - char *ps = NULL, *pc = NULL; - char s[6], c; + char *ps = NULL, *pc = NULL, *ps2 = NULL; + char s[6], c, s2[5]; - /* Check that %[...]/%c work. */ - sscanf(buf, "%[a-z] %c", s, &c); - /* Check that %m[...]/%mc work. */ - sscanf(buf, "%m[a-z] %mc", &ps, &pc); + /* Check that %[...]/%c/%s work. */ + sscanf(buf, "%[a-z] %c %s", s, &c, s2); + /* Check that %m[...]/%mc/%ms work. */ + sscanf(buf, "%m[a-z] %mc %ms", &ps, &pc, &ps2); if (strcmp(ps, "hello") != 0 || *pc != 'w' || - strcmp(s, "hello") != 0 || c != 'w') + strcmp(ps2, "orld") != 0 || + strcmp(s, "hello") != 0 || c != 'w' || + strcmp(s2, "orld") != 0) return 1; free(ps); free(pc); + free(ps2); return 0; } hooks/post-receive -- uClibc-ng - small C library for embedded systems

1 0