← Back to branch summary

~ubuntu-branches/ubuntu/trusty/agrep/trusty

« back to all changes in this revision

Viewing changes to compat.c.rej

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Baumann
  • Date: 2006-07-05 13:29:00 UTC
  • mfrom: (3.1.1 dapper)
  • Revision ID: james.westby@ubuntu.com-20060705132900-j24rz8zdk4xqdmoz
Tags: 4.17-3
* New email address.
* Some packaging style changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
compat.c.rej
 
1
***************
 
2
*** 20,28 ****
 
3
  int
 
4
  compat()
 
5
  {
 
6
-        if(BESTMATCH)  if(COUNT || FILENAMEONLY || APPROX || PAT_FILE) {
 
7
-                BESTMATCH = 0;
 
8
-                fprintf(stderr, "%s: -B option ignored when -c, -l, -f, or -# is on\n", Progname);
 
9
         }
 
10
         if (COUNT && LINENUM) {
 
11
                 LINENUM = 0;
 
12
--- 20,36 ----
 
13
  int
 
14
  compat()
 
15
  {
 
16
+        if (BESTMATCH) {
 
17
+                if (COUNT || FILENAMEONLY || APPROX || PAT_FILE) {
 
18
+                        BESTMATCH = 0;
 
19
+                        fprintf(stderr, "%s: -B option ignored when -c, -l, -f, or -# is on\n", Progname); 
 
20
+                }
 
21
+                if (LINENUM) {
 
22
+                        BESTMATCH = 0;
 
23
+                        fprintf(stderr, "%s: -B option turned off when -n is on\n", Progname); 
 
24
+                        /* Currently, the BESTMATCH option disables -n but there doesn't seem to be a reason for it. 
 
25
+                         * Compat.c modified while testing continues 10-26-2002 KAM */   
 
26
+                }
 
27
         }
 
28
         if (COUNT && LINENUM) {
 
29
                 LINENUM = 0;