From nobody@FreeBSD.org  Thu Nov 12 03:07:08 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 44197106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 12 Nov 2009 03:07:06 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 334958FC19
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 12 Nov 2009 03:07:06 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id nAC375q9001887
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 12 Nov 2009 03:07:06 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id nAC375Fc001886;
	Thu, 12 Nov 2009 03:07:05 GMT
	(envelope-from nobody)
Message-Id: <200911120307.nAC375Fc001886@www.freebsd.org>
Date: Thu, 12 Nov 2009 03:07:05 GMT
From: Jeremy Huddleston <jeremyhu@apple.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Maintainance update for sprintf.c
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         140496
>Category:       bin
>Synopsis:       [libc] [patch] Maintainance update for sprintf.c
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    delphij
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 12 03:10:04 UTC 2009
>Closed-Date:    Wed Jan 20 00:57:04 UTC 2010
>Last-Modified:  Wed Jan 20 01:00:19 UTC 2010
>Originator:     Jeremy Huddleston
>Release:        8.0
>Organization:
Apple
>Environment:
NA
>Description:
Make sprintf use vsprintf like similar changes to other stdio functions.
>How-To-Repeat:

>Fix:
--- sprintf.c.bsdnew	2009-11-11 19:03:58.000000000 -0800
+++ sprintf.c	2009-11-11 19:04:47.000000000 -0800
@@ -46,17 +46,9 @@ sprintf(char * __restrict str, char cons
 {
 	int ret;
 	va_list ap;
-	FILE f;
 
-	f._file = -1;
-	f._flags = __SWR | __SSTR;
-	f._bf._base = f._p = (unsigned char *)str;
-	f._bf._size = f._w = INT_MAX;
-	f._orientation = 0;
-	memset(&f._mbstate, 0, sizeof(mbstate_t));
 	va_start(ap, fmt);
-	ret = __vfprintf(&f, fmt, ap);
+	ret = vsprintf(str, fmt, ap);
 	va_end(ap);
-	*f._p = 0;
 	return (ret);
 }


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->patched 
State-Changed-By: delphij 
State-Changed-When: Mon Dec 21 19:59:50 UTC 2009 
State-Changed-Why:  
Patch applied against -HEAD, MFC reminder. 


Responsible-Changed-From-To: freebsd-bugs->delphij 
Responsible-Changed-By: delphij 
Responsible-Changed-When: Mon Dec 21 19:59:50 UTC 2009 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=140496 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/140496: commit references a PR
Date: Mon, 21 Dec 2009 19:59:47 +0000 (UTC)

 Author: delphij
 Date: Mon Dec 21 19:59:38 2009
 New Revision: 200802
 URL: http://svn.freebsd.org/changeset/base/200802
 
 Log:
   Use vsprintf instead of rolling our own.
   
   PR:		bin/140496
   Submitted by:	Jeremy Huddleston <jeremyhu apple.com>
   MFC after:	1 month
 
 Modified:
   head/lib/libc/stdio/sprintf.c
 
 Modified: head/lib/libc/stdio/sprintf.c
 ==============================================================================
 --- head/lib/libc/stdio/sprintf.c	Mon Dec 21 19:56:11 2009	(r200801)
 +++ head/lib/libc/stdio/sprintf.c	Mon Dec 21 19:59:38 2009	(r200802)
 @@ -46,17 +46,9 @@ sprintf(char * __restrict str, char cons
  {
  	int ret;
  	va_list ap;
 -	FILE f;
  
 -	f._file = -1;
 -	f._flags = __SWR | __SSTR;
 -	f._bf._base = f._p = (unsigned char *)str;
 -	f._bf._size = f._w = INT_MAX;
 -	f._orientation = 0;
 -	memset(&f._mbstate, 0, sizeof(mbstate_t));
  	va_start(ap, fmt);
 -	ret = __vfprintf(&f, fmt, ap);
 +	ret = vsprintf(str, fmt, ap);
  	va_end(ap);
 -	*f._p = 0;
  	return (ret);
  }
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: delphij 
State-Changed-When: Wed Jan 20 00:56:40 UTC 2010 
State-Changed-Why:  
MFC'ed to 8-STABLE.  Thanks for your submission! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=140496 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/140496: commit references a PR
Date: Wed, 20 Jan 2010 00:53:56 +0000 (UTC)

 Author: delphij
 Date: Wed Jan 20 00:53:44 2010
 New Revision: 202666
 URL: http://svn.freebsd.org/changeset/base/202666
 
 Log:
   MFC r200802:
   
   Use vsprintf instead of rolling our own.
   
   PR:		bin/140496
   Submitted by:	Jeremy Huddleston <jeremyhu apple.com>
 
 Modified:
   stable/8/lib/libc/stdio/sprintf.c
 Directory Properties:
   stable/8/lib/libc/   (props changed)
   stable/8/lib/libc/stdtime/   (props changed)
 
 Modified: stable/8/lib/libc/stdio/sprintf.c
 ==============================================================================
 --- stable/8/lib/libc/stdio/sprintf.c	Wed Jan 20 00:53:03 2010	(r202665)
 +++ stable/8/lib/libc/stdio/sprintf.c	Wed Jan 20 00:53:44 2010	(r202666)
 @@ -46,17 +46,9 @@ sprintf(char * __restrict str, char cons
  {
  	int ret;
  	va_list ap;
 -	FILE f;
  
 -	f._file = -1;
 -	f._flags = __SWR | __SSTR;
 -	f._bf._base = f._p = (unsigned char *)str;
 -	f._bf._size = f._w = INT_MAX;
 -	f._orientation = 0;
 -	memset(&f._mbstate, 0, sizeof(mbstate_t));
  	va_start(ap, fmt);
 -	ret = __vfprintf(&f, fmt, ap);
 +	ret = vsprintf(str, fmt, ap);
  	va_end(ap);
 -	*f._p = 0;
  	return (ret);
  }
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
