| vfprintf.c (189131) | vfprintf.c (189138) |
|---|---|
| 1/*- 2 * Copyright (c) 1990, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley by 6 * Chris Torek. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 20 unchanged lines hidden (view full) --- 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30 * SUCH DAMAGE. 31 */ 32 33#if defined(LIBC_SCCS) && !defined(lint) 34static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; 35#endif /* LIBC_SCCS and not lint */ 36#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1990, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley by 6 * Chris Torek. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 20 unchanged lines hidden (view full) --- 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30 * SUCH DAMAGE. 31 */ 32 33#if defined(LIBC_SCCS) && !defined(lint) 34static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; 35#endif /* LIBC_SCCS and not lint */ 36#include <sys/cdefs.h> |
| 37__FBSDID("$FreeBSD: head/lib/libc/stdio/vfprintf.c 189131 2009-02-28 04:58:18Z das $"); | 37__FBSDID("$FreeBSD: head/lib/libc/stdio/vfprintf.c 189138 2009-02-28 06:06:57Z das $"); |
| 38 39/* 40 * Actual printf innards. 41 * 42 * This code is large and complicated... 43 */ 44 45#include "namespace.h" --- 771 unchanged lines hidden (view full) --- 817 if (convbuf == NULL) { 818 fp->_flags |= __SERR; 819 goto error; 820 } 821 cp = convbuf; 822 } 823 } else if ((cp = GETARG(char *)) == NULL) 824 cp = "(null)"; | 38 39/* 40 * Actual printf innards. 41 * 42 * This code is large and complicated... 43 */ 44 45#include "namespace.h" --- 771 unchanged lines hidden (view full) --- 817 if (convbuf == NULL) { 818 fp->_flags |= __SERR; 819 goto error; 820 } 821 cp = convbuf; 822 } 823 } else if ((cp = GETARG(char *)) == NULL) 824 cp = "(null)"; |
| 825 if (prec >= 0) { 826 /* 827 * can't use strlen; can only look for the 828 * NUL in the first `prec' characters, and 829 * strlen() will go further. 830 */ 831 char *p = memchr(cp, 0, (size_t)prec); 832 833 if (p != NULL) { 834 size = p - cp; 835 if (size > prec) 836 size = prec; 837 } else 838 size = prec; 839 } else 840 size = strlen(cp); | 825 size = (prec >= 0) ? strnlen(cp, prec) : strlen(cp); |
| 841 sign = '\0'; 842 break; 843 case 'U': 844 flags |= LONGINT; 845 /*FALLTHROUGH*/ 846 case 'u': 847 if (flags & INTMAX_SIZE) 848 ujval = UJARG(); --- 189 unchanged lines hidden --- | 826 sign = '\0'; 827 break; 828 case 'U': 829 flags |= LONGINT; 830 /*FALLTHROUGH*/ 831 case 'u': 832 if (flags & INTMAX_SIZE) 833 ujval = UJARG(); --- 189 unchanged lines hidden --- |