Date: Sun, 15 Jun 2008 16:01:23 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 143527 for review Message-ID: <200806151601.m5FG1NYo035135@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200806151601.m5FG1NYo035135>