Compare commits
2
Commits
1_7_3
..
1_7_stable
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
de15bb931a | ||
|
|
cf24d29529 |
No files matched your search
@@ -1,6 +1,6 @@
|
||||
VERSION = 1
|
||||
PATCHLEVEL = 7
|
||||
SUBLEVEL = 3
|
||||
SUBLEVEL = 5
|
||||
EXTRAVERSION =
|
||||
NAME = Unnamed
|
||||
|
||||
|
||||
+11
-4
@@ -154,14 +154,14 @@ static int grep_file(FILE *file)
|
||||
|
||||
while ((line = xmalloc_getline(file)) != NULL) {
|
||||
llist_t *pattern_ptr = pattern_head;
|
||||
grep_list_data_t * gl;
|
||||
grep_list_data_t *gl = gl; /* for gcc */
|
||||
|
||||
linenum++;
|
||||
ret = 0;
|
||||
while (pattern_ptr) {
|
||||
gl = (grep_list_data_t *)pattern_ptr->data;
|
||||
if (FGREP_FLAG) {
|
||||
ret = strstr(line, gl->pattern) != NULL;
|
||||
ret |= (strstr(line, gl->pattern) != NULL);
|
||||
} else {
|
||||
/*
|
||||
* test for a postitive-assertion match (regexec returns success (0)
|
||||
@@ -255,8 +255,15 @@ static int grep_file(FILE *file)
|
||||
print_n_lines_after = lines_after;
|
||||
#endif
|
||||
if (option_mask32 & OPT_o) {
|
||||
line[regmatch.rm_eo] = '\0';
|
||||
print_line(line + regmatch.rm_so, linenum, ':');
|
||||
if (FGREP_FLAG) {
|
||||
/* -Fo just prints the pattern
|
||||
* (unless -v: -Fov doesnt print anything at all) */
|
||||
if (ret)
|
||||
print_line(gl->pattern, linenum, ':');
|
||||
} else {
|
||||
line[regmatch.rm_eo] = '\0';
|
||||
print_line(line + regmatch.rm_so, linenum, ':');
|
||||
}
|
||||
} else {
|
||||
print_line(line, linenum, ':');
|
||||
}
|
||||
|
||||
+1
-1
@@ -760,7 +760,7 @@ static servtab_t *getconfigent(void)
|
||||
sep->se_bi = NULL;
|
||||
#endif
|
||||
argc = 0;
|
||||
for (; cp; arg = skip(&cp)) {
|
||||
for (arg = skip(&cp); cp; arg = skip(&cp)) {
|
||||
if (argc < MAXARGV)
|
||||
sep->se_argv[argc++] = xxstrdup(arg);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user