From owner-svn-soc-all@FreeBSD.ORG Mon Aug 13 04:35:39 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 A520C106564A for ; Mon, 13 Aug 2012 04:35:38 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Mon, 13 Aug 2012 04:35:38 +0000 Date: Mon, 13 Aug 2012 04:35:38 +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: <20120813043538.A520C106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r240317 - soc2012/jhagewood/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: Mon, 13 Aug 2012 04:35:39 -0000 Author: jhagewood Date: Mon Aug 13 04:35:38 2012 New Revision: 240317 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240317 Log: Modified: soc2012/jhagewood/sdiff/sdiff.c Modified: soc2012/jhagewood/sdiff/sdiff.c ============================================================================== --- soc2012/jhagewood/sdiff/sdiff.c Mon Aug 13 04:19:27 2012 (r240316) +++ soc2012/jhagewood/sdiff/sdiff.c Mon Aug 13 04:35:38 2012 (r240317) @@ -526,13 +526,14 @@ binexec(char *diffprog, char *f1, char *f2) { - char *args[] = {diffprog, f1, f2, (char *) 0}; + char *args[]; if (filebehave == FILE_GZIP) { diffprog = ZDIFF_PATH; } + args[] = {diffprog, f1, f2, (char *) 0}; execv(diffprog, args); - /* If execv() fails, this program's execution will continue. */ + /* If execv() fails, sdiff's execution will continue. */ sprintf(stderr, "Could not execute diff process.\n"); exit(1); }