2b5bf78faf
This patch fixes faulty command parsing introduced by
f0f5de9a9e. When that commit allowed
criteria reset on ';' delimeters in commands lists, it failed to account
for its inner ','-parsing loop eating threw the entire rest of the
string.
This patch refactors argsep to use a list of multiple separators, and
(optionally) return the separator that it matched against in this
iteration via a pointer. This allows it to hint at the command parser
which separator was used at the end of the last command, allowing it to
trigger a potential secondary read of the criteria.
Fixes #4239
30 lines
862 B
C
30 lines
862 B
C
#ifndef _SWAY_STRINGOP_H
|
|
#define _SWAY_STRINGOP_H
|
|
|
|
#include "list.h"
|
|
|
|
void strip_whitespace(char *str);
|
|
void strip_quotes(char *str);
|
|
|
|
// strcat that does nothing if dest or src is NULL
|
|
char *lenient_strcat(char *dest, const char *src);
|
|
char *lenient_strncat(char *dest, const char *src, size_t len);
|
|
|
|
// strcmp that also handles null pointers.
|
|
int lenient_strcmp(char *a, char *b);
|
|
|
|
// Simply split a string with delims, free with `list_free_items_and_destroy`
|
|
list_t *split_string(const char *str, const char *delims);
|
|
|
|
// Splits an argument string, keeping quotes intact
|
|
char **split_args(const char *str, int *argc);
|
|
void free_argv(int argc, char **argv);
|
|
|
|
int unescape_string(char *string);
|
|
char *join_args(char **argv, int argc);
|
|
|
|
// Split string into 2 by delim, handle quotes
|
|
char *argsep(char **stringp, const char *delim, char *matched_delim);
|
|
|
|
#endif
|