mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-29 06:46:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 69f03bbde2 into fd47a30e75

Browse source
This commit is contained in:
ascent12 2017-06-07 00:36:32 +00:00 • committed by GitHub
commit d67a004989
56 changed files with 1125 additions and 955 deletions
Download patch file Download diff file Expand all files Collapse all files

33
common/stringop.c
View file

@ -69,28 +69,20 @@ int lenient_strcmp(char *a, char *b) {
}
list_t *split_string(const char *str, const char *delims) {
list_t *res = create_list();
list_t *res = list_new(sizeof(char *), 0);
char *copy = strdup(str);
char *token;
token = strtok(copy, delims);
while(token) {
token = strdup(token);
list_add(res, token);
list_add(res, &token);
token = strtok(NULL, delims);
}
free(copy);
return res;
}
void free_flat_list(list_t *list) {
int i;
for (i = 0; i < list->length; ++i) {
free(list->items[i]);
}
list_free(list);
}
char **split_args(const char *start, int *argc) {
*argc = 0;
int alloc = 2;
@ -315,22 +307,25 @@ char *join_list(list_t *list, char *separator) {
len += (list->length - 1) * sep_len;
}
for (int i = 0; i < list->length; i++) {
len += strlen(list->items[i]);
for (size_t i = 0; i < list->length; i++) {
char *item = list_getp(list, i);
len += strlen(item);
}
char *res = malloc(len);
char *p = res + strlen(list->items[0]);
strcpy(res, list->items[0]);
char *item = list_getp(list, 0);
char *p = res + strlen(item);
strcpy(res, item);
for (int i = 1; i < list->length; i++) {
for (size_t i = 1; i < list->length; i++) {
item = list_getp(list, i);
if (sep_len) {
memcpy(p, separator, sep_len);
p += sep_len;
}
strcpy(p, list->items[i]);
p += strlen(list->items[i]);
strcpy(p, item);
p += strlen(item);
}
*p = '\0';
@ -387,3 +382,7 @@ char *argsep(char **stringp, const char *delim) {
found:
return start;
}
int strcmp_ptr(const void *a, const void *b) {
return strcmp(*(char **)a, *(char **)b);
}