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

Fix some obtuse fprintf tricks in bin/ed.

Browse Source 
MFC after:	1 week
This commit is contained in:
Dimitry Andric 2011-12-16 21:12:23 +00:00
parent 7be5be337a
commit 4bfc2007ab
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=228595
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/ed/io.c
View File

@ -53,7 +53,8 @@ read_file(char *fn, long n)
errmsg = "cannot close input file"; errmsg = "cannot close input file";
return ERR; return ERR;
} }
fprintf(stdout, !scripted ? "%lu\n" : "", size); if (!scripted)
fprintf(stdout, "%lu\n", size);
return current_addr - n; return current_addr - n;
} }
@ -161,7 +162,8 @@ write_file(char *fn, const char *mode, long n, long m)
errmsg = "cannot close output file"; errmsg = "cannot close output file";
return ERR; return ERR;
} }
fprintf(stdout, !scripted ? "%lu\n" : "", size); if (!scripted)
fprintf(stdout, "%lu\n", size);
return n ? m - n + 1 : 0; return n ? m - n + 1 : 0;
} }

32
bin/ed/main.c
View File

@ -192,9 +192,10 @@ main(volatile int argc, char ** volatile argv)
fputs("?\n", stderr); fputs("?\n", stderr);
errmsg = "warning: file modified"; errmsg = "warning: file modified";
if (!isatty(0)) { if (!isatty(0)) {
fprintf(stderr, garrulous ? if (garrulous)
"script, line %d: %s\n" : fprintf(stderr,
"", lineno, errmsg); "script, line %d: %s\n",
lineno, errmsg);
quit(2); quit(2);
} }
clearerr(stdin); clearerr(stdin);
@ -225,27 +226,26 @@ main(volatile int argc, char ** volatile argv)
fputs("?\n", stderr); /* give warning */ fputs("?\n", stderr); /* give warning */
errmsg = "warning: file modified"; errmsg = "warning: file modified";
if (!isatty(0)) { if (!isatty(0)) {
fprintf(stderr, garrulous ? if (garrulous)
"script, line %d: %s\n" : fprintf(stderr, "script, line %d: %s\n",
"", lineno, errmsg); lineno, errmsg);
quit(2); quit(2);
} }
break; break;
case FATAL: case FATAL:
if (!isatty(0)) if (!isatty(0)) {
fprintf(stderr, garrulous ? if (garrulous)
"script, line %d: %s\n" : "", fprintf(stderr, "script, line %d: %s\n",
lineno, errmsg); lineno, errmsg);
else } else if (garrulous)
fprintf(stderr, garrulous ? "%s\n" : "", fprintf(stderr, "%s\n", errmsg);
errmsg);
quit(3); quit(3);
default: default:
fputs("?\n", stderr); fputs("?\n", stderr);
if (!isatty(0)) { if (!isatty(0)) {
fprintf(stderr, garrulous ? if (garrulous)
"script, line %d: %s\n" : "", fprintf(stderr, "script, line %d: %s\n",
lineno, errmsg); lineno, errmsg);
quit(2); quit(2);
} }
break; break;