emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now, what was that logic block doing up there?

Browse Source
This commit is contained in:
Mark Whitley 2000-11-03 20:02:35 +00:00
parent 2dc192fd99
commit e7ff2842dd
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editors/sed.c
View File

@ -537,12 +537,6 @@ static int do_subst_command(const struct sed_cmd *sed_cmd, const char *line)
int altered = 0; int altered = 0;
regmatch_t *regmatch = NULL; regmatch_t *regmatch = NULL;
/* if the user specified that they didn't want anything printed (i.e. a -n
* flag and no 'p' flag after the s///), then there's really no point doing
* anything here. */
if (be_quiet && !sed_cmd->sub_p)
return 0;
/* we only proceed if the substitution 'search' expression matches */ /* we only proceed if the substitution 'search' expression matches */
if (regexec(sed_cmd->sub_match, line, 0, NULL, 0) == REG_NOMATCH) if (regexec(sed_cmd->sub_match, line, 0, NULL, 0) == REG_NOMATCH)
return 0; return 0;
@ -615,6 +609,12 @@ static int do_sed_command(const struct sed_cmd *sed_cmd, const char *line)
* flag exists in the first place. * flag exists in the first place.
*/ */
/* if the user specified that they didn't want anything printed (i.e. a -n
* flag and no 'p' flag after the s///), then there's really no point doing
* anything here. */
if (be_quiet && !sed_cmd->sub_p)
break;
/* we print the line once, unless we were told to be quiet */ /* we print the line once, unless we were told to be quiet */
if (!be_quiet) if (!be_quiet)
altered = do_subst_command(sed_cmd, line); altered = do_subst_command(sed_cmd, line);

12
sed.c
View File

@ -537,12 +537,6 @@ static int do_subst_command(const struct sed_cmd *sed_cmd, const char *line)
int altered = 0; int altered = 0;
regmatch_t *regmatch = NULL; regmatch_t *regmatch = NULL;
/* if the user specified that they didn't want anything printed (i.e. a -n
* flag and no 'p' flag after the s///), then there's really no point doing
* anything here. */
if (be_quiet && !sed_cmd->sub_p)
return 0;
/* we only proceed if the substitution 'search' expression matches */ /* we only proceed if the substitution 'search' expression matches */
if (regexec(sed_cmd->sub_match, line, 0, NULL, 0) == REG_NOMATCH) if (regexec(sed_cmd->sub_match, line, 0, NULL, 0) == REG_NOMATCH)
return 0; return 0;
@ -615,6 +609,12 @@ static int do_sed_command(const struct sed_cmd *sed_cmd, const char *line)
* flag exists in the first place. * flag exists in the first place.
*/ */
/* if the user specified that they didn't want anything printed (i.e. a -n
* flag and no 'p' flag after the s///), then there's really no point doing
* anything here. */
if (be_quiet && !sed_cmd->sub_p)
break;
/* we print the line once, unless we were told to be quiet */ /* we print the line once, unless we were told to be quiet */
if (!be_quiet) if (!be_quiet)
altered = do_subst_command(sed_cmd, line); altered = do_subst_command(sed_cmd, line);