[Global-commit] global/global global.c

[Shigio YAMAGUCHI]

CVSROOT:        /sources/global
Module name:    global
Changes by:     Shigio YAMAGUCHI <shigio>       06/06/06 10:09:27

Modified files:
        global         : global.c 

Log message:
        Changed the priority of the options which specify format.
        
        [OLD]
        The -t and -x option are given to priority more than
        the --result option.
        
        [NEW]
        The --result option is given to priority more than
        the -t and -x option.'
        
        This make the format specification easy. Programs which call
        global(1) should use the --result option instead of the -t
        and -x option. Old spec might have been my mistake.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/global/global/global.c?cvsroot=global&r1=1.150&r2=1.151

Patches:
Index: global.c
===================================================================
RCS file: /sources/global/global/global/global.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -b -r1.150 -r1.151
--- global.c    23 Apr 2006 11:14:03 -0000      1.150
+++ global.c    6 Jun 2006 10:09:27 -0000       1.151
@@ -428,14 +428,17 @@
         */
        if (fflag || gflag || Pflag || (nofilter & SORT_FILTER))
                passthru = 1;
+       if (format == 0) {
        if (tflag) {                    /* ctags format */
                format = FORMAT_CTAGS;
        } else if (xflag) {             /* print details */
                format = FORMAT_CTAGS_X;
-       } else if (format == 0) {       /* print just a file name */
+               } else {                        /* print just a file name */
                format = FORMAT_PATH;
-               unique = 1;
        }
+       }
+       if (format == FORMAT_PATH)
+               unique = 1;
        /*
         * setup sort filter.
         */