Improvement needed in the config_handle_line func to handle consecutive spaces and tabs on each line. #24

formadi · 2025-01-16T13:53:51Z

formadi
Jan 16, 2025

The code below has been modified to handle consecutive spaces and tabs. Please review it.

bool
config_handle_line(char *line, size_t line_number, char **keyword,
                   char ***args, size_t *args_count) {
	char *p = line;

	/* Skip leading whitespace and tabs */
	while (*p == ' ' || *p == '\t') p++;

	/* If it's an empty line or a comment, skip */
	if (*p == '\n' || *p == '#') {
		return false;
	}

	/* Allocate memory for the keyword and arguments */
	size_t len = 0, cap = STRING_INITIAL_LENGTH;
	char *kw = calloc(cap, sizeof(char));
	size_t ars_len = 0, ars_cap = 8;
	char **ars = calloc(ars_cap, sizeof(*args));

	/* Extract the keyword */
	char *q = kw;
	while (*p != ' ' && *p != '\t' && *p != '\n') {
		if (len >= cap) {
			cap *= 2;
			kw = realloc(kw, cap);
			q = &kw[len];
		}
		*q = *p;
		p++;
		q++;
		len++;
	}
	*q = 0; // Null-terminate the keyword

	/* Skip whitespace and tabs */
	while (*p == ' ' || *p == '\t') p++;

	/* If no arguments are provided, log an error and return */
	if (*p == '\n') {
		wlr_log(WLR_ERROR, "config: line %zu: no args provided for %s", line_number, kw);
		free(kw);
		free(ars);
		return false;
	}

	/* Extract the arguments */
	while (*p != '\n') {
		/* Skip whitespace and tabs */
		while (*p == ' ' || *p == '\t') p++;
		if (*p == '\n') break; // End of line check

		/* Resize the arguments array if necessary */
		if (ars_len >= ars_cap) {
			ars_cap *= 2;
			ars = realloc(ars, ars_cap * sizeof(*ars));
		}

		len = 0;
		cap = STRING_INITIAL_LENGTH;
		ars[ars_len] = calloc(cap, sizeof(char));

		q = ars[ars_len];
		bool word = false;

		/* Handle quoted arguments */
		if (*p == '\"') {
			word = true;
			p++;
		}

		/* Extract a single argument */
		while ((word && *p != '\"' && *p != '\n') || (!word && *p != ' ' && *p != '\t' && *p != '\n')) {
			if (len >= cap) {
				cap *= 2;
				ars[ars_len] = realloc(ars[ars_len], cap);
				q = &ars[ars_len][len];
			}
			if (word && *p == '\\' && *(p + 1) == '\"') {
				*q = '\"';
				p += 2;
			} else if (word && *p == '\\' && *(p + 1) == '\\') {
				*q = '\\';
				p += 2;
			} else {
				*q = *p;
				p++;
			}
			q++;
			len++;
		}
		*q = 0; // Null-terminate the argument
		ars_len++;

		if (word) p++;
	}

	/* Assign outputs */
	*args_count = ars_len;
	*keyword = kw;
	*args = ars;
	return true;
}

dqrk0jeste · 2025-01-16T14:05:21Z

dqrk0jeste
Jan 16, 2025
Maintainer

that seems good, please open a pull request for this. looking at it now it seems like there should also be a check like this one

if (ars_len >= ars_cap) {
	ars_cap *= 2;
	ars = realloc(ars, ars_cap * sizeof(*ars));
}

before null terminating the strings, because it may happen that the buffer is full.

0 replies

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Improvement needed in the config_handle_line func to handle consecutive spaces and tabs on each line. #24

Uh oh!

{{title}}

Uh oh!

Uh oh!

{{editor}}'s edit

{{editor}}'s edit

Uh oh!

Replies: 1 comment

Uh oh!

{{title}}

Uh oh!

Select a reply

Uh oh!

Improvement needed in the config_handle_line func to handle consecutive spaces and tabs on each line. #24

Uh oh!

Uh oh!

formadi Jan 16, 2025

Replies: 1 comment

Uh oh!

dqrk0jeste Jan 16, 2025 Maintainer

formadi
Jan 16, 2025

dqrk0jeste
Jan 16, 2025
Maintainer