From owner-freebsd-hackers@FreeBSD.ORG Wed Apr 18 02:01:08 2012 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E7761106566C for ; Wed, 18 Apr 2012 02:01:08 +0000 (UTC) (envelope-from bfiedler@asu.edu) Received: from mail-pz0-f44.google.com (mail-pz0-f44.google.com [209.85.210.44]) by mx1.freebsd.org (Postfix) with ESMTP id B54628FC0C for ; Wed, 18 Apr 2012 02:01:08 +0000 (UTC) Received: by dadz14 with SMTP id z14so30097631dad.17 for ; Tue, 17 Apr 2012 19:01:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:x-gm-message-state; bh=NA3kYp7+tlhvmZgJHoGsOFHaZfa9RE21ktV9qk+kmmk=; b=BKYZqIH96EX7x1eKLpnQNSkUa8RfYRgL2jqcHhiZDxdpa3Ti7rpj4RVptb6kbz8H7Z +FBKP8wWgLu1b47vcYBe/o+x+XE5O60/WqJujl44scQfOk2YdDhOLM91sAeI0Y6zXVxA /TPhcR/iVRN22zKcNQkK3L7bHzhW8X0jNibx28M368VOtLo6nGxDOYVzBtzzZUlXj89t QpblRtWXYfPwtiJikkG9JlMMQcdQE5xLj2ATtwBDR6Hv1jitRb+Ul4F6gkhBqwggDpnZ TZFSQZNcABQVAvsFNqpg/VJviH/tdez10ByE73TiHka+y9BxfnQYz+yTpNP9t2DU7nG3 dkxA== MIME-Version: 1.0 Received: by 10.68.189.167 with SMTP id gj7mr1995910pbc.99.1334714468343; Tue, 17 Apr 2012 19:01:08 -0700 (PDT) Received: by 10.68.71.163 with HTTP; Tue, 17 Apr 2012 19:01:08 -0700 (PDT) In-Reply-To: <4F8E0163.9030009@FreeBSD.org> References: <4F8E0163.9030009@FreeBSD.org> Date: Tue, 17 Apr 2012 19:01:08 -0700 Message-ID: From: Ben Fiedler To: Gabor Kovesdan X-Gm-Message-State: ALoCoQneDElIKXKQcrBmh0BecWq1KXXjA/4bEv/fdhEwcLuF0ipTGzTZa/yHNFN6pLkjBSSNCrVQ Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Matthew Story , freebsd-hackers@freebsd.org Subject: Re: Status of BSD Diff replacement? X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Apr 2012 02:01:09 -0000 Gabor, I made a branch off of your perforce diff code in my work on the diff tool: >From my understanding you started those modifications from OpenBSD's diff in 2008, so Matthew's assertion that "our incomplete BSD diff is OpenBSD diff + improvements" is 100% correct. I also ported and started work on sdiff and diff3 from OpenBSD, but made minimal headway on each. The red items on the table here lists the needed argument support to match GNU grep: http://wiki.freebsd.org/SOC2010BenFiedler#diff Though there's only a few left, they are not trivial by any means. -Ben On Tue, Apr 17, 2012 at 4:48 PM, Gabor Kovesdan wrote: > On 2012.04.17. 23:03, Matthew Story wrote: > >> Just wondering what the current status is on a BSD diff replacement. The >> IdeasPage suggests that a goodly amount of work was done on this for GSoC >> 2010 (http://wiki.freebsd.org/**IdeasPage#BSD-licensed_Text-** >> Processing_Tools), >> but the GPLinBase page says it's unowned and suggests replacement with >> OpenBSD diff (http://wiki.freebsd.org/**GPLinBase >> ). >> > Unless OpenBSD folks have changed or developed something, our incomplete > BSD diff is OpenBSD diff + improvements. > >> >> Wondering how much is outstanding on this, and where to start reading to >> catch up on what's been done? >> > > I worked a bit on that in 2008 along with grep and sort but these got more > priorities so lots of features are still missing. Then Ben Fiedler also > worked on it in 2010 but I don't exactly know what he accomplished and > whether he took my code or chose another way. So for someone who wants to > work on it, first it should be checked what's done, maybe merge my version > and Ben's version, check whether OpenBSD added something new or fixed > somethings and then implement missing features and do lots of testing to > ensure compatibility with GNU diff. And performance tests and improvements > if necessary. > > I work on grep/regex related things and recently Oleg Moskalenko took over > my incomplete BSD sort code but noone is working on BSD diff so any > contribution is very welcome. > > Gabor >