libtinyrad: updating tinyrad_strtoargs() to retain quotes

3 files changed, 10 insertions, 5 deletions

diff --git a/include/tinyrad_internal.h b/include/tinyrad_internal.h
index dda1d5d..4b1c6f3 100644
--- a/include/tinyrad_internal.h
+++ b/include/tinyrad_internal.h
@@ -254,7 +254,8 @@ _TINYRAD_F int
 tinyrad_strtoargs(
          char *                        str,
          char ***                      argvp,
-         int *                         argcp );
+         int *                         argcp,
+         int                           retain_quotes );
 
 
 #endif /* end of header */
diff --git a/lib/libtinyrad/ldict.c b/lib/libtinyrad/ldict.c
index 7796692..1c95aa0 100644
--- a/lib/libtinyrad/ldict.c
+++ b/lib/libtinyrad/ldict.c
@@ -1536,7 +1536,7 @@ tinyrad_dict_parse(
          file = parent;
          continue;
       };
-      if ((rc = tinyrad_strtoargs(buff, &argv, &argc)) != TRAD_SUCCESS)
+      if ((rc = tinyrad_strtoargs(buff, &argv, &argc, TRAD_NO)) != 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 f55161f..ddd3395 100644
--- a/lib/libtinyrad/lstrings.c
+++ b/lib/libtinyrad/lstrings.c
@@ -279,7 +279,8 @@ int
 tinyrad_strtoargs(
          char *                        str,
          char ***                      argvp,
-         int *                         argcp )
+         int *                         argcp,
+         int                           retain_quotes )
 {
    char           quote;
    char *         bol;
@@ -306,20 +307,23 @@ tinyrad_strtoargs(
          case '"':
          case '\'':
          quote = str[pos];
-         bol   = &str[pos+1];
+         bol   = ((retain_quotes)) ? &str[pos] : &str[pos+1];
          for( pos += 1; ((bol[pos] != '\0') && (bol[pos] != quote)); pos++);
          if (bol[pos] != quote)
          {
             tinyrad_strsfree(argv);
             return(TRAD_ESYNTAX);
          };
-         bol[pos] = '\0';
+         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';
          if ((rc = tinyrad_strsadd(&argv, bol)) != TRAD_SUCCESS)
          {
             tinyrad_strsfree(argv);