From 173867689a0b328947c12e45a863145ec20c7628 Mon Sep 17 00:00:00 2001
From: Andrey Nakin <andrey.nakin@gmail.com>
Date: 周一, 23 3月 2015 20:36:11 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/j123b567/scpi-parser
---
libscpi/src/parser.c | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 61d6588..122b557 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -236,6 +236,9 @@
context->paramlist.cmd = cmd;
context->paramlist.parameters = cmdline_ptr + cmd_len;
context->paramlist.length = cmdline_len - cmd_len;
+ context->paramlist.cmd_raw.data = cmdline_ptr;
+ context->paramlist.cmd_raw.length = cmd_len;
+ context->paramlist.cmd_raw.position = 0;
return TRUE;
}
}
@@ -543,8 +546,8 @@
/**
* Parse string parameter
* @param context
- * @param value
- * @param len
+ * @param value Pointer to string buffer where pointer to non-null terminated string will be returned
+ * @param len Length of returned non-null terminated string
* @param mandatory
* @return
*/
@@ -574,8 +577,8 @@
/**
* Parse text parameter (can be inside "")
* @param context
- * @param value
- * @param len
+ * @param value Pointer to string buffer where pointer to non-null terminated string will be returned
+ * @param len Length of returned non-null terminated string
* @param mandatory
* @return
*/
@@ -672,3 +675,11 @@
return FALSE;
}
+scpi_bool_t SCPI_IsCmd(scpi_t * context, const char * cmd) {
+ if (! context->paramlist.cmd) {
+ return FALSE;
+ }
+
+ const char * pattern = context->paramlist.cmd->pattern;
+ return matchCommand (pattern, cmd, strlen (cmd));
+}
--
Gitblit v1.9.1