From owner-svn-soc-all@FreeBSD.ORG Sat Jul 7 01:11:01 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 79913106566C for ; Sat, 7 Jul 2012 01:10:59 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sat, 07 Jul 2012 01:10:59 +0000 Date: Sat, 07 Jul 2012 01:10:59 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120707011100.79913106566C@hub.freebsd.org> Cc: Subject: socsvn commit: r239062 - in soc2012/jhagewood/sdiff: . sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jul 2012 01:11:01 -0000 Author: jhagewood Date: Sat Jul 7 01:10:59 2012 New Revision: 239062 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239062 Log: Modified: soc2012/jhagewood/sdiff/hagewood-sdiff.patch soc2012/jhagewood/sdiff/sdiff/sdiff.c Modified: soc2012/jhagewood/sdiff/hagewood-sdiff.patch ============================================================================== --- soc2012/jhagewood/sdiff/hagewood-sdiff.patch Sat Jul 7 01:07:58 2012 (r239061) +++ soc2012/jhagewood/sdiff/hagewood-sdiff.patch Sat Jul 7 01:10:59 2012 (r239062) @@ -12,7 +12,7 @@ .Sh NAME diff -rupN jhagewood/sdiff/sdiff-orig/sdiff.c jhagewood/sdiff/sdiff/sdiff.c --- jhagewood/sdiff/sdiff-orig/sdiff.c 2012-07-02 15:05:58.000000000 -0400 -+++ jhagewood/sdiff/sdiff/sdiff.c 2012-07-07 01:03:06.000000000 -0400 ++++ jhagewood/sdiff/sdiff/sdiff.c 2012-07-07 01:10:58.000000000 -0400 @@ -101,7 +101,8 @@ enum { HLINES_OPT, LFILES_OPT, @@ -196,7 +196,29 @@ case 'r': case '2': /* Choose right column as-is. */ -@@ -1117,10 +1127,8 @@ int_usage(void) +@@ -1103,24 +1113,22 @@ printd(FILE *file1, size_t file1end) + static void + int_usage(void) + { +- puts("e:\tedit blank diff\n" +- "eb:\tedit both diffs concatenated\n" +- "el:\tedit left diff\n" +- "er:\tedit right diff\n" +- "l | 1:\tchoose left diff\n" +- "r | 2:\tchoose right diff\n" +- "s:\tsilent mode--don't print identical lines\n" +- "v:\tverbose mode--print identical lines\n" ++ printf("%s", "e:\tedit blank diff\n", ++ "eb:\tedit both diffs concatenated\n", ++ "el:\tedit left diff\n", ++ "er:\tedit right diff\n", ++ "l | 1:\tchoose left diff\n", ++ "r | 2:\tchoose right diff\n", ++ "s:\tsilent mode--don't print identical lines\n", ++ "v:\tverbose mode--print identical lines\n", + "q:\tquit"); + } + static void usage(void) { Modified: soc2012/jhagewood/sdiff/sdiff/sdiff.c ============================================================================== --- soc2012/jhagewood/sdiff/sdiff/sdiff.c Sat Jul 7 01:07:58 2012 (r239061) +++ soc2012/jhagewood/sdiff/sdiff/sdiff.c Sat Jul 7 01:10:59 2012 (r239062) @@ -1113,14 +1113,14 @@ static void int_usage(void) { - puts("e:\tedit blank diff\n" - "eb:\tedit both diffs concatenated\n" - "el:\tedit left diff\n" - "er:\tedit right diff\n" - "l | 1:\tchoose left diff\n" - "r | 2:\tchoose right diff\n" - "s:\tsilent mode--don't print identical lines\n" - "v:\tverbose mode--print identical lines\n" + printf("%s", "e:\tedit blank diff\n", + "eb:\tedit both diffs concatenated\n", + "el:\tedit left diff\n", + "er:\tedit right diff\n", + "l | 1:\tchoose left diff\n", + "r | 2:\tchoose right diff\n", + "s:\tsilent mode--don't print identical lines\n", + "v:\tverbose mode--print identical lines\n", "q:\tquit"); }