d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If a file argument cannot be processed, process the remaining ones

Browse Source 
and exit non-zero (SUSv3)
This commit is contained in:
Tim J. Robbins 2002-05-24 10:58:21 +00:00
parent 204c78a163
commit 3af4dcb223
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
usr.bin/sed/main.c
View File

@ -96,6 +96,7 @@ static struct s_flist *files, **fl_nextp = &files;
int aflag, eflag, nflag;
int rflags = 0;
static int rval; /* Exit status */
/*
* Current file and line number; line numbers restart across compilation
@ -175,7 +176,7 @@ main(argc, argv)
cfclose(prog, NULL);
if (fclose(stdout))
err(1, "stdout");
exit (0);
exit(rval);
}
static void
@ -318,8 +319,12 @@ mf_fgets(sp, spflag)
continue;
}
fname = files->fname;
if ((f = fopen(fname, "r")) == NULL)
err(1, "%s", fname);
if ((f = fopen(fname, "r")) == NULL) {
warn("%s", fname);
rval = 1;
files = files->next;
continue;
}
if (inplace != NULL && *inplace == '\0')
unlink(fname);
}
@ -350,7 +355,7 @@ mf_fgets(sp, spflag)
/* Advance to next non-empty file */
while ((c = getc(f)) == EOF) {
(void)fclose(f);
files = files->next;
next: files = files->next;
if (files == NULL) {
lastline = 1;
return (1);
@ -366,8 +371,11 @@ mf_fgets(sp, spflag)
continue;
}
fname = files->fname;
if ((f = fopen(fname, "r")) == NULL)
err(1, "%s", fname);
if ((f = fopen(fname, "r")) == NULL) {
warn("%s", fname);
rval = 1;
goto next;
}
if (inplace != NULL && *inplace == '\0')
unlink(fname);
}