Changeset 5482:ba865ae62928 in roaraudio

Timestamp:

04/25/12 09:46:25 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support quoted strings

Files:

• ChangeLog (modified) (1 diff)
• libroar/keyval.c (modified) (5 diffs)
• libroar/roardl.c (modified) (1 diff)
• roard/hwmixer.c (modified) (1 diff)

ChangeLog

@@ -16 +16 @@
         * Work around bugs in win32 while using stdvios (pr0).
         * Added support to load plugins on win32 (pr0).
+        * Added support for quotes strings to kv split and
+          roardl para argument splitting (pr0).
 
 v. 1.0beta0 - Fri Mar 16 2012 19:39 CET

libroar/keyval.c

@@ -65 +65 @@
 }
 
+static inline void skip_char(char * str) {
+ memmove(str, str+1, roar_mm_strlen(str));
+}
+
 ssize_t              roar_keyval_split  (struct roar_keyval ** kv, char * str, const char * fdel, const char * kdel, int quotes) {
  struct roar_keyval * kvs;
@@ -75 +79 @@
  if ( kv == NULL || str == NULL ) {
   roar_err_set(ROAR_ERROR_FAULT);
-  return -1;
- }
-
- // we currently do not support quotes
- if ( quotes ) {
-  roar_err_set(ROAR_ERROR_NOTSUP);
   return -1;
  }
@@ -95 +93 @@
    if ( *sp == quote )
     quote = 0;
+  } else if ( quotes && (*sp == '\'' || *sp == '\"') ) {
+   quote = *sp;
   } else {
    if ( last_was_seg ) {
@@ -122 +122 @@
 
  for (sp = str; *sp != 0; sp++) {
+  if ( quote ) {
+   if ( *sp == quote ) {
+    skip_char(sp);
+    quote = 0;
+   } else {
+    continue;
+   }
+  } else if ( quotes && (*sp == '\'' || *sp == '\"') ) {
+   quote = *sp;
+   skip_char(sp);
+   continue;
+  }
+
   if ( last_was_seg ) {
    if ( is_in(*sp, fdel) ) {
@@ -128 +141 @@
    } else {
     last_was_seg = 1;
-    if ( is_in(*sp, kdel) ) {
+    if ( kvs[pos].value == NULL && is_in(*sp, kdel) ) {
      *sp = 0;
      kvs[pos].value = sp+1;

libroar/roardl.c

@@ -95 +95 @@
   }
 
-  argc = roar_keyval_split(&(ret->argv), ret->args_store, NULL, NULL, 0);
+  argc = roar_keyval_split(&(ret->argv), ret->args_store, NULL, NULL, 1);
   if ( argc == -1 ) {
    err = roar_error;

roard/hwmixer.c

@@ -132 +132 @@
 
  if ( subnames != NULL ) {
-  subnamekvlen = roar_keyval_split(&subnamekv, subnames, ",;", "=:", 0);
+  subnamekvlen = roar_keyval_split(&subnamekv, subnames, ",;", NULL, 1);
  }