From owner-p4-projects@FreeBSD.ORG  Wed May  7 19:45:34 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3B853106566C; Wed,  7 May 2008 19:45:34 +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 EF5B6106564A
	for <perforce@freebsd.org>; Wed,  7 May 2008 19:45:33 +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 E4A918FC0C
	for <perforce@freebsd.org>; Wed,  7 May 2008 19:45:33 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47JjXhR058464
	for <perforce@freebsd.org>; Wed, 7 May 2008 19:45:33 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47JjXuV058462
	for perforce@freebsd.org; Wed, 7 May 2008 19:45:33 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 7 May 2008 19:45:33 GMT
Message-Id: <200805071945.m47JjXuV058462@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 141295 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: Wed, 07 May 2008 19:45:34 -0000

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

Change 141295 by gabor@gabor_server on 2008/05/07 19:44:43

	- Implement --label

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#6 edit
.. //depot/projects/soc2008/gabor_textproc/grep/grep.h#6 edit
.. //depot/projects/soc2008/gabor_textproc/grep/util.c#8 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#6 (text+ko) ====

@@ -90,6 +90,7 @@
 int	 xflag;		/* -x: pattern must match entire line */
 int	 lbflag;	/* --line-buffered */
 int	 nullflag;	/* --null */
+char	*label;		/* --label */
 
 int binbehave = BIN_FILE_BIN;
 
@@ -98,6 +99,7 @@
 	HELP_OPT,
 	MMAP_OPT,
 	LINEBUF_OPT,
+	LABEL_OPT,
 	NULL_OPT
 };
 
@@ -131,8 +133,7 @@
 	{"help",		no_argument,		NULL, HELP_OPT},
 	{"mmap",		no_argument,		NULL, MMAP_OPT},
 	{"line-buffered",	no_argument,		NULL, LINEBUF_OPT},
-/* XXX: UNIMPLEMENTED
-	{"label",		required_argument,	NULL, LABEL_OPT}, */
+	{"label",		required_argument,	NULL, LABEL_OPT},
 	{"null",		no_argument,		NULL, NULL_OPT},
 /* XXX: UNIMPLEMENTED
 	{"color",		optional_argument,	NULL, COLOR_OPT},
@@ -427,6 +428,9 @@
 			else
 				errx(2, "Unknown binary-files option");
 			break;
+		case LABEL_OPT:
+			label = optarg;
+			break;
 		case LINEBUF_OPT:
 			lbflag = 1;
 			break;

==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#6 (text+ko) ====

@@ -65,6 +65,7 @@
 		 bflag, cflag, hflag, iflag, lflag, nflag, qflag, sflag,
 		 vflag, wflag, xflag,
 		 nullflag;
+extern char	*label;
 extern int	 binbehave;
 
 extern int	 first, matchall, patterns, tail;

==== //depot/projects/soc2008/gabor_textproc/grep/util.c#8 (text+ko) ====

@@ -108,7 +108,10 @@
 	int		 c, t, z, nottext;
 
 	if (fn == NULL) {
-		fn = "(standard input)";
+		if (label != NULL)
+			fn = label;
+		else
+			fn = "(standard input)";
 		f = grep_fdopen(STDIN_FILENO, "r");
 	} else {
 		f = grep_open(fn, "r");