PERFORCE change 142986 for review

[Gabor Kovesdan]

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

Change 142986 by gabor at 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;