mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-16 10:20:30 +00:00
Code Issues Releases Activity

Make result of sprintf zero terminated. Fix %r for sprintf case.

Browse Source
This commit is contained in:
Poul-Henning Kamp 1996-01-19 11:38:18 +00:00
parent 8ae4b5d0af
commit fe96d47d8e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=13494
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/kern/subr_prf.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)subr_prf.c 8.3 (Berkeley) 1/21/94
* $Id: subr_prf.c,v 1.22 1996/01/16 18:08:57 phk Exp $
* $Id: subr_prf.c,v 1.23 1996/01/18 10:23:02 phk Exp $
*/
#include "opt_ddb.h"
@ -357,6 +357,7 @@ sprintf(char *buf, const char *cfmt, ...)
va_start(ap, cfmt);
retval = kvprintf(cfmt, NULL, (void *)buf, 10, ap);
buf[retval] = '\0';
va_end(ap);
return retval;
}
@ -431,10 +432,10 @@ kvprintf(char const *fmt, void (*func)(int, void*), void *arg, int radix, va_lis
char padc;
int retval = 0;
if (func == NULL)
if (!func)
d = (char *) arg;
else
d = 0;
d = NULL;
if (fmt == NULL)
fmt = "(fmt null)\n";
@ -442,7 +443,7 @@ kvprintf(char const *fmt, void (*func)(int, void*), void *arg, int radix, va_lis
padc = ' ';
width = 0;
while ((ch = *(u_char *)fmt++) != '%') {
if (ch == '\0')
if (ch == '\0')
return retval;
PCHAR(ch);
}
@ -539,9 +540,12 @@ reswitch: switch (ch = *(u_char *)fmt++) {
goto number;
case 'r':
p = va_arg(ap, char *);
n = kvprintf(p, func, arg, radix, ap);
if (!func)
if (!func) {
n = kvprintf(p, func, d, radix, ap);
d += n;
} else {
n = kvprintf(p, func, arg, radix, ap);
}
retval += n;
break;
case 's':