From owner-p4-projects@FreeBSD.ORG Sun Jun 15 16:01:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E46441065672; Sun, 15 Jun 2008 16:01:23 +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 A48E3106566B for ; Sun, 15 Jun 2008 16:01:23 +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 985B58FC19 for ; Sun, 15 Jun 2008 16:01:23 +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 m5FG1NnO035137 for ; Sun, 15 Jun 2008 16:01:23 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5FG1NYo035135 for perforce@freebsd.org; Sun, 15 Jun 2008 16:01:23 GMT (envelope-from gabor@freebsd.org) Date: Sun, 15 Jun 2008 16:01:23 GMT Message-Id: <200806151601.m5FG1NYo035135@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 143527 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: Sun, 15 Jun 2008 16:01:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=143527 Change 143527 by gabor@gabor_server on 2008/06/15 16:00:35 - Eliminate the Sflag variable. If -P or nothing is specified Pflag is set, if -S is set Pflag is unset Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#18 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#14 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#18 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#18 (text+ko) ==== @@ -77,7 +77,6 @@ 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 */ int Zflag; /* -Z: grep in gzipped file */ int bflag; /* -b: show block numbers for each match */ int cflag; /* -c: only show a count of matching lines */ @@ -410,7 +409,7 @@ qflag = 1; break; case 'S': - Sflag++; + Pflag = 0; break; case 'R': case 'r': ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#14 (text+ko) ==== @@ -60,11 +60,10 @@ extern int cflags, eflags; /* Command line flags */ -extern int Aflag, Bflag, Dflag, Eflag, Fflag, Gflag, Hflag, Jflag, Lflag, Pflag, - Sflag, Rflag, Zflag, - bflag, cflag, hflag, iflag, lflag, mflag, nflag, Oflag, oflag, qflag, sflag, - vflag, wflag, xflag, - nullflag; +extern int Aflag, Bflag, Dflag, Eflag, Fflag, Gflag, Hflag, Jflag, + Lflag, Oflag, Pflag, Rflag, Zflag, + bflag, cflag, hflag, iflag, lflag, mflag, nflag, oflag, + qflag, sflag, vflag, wflag, xflag, nullflag; extern long long mcount; extern char *color, *label; extern int binbehave; ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#18 (text+ko) ==== @@ -74,7 +74,7 @@ fts_flags = FTS_COMFOLLOW; if (Pflag) fts_flags = FTS_PHYSICAL; - if (Sflag) + else fts_flags = FTS_LOGICAL; fts_flags |= FTS_NOSTAT | FTS_NOCHDIR;