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: check size of result buffer to avoid overflow
[libcmdline.git]
/
src
/
lib
/
cmdline.c
diff --git
a/src/lib/cmdline.c
b/src/lib/cmdline.c
index
5e7f009
..
d44e44b
100644
(file)
--- a/
src/lib/cmdline.c
+++ b/
src/lib/cmdline.c
@@
-66,23
+66,14
@@
#include <stdarg.h>
#include <inttypes.h>
#include <fcntl.h>
#include <stdarg.h>
#include <inttypes.h>
#include <fcntl.h>
-
-#include <sys/socket.h>
+#include <termios.h>
#include <netinet/in.h>
#include <netinet/in.h>
-#include <sys/socket.h>
-#include <sys/un.h>
#include "cmdline_parse.h"
#include "cmdline_rdline.h"
#include "cmdline.h"
#include "cmdline_parse.h"
#include "cmdline_rdline.h"
#include "cmdline.h"
-
-#define PROMPT_SUFFIX "> "
-
-
-/**********************/
-
-void
+static void
cmdline_valid_buffer(struct rdline *rdl, const char *buf,
__attribute__((unused)) unsigned int size)
{
cmdline_valid_buffer(struct rdline *rdl, const char *buf,
__attribute__((unused)) unsigned int size)
{
@@
-95,9
+86,11
@@
cmdline_valid_buffer(struct rdline *rdl, const char *buf,
cmdline_printf(cl, "Command not found\n");
else if (ret == CMDLINE_PARSE_BAD_ARGS)
cmdline_printf(cl, "Bad arguments\n");
cmdline_printf(cl, "Command not found\n");
else if (ret == CMDLINE_PARSE_BAD_ARGS)
cmdline_printf(cl, "Bad arguments\n");
+ else if (ret == CMDLINE_PARSE_UNTERMINATED_QUOTE)
+ cmdline_printf(cl, "Unterminated quote\n");
}
}
-int
+
static
int
cmdline_complete_buffer(struct rdline *rdl, const char *buf,
char *dstbuf, unsigned int dstsize,
int *state)
cmdline_complete_buffer(struct rdline *rdl, const char *buf,
char *dstbuf, unsigned int dstsize,
int *state)
@@
-106,20
+99,23
@@
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;
}
void
cmdline_set_prompt(struct cmdline *cl, const char *prompt)
{
}
void
cmdline_set_prompt(struct cmdline *cl, const char *prompt)
{
- snprintf(cl->prompt, sizeof(cl->prompt), prompt);
+ snprintf(cl->prompt, sizeof(cl->prompt),
"%s",
prompt);
}
struct cmdline *
}
struct cmdline *
@@
-158,14
+154,33
@@
void
cmdline_printf(const struct cmdline *cl, const char *fmt, ...)
{
va_list ap;
cmdline_printf(const struct cmdline *cl, const char *fmt, ...)
{
va_list ap;
- char buffer[BUFSIZ];
+#ifdef _GNU_SOURCE
+ if (cl->s_out < 0)
+ return;
va_start(ap, fmt);
va_start(ap, fmt);
- v
snprintf(buffer, 512
, fmt, ap);
+ v
dprintf(cl->s_out
, fmt, ap);
va_end(ap);
va_end(ap);
- if (cl->s_out >= 0) {
- write(cl->s_out, buffer, strlen(buffer));
- }
+#else
+ int ret;
+ char *buf;
+
+ if (cl->s_out < 0)
+ return;
+
+ buf = malloc(BUFSIZ);
+ if (buf == NULL)
+ return;
+ va_start(ap, fmt);
+ ret = vsnprintf(buf, BUFSIZ, fmt, ap);
+ va_end(ap);
+ if (ret < 0)
+ return;
+ if (ret >= BUFSIZ)
+ ret = BUFSIZ - 1;
+ write(cl->s_out, buf, ret);
+ free(buf);
+#endif
}
int
}
int
@@
-175,11
+190,10
@@
cmdline_in(struct cmdline *cl, const char *buf, int size)
int ret = 0;
int i, same;
int ret = 0;
int i, same;
- /* XXX use defines instead of hardcoded values */
for (i=0; i<size; i++) {
ret = rdline_char_in(&cl->rdl, buf[i]);
for (i=0; i<size; i++) {
ret = rdline_char_in(&cl->rdl, buf[i]);
- if (ret ==
1
) {
+ if (ret ==
RDLINE_RES_VALIDATED
) {
buffer = rdline_get_buffer(&cl->rdl);
history = rdline_get_history_item(&cl->rdl, 0);
if (history) {
buffer = rdline_get_buffer(&cl->rdl);
history = rdline_get_history_item(&cl->rdl, 0);
if (history) {
@@
-192,8
+206,30
@@
cmdline_in(struct cmdline *cl, const char *buf, int size)
rdline_add_history(&cl->rdl, buffer);
rdline_newline(&cl->rdl, cl->prompt);
}
rdline_add_history(&cl->rdl, buffer);
rdline_newline(&cl->rdl, cl->prompt);
}
- else if (ret == -2)
+ else if (ret == RDLINE_RES_EOF)
+ return -1;
+ else if (ret == RDLINE_RES_EXITED)
return -1;
}
return i;
}
return -1;
}
return i;
}
+
+void
+cmdline_quit(struct cmdline *cl)
+{
+ rdline_quit(&cl->rdl);
+}
+
+void
+cmdline_interact(struct cmdline *cl)
+{
+ char c;
+
+ c = -1;
+ while (1) {
+ if (read(cl->s_in, &c, 1) < 0)
+ break;
+ if (cmdline_in(cl, &c, 1) < 0)
+ break;
+ }
+}