return res;
}
-/** @brief Splits a string into a dynar of strings, taking quotes into account
+/** @brief Just like @ref xbt_str_split_quoted (Splits a string into a dynar of strings), but without memory allocation
*
- * It basically does the same argument separation than the shell, where white
- * spaces can be escaped and where arguments are never split within a
- * quote group.
- * Several subsequent spaces are ignored (unless within quotes, of course).
- * You may want to trim the input string, if you want to avoid empty entries
+ * The string passed as argument must be writable (not const)
+ * The elements of the dynar are just parts of the string passed as argument.
+ *
+ * To free the structure constructed by this function, free the first element and free the dynar:
*
+ * free(xbt_dynar_get_ptr(dynar,0));
+ * xbt_dynar_free(&dynar);
*/
-
-xbt_dynar_t xbt_str_split_quoted(const char *s)
-{
- xbt_dynar_t res = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
- char *str_to_free; /* we have to copy the string before, to handle backslashes */
+xbt_dynar_t xbt_str_split_quoted_in_place(char *s) {
+ xbt_dynar_t res = xbt_dynar_new(sizeof(char *), NULL);
char *beg, *end; /* pointers around the parsed chunk */
int in_simple_quote = 0, in_double_quote = 0;
int done = 0;
if (s[0] == '\0')
return res;
- beg = str_to_free = xbt_strdup(s);
+
+ beg = s;
/* do not trim leading spaces: caller responsability to clean his cruft */
end = beg;
/* Protected char; move it closer */
memmove(end, end + 1, strlen(end));
if (*end == '\0')
- THROW0(arg_error, 0, "String ends with \\");
+ THROWF(arg_error, 0, "String ends with \\");
end++; /* Pass the protected char */
break;
case '\n':
case '\0':
if (*end == '\0' && (in_simple_quote || in_double_quote)) {
- THROW2(arg_error, 0,
+ THROWF(arg_error, 0,
"End of string found while searching for %c in %s",
(in_simple_quote ? '\'' : '"'), s);
}
if (in_simple_quote || in_double_quote) {
end++;
} else {
+ if (*end == '\0')
+ done = 1;
+
+ *end = '\0';
if (ctn) {
/* Found a separator. Push the string if contains something */
- char *topush = xbt_malloc(end - beg + 1);
- memcpy(topush, beg, end - beg);
- topush[end - beg] = '\0';
- xbt_dynar_push(res, &topush);
+ xbt_dynar_push(res, &beg);
}
ctn = 0;
- if (*end == '\0') {
- done = 1;
+ if (done)
break;
- }
beg = ++end;
/* trim within the string, manually to speed things up */
end++;
}
}
- free(str_to_free);
- xbt_dynar_shrink(res, 0);
return res;
}
-#ifdef SIMGRID_TEST
-#include "xbt/str.h"
-
-#define mytest(name, input, expected) \
- xbt_test_add0(name); \
- d=xbt_str_split_quoted(input); \
- s=xbt_str_join(d,"XXX"); \
- xbt_test_assert3(!strcmp(s,expected),\
- "Input (%s) leads to (%s) instead of (%s)", \
- input,s,expected);\
- free(s); \
- xbt_dynar_free(&d);
+/** @brief Splits a string into a dynar of strings, taking quotes into account
+ *
+ * It basically does the same argument separation than the shell, where white
+ * spaces can be escaped and where arguments are never split within a
+ * quote group.
+ * Several subsequent spaces are ignored (unless within quotes, of course).
+ * You may want to trim the input string, if you want to avoid empty entries
+ *
+ */
-XBT_TEST_SUITE("xbt_str", "String Handling");
-XBT_TEST_UNIT("xbt_str_split_quoted", test_split_quoted, "test the function xbt_str_split_quoted")
+xbt_dynar_t xbt_str_split_quoted(const char *s)
{
- xbt_dynar_t d;
- char *s;
-
- mytest("Empty", "", "");
- mytest("Basic test", "toto tutu", "totoXXXtutu");
- mytest("Useless backslashes", "\\t\\o\\t\\o \\t\\u\\t\\u",
- "totoXXXtutu");
- mytest("Protected space", "toto\\ tutu", "toto tutu");
- mytest("Several spaces", "toto tutu", "totoXXXtutu");
- mytest("LTriming", " toto tatu", "totoXXXtatu");
- mytest("Triming", " toto tutu ", "totoXXXtutu");
- mytest("Single quotes", "'toto tutu' tata", "toto tutuXXXtata");
- mytest("Double quotes", "\"toto tutu\" tata", "toto tutuXXXtata");
- mytest("Mixed quotes", "\"toto' 'tutu\" tata", "toto' 'tutuXXXtata");
- mytest("Backslashed quotes", "\\'toto tutu\\' tata",
- "'totoXXXtutu'XXXtata");
- mytest("Backslashed quotes + quotes", "'toto \\'tutu' tata",
- "toto 'tutuXXXtata");
-
-}
-
-#define mytest_str(name, input, separator, expected) \
- xbt_test_add0(name); \
- d=xbt_str_split_str(input, separator); \
- s=xbt_str_join(d,"XXX"); \
- xbt_test_assert3(!strcmp(s,expected),\
- "Input (%s) leads to (%s) instead of (%s)", \
- input,s,expected);\
- free(s); \
- xbt_dynar_free(&d);
+ xbt_dynar_t res = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
+ xbt_dynar_t parsed;
+ char *str_to_free; /* we have to copy the string before, to handle backslashes */
+ unsigned int cursor;
+ char *p;
-XBT_TEST_UNIT("xbt_str_split_str", test_split_str, "test the function xbt_str_split_str")
-{
- xbt_dynar_t d;
- char *s;
+ if (s[0] == '\0')
+ return res;
+ str_to_free = xbt_strdup(s);
- mytest_str("Empty string and separator", "", "", "");
- mytest_str("Empty string", "", "##", "");
- mytest_str("Empty separator", "toto", "", "toto");
- mytest_str("String with no separator in it", "toto", "##", "toto");
- mytest_str("Basic test", "toto##tutu", "##", "totoXXXtutu");
+ parsed = xbt_str_split_quoted_in_place(str_to_free);
+ xbt_dynar_foreach(parsed,cursor,p) {
+ char *q=xbt_strdup(p);
+ xbt_dynar_push(res,&q);
+ }
+ free(str_to_free);
+ xbt_dynar_shrink(res, 0);
+ xbt_dynar_free(&parsed);
+ return res;
}
-#endif /* SIMGRID_TEST */
/** @brief Join a set of strings as a single string */
-
char *xbt_str_join(xbt_dynar_t dyn, const char *sep)
{
int len = 1, dyn_len = xbt_dynar_length(dyn);
}
return res;
}
+/** @brief Join a set of strings as a single string
+ *
+ * The parameter must be a NULL-terminated array of chars,
+ * just like xbt_dynar_to_array() produces
+ */
+char *xbt_str_join_array(const char *const *strs, const char *sep)
+{
+ char *res,*q;
+ int amount_strings=0;
+ int len=0;
+ int i;
+
+ if ((!strs) || (!strs[0]))
+ return xbt_strdup("");
+
+ /* compute the length before malloc */
+ for (i=0;strs[i];i++) {
+ len += strlen(strs[i]);
+ amount_strings++;
+ }
+ len += strlen(sep) * amount_strings;
+
+ /* Do the job */
+ q = res = xbt_malloc(len);
+ for (i=0;strs[i];i++) {
+ if (i!=0) { // not first loop
+ q += sprintf(q, "%s%s", sep, strs[i]);
+ } else {
+ q += sprintf(q,"%s",strs[i]);
+ }
+ }
+ return res;
+}
#if defined(SIMGRID_NEED_GETLINE) || defined(DOXYGEN)
/** @brief Get a single line from the stream (reimplementation of the GNU getline)
} else if (i <= 0 && j <= 0) {
return;
} else {
- THROW2(arg_error, 0, "Invalid values: i=%d, j=%d", i, j);
+ THROWF(arg_error, 0, "Invalid values: i=%d, j=%d", i, j);
}
}
/** @brief Compute the unified diff of two strings */
-char *xbt_str_diff(char *a, char *b)
+char *xbt_str_diff(const char *a, const char *b)
{
xbt_dynar_t da = xbt_str_split(a, "\n");
xbt_dynar_t db = xbt_str_split(b, "\n");
xbt_strbuff_free_container(buff);
return res;
}
+
+#ifdef SIMGRID_TEST
+#include "xbt/str.h"
+
+#define mytest(name, input, expected) \
+ xbt_test_add(name); \
+ d=xbt_str_split_quoted(input); \
+ s=xbt_str_join(d,"XXX"); \
+ xbt_test_assert(!strcmp(s,expected),\
+ "Input (%s) leads to (%s) instead of (%s)", \
+ input,s,expected);\
+ free(s); \
+ xbt_dynar_free(&d);
+
+XBT_TEST_SUITE("xbt_str", "String Handling");
+XBT_TEST_UNIT("xbt_str_split_quoted", test_split_quoted, "test the function xbt_str_split_quoted")
+{
+ xbt_dynar_t d;
+ char *s;
+
+ mytest("Empty", "", "");
+ mytest("Basic test", "toto tutu", "totoXXXtutu");
+ mytest("Useless backslashes", "\\t\\o\\t\\o \\t\\u\\t\\u",
+ "totoXXXtutu");
+ mytest("Protected space", "toto\\ tutu", "toto tutu");
+ mytest("Several spaces", "toto tutu", "totoXXXtutu");
+ mytest("LTriming", " toto tatu", "totoXXXtatu");
+ mytest("Triming", " toto tutu ", "totoXXXtutu");
+ mytest("Single quotes", "'toto tutu' tata", "toto tutuXXXtata");
+ mytest("Double quotes", "\"toto tutu\" tata", "toto tutuXXXtata");
+ mytest("Mixed quotes", "\"toto' 'tutu\" tata", "toto' 'tutuXXXtata");
+ mytest("Backslashed quotes", "\\'toto tutu\\' tata",
+ "'totoXXXtutu'XXXtata");
+ mytest("Backslashed quotes + quotes", "'toto \\'tutu' tata",
+ "toto 'tutuXXXtata");
+
+}
+
+#define mytest_str(name, input, separator, expected) \
+ xbt_test_add(name); \
+ d=xbt_str_split_str(input, separator); \
+ s=xbt_str_join(d,"XXX"); \
+ xbt_test_assert(!strcmp(s,expected),\
+ "Input (%s) leads to (%s) instead of (%s)", \
+ input,s,expected);\
+ free(s); \
+ xbt_dynar_free(&d);
+
+XBT_TEST_UNIT("xbt_str_split_str", test_split_str, "test the function xbt_str_split_str")
+{
+ xbt_dynar_t d;
+ char *s;
+
+ mytest_str("Empty string and separator", "", "", "");
+ mytest_str("Empty string", "", "##", "");
+ mytest_str("Empty separator", "toto", "", "toto");
+ mytest_str("String with no separator in it", "toto", "##", "toto");
+ mytest_str("Basic test", "toto##tutu", "##", "totoXXXtutu");
+}
+#endif /* SIMGRID_TEST */
