X-Git-Url: http://git.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=cli.c;fp=cli.c;h=5d2cd4c9cfbcec341028f41dfb480ab4487ca29e;hp=3b67047fa9e81e3641ca175a8ab35640338eed13;hb=584f56a2331471459604ad054b3a7bcc366e0f07;hpb=b3cd5ab4c010ee637f9c6d07460471c6246b7a49

diff --git a/cli.c b/cli.c
index 3b67047..5d2cd4c 100644
--- a/cli.c
+++ b/cli.c
@@ -119,6 +119,23 @@ static void receive_event(struct ubus_context *ctx, struct ubus_event_handler *e
 	print_event(type, msg);
 }
 
+static int ubus_cli_error(char *cmd, int argc, char **argv, int err)
+{
+       int i;
+
+       if (!simple_output && !isatty(fileno(stderr))) {
+	       fprintf(stderr, "Command failed: ubus %s ", cmd);
+	       for (i = 0; i < argc; i++) {
+		       fprintf(stderr, "%s ", argv[i]);
+	       }
+	       fprintf(stderr, "(%s)\n", ubus_strerror(err));
+
+	       return -err;
+       }
+
+       return err;
+}
+
 static int ubus_cli_list(struct ubus_context *ctx, int argc, char **argv)
 {
 	const char *path = NULL;
@@ -142,14 +159,18 @@ static int ubus_cli_call(struct ubus_context *ctx, int argc, char **argv)
 
 	blob_buf_init(&b, 0);
 	if (argc == 3 && !blobmsg_add_json_from_string(&b, argv[2])) {
-		return UBUS_STATUS_PARSE_ERROR;
+		return ubus_cli_error("call", argc, argv, UBUS_STATUS_PARSE_ERROR);
 	}
 
 	ret = ubus_lookup_id(ctx, argv[0], &id);
 	if (ret)
 		return ret;
 
-	return ubus_invoke(ctx, id, argv[1], b.head, receive_call_result_data, NULL, timeout * 1000);
+	ret = ubus_invoke(ctx, id, argv[1], b.head, receive_call_result_data, NULL, timeout * 1000);
+	if (ret)
+		return ubus_cli_error("call", argc, argv, ret);
+
+	return ret;
 }
 
 struct cli_listen_data {