From owner-p4-projects@FreeBSD.ORG Thu Jun 5 21:09:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8886D1065677; Thu, 5 Jun 2008 21:09:43 +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 4A6DE1065673 for ; Thu, 5 Jun 2008 21:09:43 +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 3AC5D8FC18 for ; Thu, 5 Jun 2008 21:09:43 +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 m55L9h0D086101 for ; Thu, 5 Jun 2008 21:09:43 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m55L9hOP086099 for perforce@freebsd.org; Thu, 5 Jun 2008 21:09:43 GMT (envelope-from gabor@freebsd.org) Date: Thu, 5 Jun 2008 21:09:43 GMT Message-Id: <200806052109.m55L9hOP086099@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 142986 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jun 2008 21:09:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=142986 Change 142986 by gabor@gabor_server on 2008/06/05 21:08:56 - Rename -o to -O so that we can use -o for the GNU behavior Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#11 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#9 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#11 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#11 (text+ko) ==== @@ -73,6 +73,7 @@ int Gflag; /* -G: interpret pattern as basic regexp */ int Hflag; /* -H: always print file name */ int Lflag; /* -L: only show names of files with no matches */ +int Oflag; /* -O: if -R, follow explicitly listed symlinks */ int Pflag; /* -P: if -R, no symlinks are followed */ int Rflag; /* -R: recursively search directory trees */ int Sflag; /* -S: if -R, follow all symlinks */ @@ -83,7 +84,6 @@ int iflag; /* -i: ignore case */ int lflag; /* -l: only show names of files with matches */ int nflag; /* -n: show line numbers in front of matching lines */ -int oflag; /* -o: if -R, follow explicitly listed symlinks */ int qflag; /* -q: quiet mode (don't output anything) */ int sflag; /* -s: silent mode (ignore errors) */ int vflag; /* -v: only show non-matching lines */ @@ -381,8 +381,8 @@ case 'n': nflag = 1; break; - case 'o': - oflag++; + case 'O': + Oflag++; break; case 'P': Pflag++; ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#9 (text+ko) ==== @@ -62,7 +62,7 @@ /* Command line flags */ extern int Aflag, Bflag, Dflag, Eflag, Fflag, Gflag, Hflag, Lflag, Pflag, Sflag, Rflag, Zflag, - bflag, cflag, hflag, iflag, lflag, nflag, oflag, qflag, sflag, + bflag, cflag, hflag, iflag, lflag, nflag, Oflag, qflag, sflag, vflag, wflag, xflag, nullflag; extern char *label; ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#11 (text+ko) ==== @@ -70,7 +70,7 @@ c = fts_flags = 0; - if (oflag) + if (Oflag) fts_flags = FTS_COMFOLLOW; if (Pflag) fts_flags = FTS_PHYSICAL;