git.droids-corp.org
/
libcmdline.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmdline (merge-intel): fix warnings when compiing with -D_FORTIFY_SOURCE=2
[libcmdline.git]
/
src
/
lib
/
cmdline.c
diff --git
a/src/lib/cmdline.c
b/src/lib/cmdline.c
index
6d37885
..
e6662bd
100644
(file)
--- a/
src/lib/cmdline.c
+++ b/
src/lib/cmdline.c
@@
-97,13
+97,16
@@
cmdline_complete_buffer(struct rdline *rdl, const char *buf,
return cmdline_complete(cl, buf, state, dstbuf, dstsize);
}
return cmdline_complete(cl, buf, state, dstbuf, dstsize);
}
-void
+int
cmdline_write_char(struct rdline *rdl, char c)
{
cmdline_write_char(struct rdline *rdl, char c)
{
+ int ret = -1;
struct cmdline *cl = rdl->opaque;
struct cmdline *cl = rdl->opaque;
- if (cl->s_out >= 0) {
- write(cl->s_out, &c, 1);
- }
+
+ if (cl->s_out >= 0)
+ ret = write(cl->s_out, &c, 1);
+
+ return ret;
}
}
@@
-222,10
+225,10
@@
cmdline_interact(struct cmdline *cl)
c = -1;
while (1) {
c = -1;
while (1) {
- read(cl->s_in, &c, 1);
- if (cmdline_in(cl, &c, 1) < 0) {
+ if (read(cl->s_in, &c, 1) < 0)
+ break;
+ if (cmdline_in(cl, &c, 1) < 0)
break;
break;
- }
}
cmdline_free(cl);
}
}
cmdline_free(cl);
}