Page MenuHomeFreeBSD
Files F169279504

D6554.id16840.diff
No OneTemporary
Actions

D6554.id16840.diff
View Options

Index: bin/ed/io.c
===================================================================
--- bin/ed/io.c
+++ bin/ed/io.c
@@ -36,18 +36,23 @@
{
FILE *fp;
long size;
-
+ int cs;
fp = (*fn == '!') ? popen(fn + 1, "r") : fopen(strip_escapes(fn), "r");
if (fp == NULL) {
fprintf(stderr, "%s: %s\n", fn, strerror(errno));
errmsg = "cannot open input file";
return ERR;
- } else if ((size = read_stream(fp, n)) < 0)
- return ERR;
- else if (((*fn == '!') ? pclose(fp) : fclose(fp)) < 0) {
+ }
+ if ((size = read_stream(fp, n)) < 0) {
+ fprintf(stderr, "%s: %s\n", fn, strerror(errno));
+ errmsg = "error reading input file";
+ }
+ if ((cs = (*fn == '!') ? pclose(fp) : fclose(fp)) < 0) {
fprintf(stderr, "%s: %s\n", fn, strerror(errno));
errmsg = "cannot close input file";
+ }
+ if (size < 0 || cs < 0) {
return ERR;
}
if (!scripted)
@@ -143,17 +148,23 @@
{
FILE *fp;
long size;
+ int cs;
fp = (*fn == '!') ? popen(fn+1, "w") : fopen(strip_escapes(fn), mode);
if (fp == NULL) {
fprintf(stderr, "%s: %s\n", fn, strerror(errno));
errmsg = "cannot open output file";
return ERR;
- } else if ((size = write_stream(fp, n, m)) < 0)
- return ERR;
- else if (((*fn == '!') ? pclose(fp) : fclose(fp)) < 0) {
+ }
+ if ((size = write_stream(fp, n, m)) < 0) {
+ fprintf(stderr, "%s: %s\n", fn, strerror(errno));
+ errmsg = "error writing output file";
+ }
+ if ((cs = (*fn == '!') ? pclose(fp) : fclose(fp)) < 0) {
fprintf(stderr, "%s: %s\n", fn, strerror(errno));
errmsg = "cannot close output file";
+ }
+ if (size < 0 || cs < 0) {
return ERR;
}
if (!scripted)

File Metadata

Mime Type
text/plain
Expires
Wed, Sep 2, 3:08 AM (7 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37885967
Default Alt Text
D6554.id16840.diff (1 KB)

Event Timeline