On Mon, 28 Jan 2013, Brad Smith wrote: > Here is a diff to add support for the POSIX functions dprintf(3) > and vdprintf(3).
Having poked at it a bit, I think the vdprintf.c below may be better. By using its own write callback, it avoids the SHRT_MAX limit on the fd, and it removes the fcntl() dance to check the mode on the fd as it is unnecessary: the write callback will diagnose that correctly (by failing with EBADF) when the data is written. Philip ----------------------- /* $OpenBSD$ */ /* $FreeBSD: src/lib/libc/stdio/vdprintf.c,v 1.4 2012/11/17 01:49:40 svnexp Exp $ */ /*- * Copyright (c) 2009 David Schultz <[email protected]> * All rights reserved. * * Copyright (c) 2011 The FreeBSD Foundation * All rights reserved. * Portions of this software were developed by David Chisnall * under sponsorship from the FreeBSD Foundation. * * 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. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. */ #include <errno.h> #include <stdarg.h> #include <stdio.h> #include <string.h> #include <unistd.h> #include "local.h" static int __dwrite(void *cookie, const char *buf, int n) { int *fdp = cookie; return (write(*fdp, buf, n)); } int vdprintf(int fd, const char * __restrict fmt, va_list ap) { FILE f; struct __sfileext fext; unsigned char buf[BUFSIZ]; int ret; _FILEEXT_SETUP(&f, &fext); f._p = buf; f._w = sizeof(buf); f._flags = __SWR; f._file = -1; f._bf._base = buf; f._bf._size = sizeof(buf); f._cookie = &fd; f._write = __dwrite; if ((ret = __vfprintf(&f, fmt, ap)) < 0) return ret; return fflush(&f) ? EOF : ret; }
