//usage:#define fgrep_full_usage ""
#define OPTSTR_GREP \
- "lnqvscFiHhe:f:Lorm:wx" \
- IF_FEATURE_GREP_CONTEXT("A:B:C:") \
+ "lnqvscFiHhe:*f:*Lorm:+wx" \
+ IF_FEATURE_GREP_CONTEXT("A:+B:+C:+") \
IF_FEATURE_GREP_EGREP_ALIAS("E") \
IF_EXTRA_COMPAT("z") \
"aI"
#endif
#define ALLOCATED 1
#define COMPILED 2
- int flg_mem_alocated_compiled;
+ int flg_mem_allocated_compiled;
} grep_list_data_t;
#if !ENABLE_EXTRA_COMPAT
#endif
char *match_at;
- if (!(gl->flg_mem_alocated_compiled & COMPILED)) {
- gl->flg_mem_alocated_compiled |= COMPILED;
+ if (!(gl->flg_mem_allocated_compiled & COMPILED)) {
+ gl->flg_mem_allocated_compiled |= COMPILED;
#if !ENABLE_EXTRA_COMPAT
xregcomp(&gl->compiled_regex, gl->pattern, reflags);
#else
grep_list_data_t *gl = xzalloc(sizeof(*gl));
gl->pattern = pattern;
#if ENABLE_FEATURE_CLEAN_UP
- gl->flg_mem_alocated_compiled = flg_used_mem;
+ gl->flg_mem_allocated_compiled = flg_used_mem;
#else
- /*gl->flg_mem_alocated_compiled = 0;*/
+ /*gl->flg_mem_allocated_compiled = 0;*/
#endif
return (char *)gl;
}
#if ENABLE_FEATURE_GREP_CONTEXT
/* -H unsets -h; -C unsets -A,-B; -e,-f are lists;
* -m,-A,-B,-C have numeric param */
- opt_complementary = "H-h:C-AB:e::f::m+:A+:B+:C+";
+ opt_complementary = "H-h:C-AB";
opts = getopt32(argv,
OPTSTR_GREP,
&pattern_head, &fopt, &max_matches,
#else
/* with auto sanity checks */
/* -H unsets -h; -c,-q or -l unset -n; -e,-f are lists; -m N */
- opt_complementary = "H-h:c-n:q-n:l-n:e::f::m+";
+ opt_complementary = "H-h:c-n:q-n:l-n:";
getopt32(argv, OPTSTR_GREP,
&pattern_head, &fopt, &max_matches);
#endif
grep_list_data_t *gl = (grep_list_data_t *)pattern_head_ptr->data;
pattern_head = pattern_head->link;
- if (gl->flg_mem_alocated_compiled & ALLOCATED)
+ if (gl->flg_mem_allocated_compiled & ALLOCATED)
free(gl->pattern);
- if (gl->flg_mem_alocated_compiled & COMPILED)
+ if (gl->flg_mem_allocated_compiled & COMPILED)
regfree(&gl->compiled_regex);
free(gl);
free(pattern_head_ptr);