return res;
}
-/** @brief Splits a string into a dynar of strings, taking quotes into account
+/** @brief Just like @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;
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++;
}
}
+ return res;
+}
+
+/** @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_dynar_t xbt_str_split_quoted(const char *s)
+{
+ 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;
+
+ if (s[0] == '\0')
+ return res;
+ str_to_free = xbt_strdup(s);
+
+ 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(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)
