libtinyrad: removing retain argument from tinyrad_strtoargs()

3 files changed, 17 insertions, 11 deletions

diff --git a/include/tinyrad_internal.h b/include/tinyrad_internal.h
index 1b4238f..a2d19f3 100644
--- a/include/tinyrad_internal.h
+++ b/include/tinyrad_internal.h
@@ -262,8 +262,7 @@ _TINYRAD_F int
 tinyrad_strtoargs(
          char *                        str,
          char ***                      argvp,
-         int *                         argcp,
-         int                           retain_quotes );
+         int *                         argcp );
 
 
 _TINYRAD_F char *
diff --git a/lib/libtinyrad/ldict.c b/lib/libtinyrad/ldict.c
index 757f06f..c218ca2 100644
--- a/lib/libtinyrad/ldict.c
+++ b/lib/libtinyrad/ldict.c
@@ -1528,7 +1528,7 @@ tinyrad_dict_parse(
          file = parent;
          continue;
       };
-      if ((rc = tinyrad_strtoargs(buff, &argv, &argc, TRAD_NO)) != TRAD_SUCCESS)
+      if ((rc = tinyrad_strtoargs(buff, &argv, &argc)) != TRAD_SUCCESS)
       {
          tinyrad_file_error(file, rc, msgsp);
          tinyrad_file_destroy(file, TRAD_FILE_RECURSE);
diff --git a/lib/libtinyrad/lstrings.c b/lib/libtinyrad/lstrings.c
index d25ddde..ce93625 100644
--- a/lib/libtinyrad/lstrings.c
+++ b/lib/libtinyrad/lstrings.c
@@ -335,8 +335,7 @@ int
 tinyrad_strtoargs(
          char *                        str,
          char ***                      argvp,
-         int *                         argcp,
-         int                           retain_quotes )
+         int *                         argcp )
 {
    char           quote;
    char *         bol;
@@ -363,23 +362,31 @@ tinyrad_strtoargs(
          case '"':
          case '\'':
          quote = str[pos];
-         bol   = ((retain_quotes)) ? &str[pos] : &str[pos+1];
-         for( pos += 1; ((bol[pos] != '\0') && (bol[pos] != quote)); pos++);
+         bol   = &str[pos];
+         for( pos += 1; ((bol[pos] != '\0') && (bol[pos] != quote)); pos++)
+         {
+            if ( (quote == '"') && (bol[pos] == '\\') )
+            {
+               if (!(bol[pos+1]))
+               {
+                  tinyrad_strsfree(argv);
+                  return(TRAD_ESYNTAX);
+               };
+               pos++;
+            };
+         };
          if (bol[pos] != quote)
          {
             tinyrad_strsfree(argv);
             return(TRAD_ESYNTAX);
          };
-         if ((retain_quotes))
-            bol[pos] = '\0';
          pos++;
          if ( (bol[pos] != ' ') && (bol[pos] != '\t') && (bol[pos] != '\0') )
          {
             tinyrad_strsfree(argv);
             return(TRAD_ESYNTAX);
          };
-         if (!(retain_quotes))
-            bol[pos] = '\0';
+         bol[pos] = '\0';
          if ((rc = tinyrad_strsadd(&argv, bol)) != TRAD_SUCCESS)
          {
             tinyrad_strsfree(argv);