diff --git a/ChangeLog b/ChangeLog index e9f22d4f53..1906b3c125 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4866,3 +4866,5 @@ * arch/arm/include/sam34 and arch/arm/src/sam34: The old sam3u/ directories were renamed sam34/ to make room in the namespace for the SAM4L (2013-6-2). + * libc/stdio/lib_dprintd.c and lib_vdprintf.c: Add dprintf() and + vdprintf() (the latter from Andrew Tridgell, 2013-6-2). diff --git a/include/stdio.h b/include/stdio.h index 7a1b052709..eb977d38db 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -128,13 +128,13 @@ int ungetc(int c, FAR FILE *stream); /* Operations on the stdout stream, buffers, paths, and the whole printf-family */ -int printf(const char *format, ...); +int printf(FAR const char *format, ...); int puts(FAR const char *s); int rename(FAR const char *oldpath, FAR const char *newpath); -int sprintf(FAR char *buf, const char *format, ...); -int asprintf (FAR char **ptr, const char *fmt, ...); -int snprintf(FAR char *buf, size_t size, const char *format, ...); -int sscanf(const char *buf, const char *fmt, ...); +int sprintf(FAR char *buf, FAR const char *format, ...); +int asprintf (FAR char **ptr, FAR const char *fmt, ...); +int snprintf(FAR char *buf, size_t size, FAR const char *format, ...); +int sscanf(FAR const char *buf, FAR const char *fmt, ...); void perror(FAR const char *s); int vprintf(FAR const char *format, va_list ap); @@ -144,9 +144,19 @@ int avsprintf(FAR char **ptr, const char *fmt, va_list ap); int vsnprintf(FAR char *buf, size_t size, const char *format, va_list ap); int vsscanf(char *buf, const char *s, va_list ap); -/* POSIX-like File System Interfaces */ +/* Operations on file descriptors including: + * + * POSIX-like File System Interfaces (fdopen), and + * Extensions from the Open Group Technical Standard, 2006, Extended API Set + * Part 1 (dprintf and vdprintf) + */ FAR FILE *fdopen(int fd, FAR const char *type); +int dprintf(int fd, FAR const char *fmt, ...); +int vdprintf(int fd, FAR const char *fmt, va_list ap); + +/* Operations on paths */ + int statfs(FAR const char *path, FAR struct statfs *buf); #undef EXTERN diff --git a/libc/lib_internal.h b/libc/lib_internal.h index 76a37de0d1..a85e815ff9 100644 --- a/libc/lib_internal.h +++ b/libc/lib_internal.h @@ -1,7 +1,7 @@ /**************************************************************************** * libc/lib_internal.h * - * Copyright (C) 2007-2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/libc/stdio/Make.defs b/libc/stdio/Make.defs index ffc9b1a756..b64d2bd5bc 100644 --- a/libc/stdio/Make.defs +++ b/libc/stdio/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # libc/stdio/Make.defs # -# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2011-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -40,6 +40,7 @@ CSRCS += lib_fileno.c lib_printf.c lib_syslog.c lib_lowsyslog.c\ lib_sprintf.c lib_asprintf.c lib_snprintf.c lib_libsprintf.c \ lib_vsprintf.c lib_avsprintf.c lib_vsnprintf.c lib_libvsprintf.c \ + lib_dprintf.c lib_vdprintf.c \ lib_meminstream.c lib_memoutstream.c lib_lowinstream.c \ lib_lowoutstream.c lib_zeroinstream.c lib_nullinstream.c \ lib_nulloutstream.c lib_sscanf.c diff --git a/libc/stdio/lib_dprintf.c b/libc/stdio/lib_dprintf.c new file mode 100644 index 0000000000..0ea6475170 --- /dev/null +++ b/libc/stdio/lib_dprintf.c @@ -0,0 +1,60 @@ +/**************************************************************************** + * libc/stdio/lib_dprintf.c + * + * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +/**************************************************************************** + * Public Functions + **************************************************************************/ + +/**************************************************************************** + * Name: dprintf + **************************************************************************/ + +int dprintf(int fd, FAR const char *fmt, ...) +{ + va_list ap; + int ret; + + va_start(ap, fmt); + ret = vdprintf(fd, fmt, ap); + va_end(ap); + + return ret; +} diff --git a/libc/stdio/lib_vdprintf.c b/libc/stdio/lib_vdprintf.c new file mode 100644 index 0000000000..8cdea96c6b --- /dev/null +++ b/libc/stdio/lib_vdprintf.c @@ -0,0 +1,59 @@ +/**************************************************************************** + * libc/stdio/lib_vdprintf.c + * + * Copyright (C) 2012 Andrew Tridgell. All rights reserved. + * Authors: Author: Andrew Tridgell + * Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#include "lib_internal.h" + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +int vdprintf(int fd, FAR const char *fmt, va_list ap) +{ + struct lib_rawoutstream_s rawoutstream; + + /* Wrap the fd in a stream object and let lib_vsprintf do the work. */ + + lib_rawoutstream(&rawoutstream, fd); + return lib_vsprintf(&rawoutstream.public, fmt, ap); +}