summaryrefslogtreecommitdiffstats
path: root/term-utils
diff options
context:
space:
mode:
authorKarel Zak2014-03-19 13:25:45 +0100
committerKarel Zak2014-04-03 12:29:16 +0200
commit78a3b0af301b219c501f2c45d4bdcd65aed7f7a6 (patch)
tree88288eaf5e86c369aa2513b32d79d7d2b2622b02 /term-utils
parentlibsmartcols: add lines (diff)
downloadkernel-qcow2-util-linux-78a3b0af301b219c501f2c45d4bdcd65aed7f7a6.tar.gz
kernel-qcow2-util-linux-78a3b0af301b219c501f2c45d4bdcd65aed7f7a6.tar.xz
kernel-qcow2-util-linux-78a3b0af301b219c501f2c45d4bdcd65aed7f7a6.zip
include/carefulputc: cleanup and add fputs_{quoted,nonblank}()
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'term-utils')
-rw-r--r--term-utils/wall.c2
-rw-r--r--term-utils/write.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/term-utils/wall.c b/term-utils/wall.c
index 20a2891f2..1bae9d652 100644
--- a/term-utils/wall.c
+++ b/term-utils/wall.c
@@ -284,7 +284,7 @@ static char *makemsg(char *fname, char **mvec, int mvecsz,
if (ch == '\t')
cnt += (7 - (cnt % 8));
if (ch != '\n')
- carefulputc(ch, fp, '^');
+ fputc_careful(ch, fp, '^');
}
}
}
diff --git a/term-utils/write.c b/term-utils/write.c
index f5ca34108..146f4ba5e 100644
--- a/term-utils/write.c
+++ b/term-utils/write.c
@@ -373,7 +373,7 @@ void wr_fputs(char *s)
{
char c;
-#define PUTC(c) if (carefulputc(c, stdout, '^') == EOF) \
+#define PUTC(c) if (fputc_careful(c, stdout, '^') == EOF) \
err(EXIT_FAILURE, _("carefulputc failed"));
while (*s) {
c = *s++;