From jhs@berklix.org  Sat Jan 12 22:30:05 2008
Return-Path: <jhs@berklix.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E17E916A418
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 12 Jan 2008 22:30:05 +0000 (UTC)
	(envelope-from jhs@berklix.org)
Received: from tower.berklix.org (tower.berklix.org [83.236.223.114])
	by mx1.freebsd.org (Postfix) with ESMTP id 23FE913C46A
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 12 Jan 2008 22:30:04 +0000 (UTC)
	(envelope-from jhs@berklix.org)
Received: from js.berklix.net (p549A560B.dip.t-dialin.net [84.154.86.11])
	(authenticated bits=0)
	by tower.berklix.org (8.13.6/8.13.6) with ESMTP id m0CMU2Md023328;
	Sat, 12 Jan 2008 22:30:02 GMT
	(envelope-from jhs@berklix.org)
Received: from lapd.js.berklix.net (lapd.js.berklix.net [192.168.91.35])
	by js.berklix.net (8.13.8/8.13.8) with ESMTP id m0CMVVmj077297;
	Sat, 12 Jan 2008 23:31:31 +0100 (CET)
	(envelope-from jhs@berklix.org)
Received: from lapd.js.berklix.net (localhost.js.berklix.net [127.0.0.1])
	by lapd.js.berklix.net (8.14.2/8.14.2) with ESMTP id m0CMVU9a001522;
	Sat, 12 Jan 2008 23:31:30 +0100 (CET)
	(envelope-from jhs@lapd.js.berklix.net)
Received: (from jhs@localhost)
	by lapd.js.berklix.net (8.14.2/8.14.2/Submit) id m0CMVTUU001521;
	Sat, 12 Jan 2008 23:31:29 +0100 (CET)
	(envelope-from jhs)
Message-Id: <200801122231.m0CMVTUU001521@lapd.js.berklix.net>
Date: Sat, 12 Jan 2008 23:31:29 +0100 (CET)
From: "Julian H. Stacey" <jhs@berklix.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: "Julian H. Stacey" <jhs@berklix.com>
Subject: config -x appends unwanted trailing null, patched
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         119610
>Category:       bin
>Synopsis:       [patch] config(8): config -x appends unwanted trailing null
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    wkoszek
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 12 22:40:01 UTC 2008
>Closed-Date:    Fri Mar 15 23:42:01 UTC 2013
>Last-Modified:  Fri Mar 15 23:42:01 UTC 2013
>Originator:     Julian H. Stacey <jhs@berklix.com>
>Release:        FreeBSD 7.0-PRERELEASE i386
>Organization:
http://berklix.com
>Environment:
System: FreeBSD lapd.js.berklix.net 7.0-PRERELEASE FreeBSD 7.0-PRERELEASE #82: Sat Jan 12 13:14:16 CET 2008 jhs@lapd.js.berklix.net:/usr/src/sys/i386/compile/LAPD.small i386


	
>Description:
	config -x appends unwanted trailing null
	avoid it, as it upsets tools such as diff when comparing similar configs
	
>How-To-Repeat:
	config -x /boot/kernel/kernel > t
	vi t
	:$
>Fix:

	

http://berklix.com/~jhs/src/bsd/fixes/FreeBSD/src/gen/usr.sbin/config/main.c.REL=ALL.diff


*** 7.0-PRERELEASE-src-7-ctm86/src/usr.sbin/config/main.c	Sat Jan 12 23:02:26 2008
--- new/src/usr.sbin/config/main.c	Sat Jan 12 23:10:48 2008
***************
*** 687,693 ****
  	r = fseek(fp, off, SEEK_CUR);
  	if (r != 0)
  		errx(EXIT_FAILURE, "fseek() failed");
! 	while ((r = fgetc(fp)) != EOF && size-- > 0)
  		fputc(r, stdout);
  	fclose(fp);
  }
--- 687,693 ----
  	r = fseek(fp, off, SEEK_CUR);
  	if (r != 0)
  		errx(EXIT_FAILURE, "fseek() failed");
! 	while ((r = fgetc(fp)) != EOF && ( r != '\0' ) && size-- > 0)
  		fputc(r, stdout);
  	fclose(fp);
  }
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->patched 
State-Changed-By: gavin 
State-Changed-When: Sun Jan 3 13:18:47 UTC 2010 
State-Changed-Why:  
This was fixed in HEAD (and therefore in 8.x) in r188214 but 
has not been MFC'd to 7.x 


Responsible-Changed-From-To: freebsd-bugs->wkoszek 
Responsible-Changed-By: gavin 
Responsible-Changed-When: Sun Jan 3 13:18:47 UTC 2010 
Responsible-Changed-Why:  
Over to wkoszek, committer of r188214, for MFC consideration 

http://www.freebsd.org/cgi/query-pr.cgi?pr=119610 
State-Changed-From-To: patched->closed 
State-Changed-By: eadler 
State-Changed-When: Fri Mar 15 23:42:01 UTC 2013 
State-Changed-Why:  
MFCed/fixed by now or it will never be MFCed 

http://www.freebsd.org/cgi/query-pr.cgi?pr=119610 
>Unformatted:
