From owner-p4-projects@FreeBSD.ORG  Sat Jul 26 14:53:28 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1037E1065674; Sat, 26 Jul 2008 14:53:28 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C64F01065672
	for <perforce@freebsd.org>; Sat, 26 Jul 2008 14:53:27 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B65218FC16
	for <perforce@freebsd.org>; Sat, 26 Jul 2008 14:53:27 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m6QErReN001772
	for <perforce@freebsd.org>; Sat, 26 Jul 2008 14:53:27 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6QErRl1001770
	for perforce@freebsd.org; Sat, 26 Jul 2008 14:53:27 GMT
	(envelope-from gabor@freebsd.org)
Date: Sat, 26 Jul 2008 14:53:27 GMT
Message-Id: <200807261453.m6QErRl1001770@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 145974 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Jul 2008 14:53:28 -0000

http://perforce.freebsd.org/chv.cgi?CH=145974

Change 145974 by gabor@gabor_server on 2008/07/26 14:52:37

	- Reimplement --from-file and --to-file

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/diff/diff.c#14 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/diff/diff.c#14 (text+ko) ====

@@ -135,7 +135,7 @@
 int
 main(int argc, char **argv)
 {
-	char	*ep, *fromfile = NULL, *tofile = NULL, **oargv;
+	char	*ep, *fromfile = NULL, *tofile = NULL, **oargv, *src, *dst;
 	int	 ch, lastch, gotstdin, prevoptind, newarg, flags = 0;
 
 	setlocale(LC_ALL, "");
@@ -320,19 +320,21 @@
 				errx(2, "%s", buf);
 		}
 	}
-	if (strcmp(argv[0], "-") == 0) {
+	src = fromfile ? fromfile : argv[0];
+	dst = fromfile ? argv[0] : (tofile ? tofile : argv[1]);
+	if (strcmp(src, "-") == 0) {
 		fstat(STDIN_FILENO, &stb1);
 		gotstdin = 1;
-	} else if (stat(argv[0], &stb1) != 0) {
+	} else if (stat(src, &stb1) != 0) {
 		if (uniflag)
 			flags |= D_EMPTY1;
 		else
 			err(2, "%s", argv[0]);
 	}
-	if (strcmp(argv[1], "-") == 0) {
+	if (strcmp(dst, "-") == 0) {
 		fstat(STDIN_FILENO, &stb2);
 		gotstdin = 1;
-	} else if (stat(argv[1], &stb2) != 0)
+	} else if (stat(dst, &stb2) != 0)
 		err(2, "%s", argv[1]);
 	if (gotstdin && (S_ISDIR(stb1.st_mode) || S_ISDIR(stb2.st_mode)))
 		errx(2, "can't compare - to a directory");
@@ -340,19 +342,19 @@
 	if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) {
 		if (format == D_IFDEF)
 			errx(2, "-D option not supported with directories");
-		diffdir(argv[0], argv[1]);
+		diffdir(src, dst);
 	} else {
 		if (S_ISDIR(stb1.st_mode)) {
-			argv[0] = splice(argv[0], argv[1]);
-			if (stat(argv[0], &stb1) < 0)
-				err(2, "%s", argv[0]);
+			src = splice(src, dst);
+			if (stat(src, &stb1) < 0)
+				err(2, "%s", src);
 		}
 		if (S_ISDIR(stb2.st_mode)) {
-			argv[1] = splice(argv[1], argv[0]);
-			if (stat(argv[1], &stb2) < 0)
-				err(2, "%s", argv[1]);
+			dst = splice(dst, src);
+			if (stat(dst, &stb2) < 0)
+				err(2, "%s", dst);
 		}
-		print_status(diffreg(argv[0], argv[1], flags), argv[0], argv[1],
+		print_status(diffreg(src, dst, flags), src, dst,
 		    NULL);
 	}
 	exit(status);