Author: dim
Date: Fri Dec 16 21:12:23 2011
New Revision: 228595
URL: http://svn.freebsd.org/changeset/base/228595
Log:
Fix some obtuse fprintf tricks in bin/ed.
MFC after: 1 week
Modified:
head/bin/ed/io.c
head/bin/ed/main.c
Modified: head/bin/ed/io.c
==============================================================================
--- head/bin/ed/io.c Fri Dec 16 20:38:22 2011 (r228594)
+++ head/bin/ed/io.c Fri Dec 16 21:12:23 2011 (r228595)
@@ -53,7 +53,8 @@ read_file(char *fn, long n)
errmsg = "cannot close input file";
return ERR;
}
- fprintf(stdout, !scripted ? "%lu\n" : "", size);
+ if (!scripted)
+ fprintf(stdout, "%lu\n", size);
return current_addr - n;
}
@@ -161,7 +162,8 @@ write_file(char *fn, const char *mode, l
errmsg = "cannot close output file";
return ERR;
}
- fprintf(stdout, !scripted ? "%lu\n" : "", size);
+ if (!scripted)
+ fprintf(stdout, "%lu\n", size);
return n ? m - n + 1 : 0;
}
Modified: head/bin/ed/main.c
==============================================================================
--- head/bin/ed/main.c Fri Dec 16 20:38:22 2011 (r228594)
+++ head/bin/ed/main.c Fri Dec 16 21:12:23 2011 (r228595)
@@ -192,9 +192,10 @@ top:
fputs("?\n", stderr);
errmsg = "warning: file modified";
if (!isatty(0)) {
- fprintf(stderr, garrulous ?
- "script, line %d: %s\n" :
- "", lineno, errmsg);
+ if (garrulous)
+ fprintf(stderr,
+ "script, line %d: %s\n",
+ lineno, errmsg);
quit(2);
}
clearerr(stdin);
@@ -225,27 +226,26 @@ top:
fputs("?\n", stderr); /* give warning */
errmsg = "warning: file modified";
if (!isatty(0)) {
- fprintf(stderr, garrulous ?
- "script, line %d: %s\n" :
- "", lineno, errmsg);
+ if (garrulous)
+ fprintf(stderr, "script, line %d: %s\n",
+ lineno, errmsg);
quit(2);
}
break;
case FATAL:
- if (!isatty(0))
- fprintf(stderr, garrulous ?
- "script, line %d: %s\n" : "",
- lineno, errmsg);
- else
- fprintf(stderr, garrulous ? "%s\n" : "",
- errmsg);
+ if (!isatty(0)) {
+ if (garrulous)
+ fprintf(stderr, "script, line %d: %s\n",
+ lineno, errmsg);
+ } else if (garrulous)
+ fprintf(stderr, "%s\n", errmsg);
quit(3);
default:
fputs("?\n", stderr);
if (!isatty(0)) {
- fprintf(stderr, garrulous ?
- "script, line %d: %s\n" : "",
- lineno, errmsg);
+ if (garrulous)
+ fprintf(stderr, "script, line %d: %s\n",
+ lineno, errmsg);
quit(2);
}
break;
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
