/[grep]/grep/src/grep.c
ViewVC logotype

Diff of /grep/src/grep.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.117 by charles_levert, Thu Nov 10 19:57:54 2005 UTC revision 1.118 by charles_levert, Fri Nov 11 12:17:52 2005 UTC
# Line 1663  parse_grep_colors (void) Line 1663  parse_grep_colors (void)
1663                if (val)                if (val)
1664                  *(cap->var) = val;                  *(cap->var) = val;
1665                else                else
1666                  fprintf(stderr,                  error(0, 0, _("In GREP_COLORS=\"%s\", the \"%s\" capacity "
1667                          _("%s: In GREP_COLORS=\"%s\", the \"%s\" capacity needs a value (\"=...\"); skipped.\n"),                                "needs a value (\"=...\"); skipped."), p, name);
                         program_name, p, name);  
1668              }              }
1669            else if (val)            else if (val)
1670              fprintf(stderr,              error(0, 0, _("In GREP_COLORS=\"%s\", the \"%s\" capacity "
1671                      _("%s: In GREP_COLORS=\"%s\", the \"%s\" capacity is boolean and cannot take a value (\"=%s\"); skipped.\n"),                            "is boolean and cannot take a value (\"=%s\"); "
1672                      program_name, p, name, val);                            "skipped."), p, name, val);
1673          if (cap->fct)          if (cap->fct)
1674            {            {
1675              const char *err_str = cap->fct();              const char *err_str = cap->fct();
1676    
1677              if (err_str)              if (err_str)
1678                fprintf(stderr,                error(0, 0, _("In GREP_COLORS=\"%s\", the \"%s\" capacity %s."),
1679                        _("%s: In GREP_COLORS=\"%s\", the \"%s\" capacity %s.\n"),                      p, name, err_str);
                       program_name, p, name, err_str);  
1680            }            }
1681          if (c == '\0')          if (c == '\0')
1682            return;            return;
# Line 1700  parse_grep_colors (void) Line 1698  parse_grep_colors (void)
1698        goto ill_formed;        goto ill_formed;
1699    
1700   ill_formed:   ill_formed:
1701    fprintf(stderr,    error(0, 0, _("Stopped processing of ill-formed GREP_COLORS=\"%s\" "
1702            _("%s: Stopped processing of ill-formed GREP_COLORS=\"%s\" at remaining substring \"%s\".\n"),                  "at remaining substring \"%s\"."), p, q);
           program_name, p, q);  
1703  }  }
1704    
1705  /* mb_icase_keys() is called by main() to convert its "keys" string with  /* mb_icase_keys() is called by main() to convert its "keys" string with
# Line 2113  main (int argc, char **argv) Line 2110  main (int argc, char **argv)
2110      out_before = default_context;      out_before = default_context;
2111    if (only_matching && (out_after > 0 || out_before > 0))    if (only_matching && (out_after > 0 || out_before > 0))
2112      {      {
2113        fprintf(stderr,        error(0, 0, _("Any context line specification "
2114               _("%s: Any context line specification "                      "is ignored with -o/--only-matching."));
                "is ignored with -o/--only-matching.\n"),  
              program_name);  
2115        out_after = out_before = 0;        out_after = out_before = 0;
2116      }      }
2117    

Legend:
Removed from v.1.117  
changed lines
  Added in v.1.118

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26