From owner-soc-status@FreeBSD.ORG Mon Jul 23 22:17:40 2012 Return-Path: Delivered-To: soc-status@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 493A71065678 for ; Mon, 23 Jul 2012 22:17:40 +0000 (UTC) (envelope-from jesse.hagewood@gmail.com) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx1.freebsd.org (Postfix) with ESMTP id C8DD78FC17 for ; Mon, 23 Jul 2012 22:17:39 +0000 (UTC) Received: by wgbds11 with SMTP id ds11so6146373wgb.31 for ; Mon, 23 Jul 2012 15:17:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=CuvA6rUFn+6jduOETzCIyiHAQyWQG2qrvIfsgnTmY7o=; b=ei5+fh0T5HXmv/MCKCtwk90ij+1Tk59ZPUIn2poYMljLYu0tppqxRPGOKY36Tw5HTV kCM6dZNLq8QiyQXZsy6fVqFl18SGAUq6GYfV/siFsCiuCgeEcwgV7lmIqhJj3UAfKlJz 4rHkoVg7rPRWMemChc7OgRyhpZ1dIph4EfcBqCIFTgqZUE9CQpsR5iiRO2/oJjrQYjUv ICdqJXij/ByuxkGdyyGpRG6IVgOg9CpnL2ew/mrNByBarIPJaFdH0eZonNUFgRdcLKeZ lLdxdv2DhWffzDC0iRdtrjXLUkn8ydRebcCDAUFhpfFNIFfRiEypFdNoF502+UPuvsZM WRKw== MIME-Version: 1.0 Received: by 10.216.133.130 with SMTP id q2mr9323792wei.131.1343081858330; Mon, 23 Jul 2012 15:17:38 -0700 (PDT) Received: by 10.227.24.16 with HTTP; Mon, 23 Jul 2012 15:17:38 -0700 (PDT) Date: Mon, 23 Jul 2012 18:17:38 -0400 Message-ID: From: Jesse Hagewood To: soc-status@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: =?ISO-8859-1?Q?Dag=2DErling_Sm=F8rgrav?= Subject: Improve BSD licensed text-processing tools X-BeenThere: soc-status@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Summer of Code Status Reports and Discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jul 2012 22:17:40 -0000 Some milestones made last week: - Fixed textfile detection in diff3, using the same methods I used with diff. - Fixed several bugs I have found in diff3. - Wrote a test script for diff3. I've been looking at how to integrate the diff utilities more tightly by studying grep, and while I'm not sure how to improve tighter integration between diff/sdiff/diff3, I have an idea to integrate utilities for different file formats such as zdiff into diff the same way that grep does with the different grep utilities. I plan on implementing it this afternoon. Last week, I also began looking at diff3. The main issue here is the piping to diff is unimplemented. I plan on doing this in a similar way that sdiff has. Most functionality is there in diff3, except for a few missing features. The majority of the week I will be focused on this. Sdiff is looking very good right now. I'll comb through the code to fix compiler warnings and style issues, and run some benchmark tests. Also, in all of sdiff's files, there is only a comment saying it is public domain. Should the BSD license be added to the files?