mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-10-26 12:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify command string parsing with a helper function from Tiago Cunha.

Browse Source
This commit is contained in:
Nicholas Marriott
2012-12-06 12:47:48 +00:00
parent 8264e92b37
commit 51a1dbfe09
1 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
cmd-string.c
View File

@@ -31,11 +31,12 @@
* Parse a command from a string. * Parse a command from a string.
*/ */
int cmd_string_getc(const char *, size_t *); int cmd_string_getc(const char *, size_t *);
void cmd_string_ungetc(size_t *); void cmd_string_ungetc(size_t *);
char *cmd_string_string(const char *, size_t *, char, int); void cmd_string_copy(char **, char *, size_t *);
char *cmd_string_variable(const char *, size_t *); char *cmd_string_string(const char *, size_t *, char, int);
char *cmd_string_expand_tilde(const char *, size_t *); char *cmd_string_variable(const char *, size_t *);
char *cmd_string_expand_tilde(const char *, size_t *);
int int
cmd_string_getc(const char *s, size_t *p) cmd_string_getc(const char *s, size_t *p)
@@ -84,26 +85,17 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause)
case '\'': case '\'':
if ((t = cmd_string_string(s, &p, '\'', 0)) == NULL) if ((t = cmd_string_string(s, &p, '\'', 0)) == NULL)
goto error; goto error;
buf = xrealloc(buf, 1, len + strlen(t) + 1); cmd_string_copy(&buf, t, &len);
strlcpy(buf + len, t, strlen(t) + 1);
len += strlen(t);
free(t);
break; break;
case '"': case '"':
if ((t = cmd_string_string(s, &p, '"', 1)) == NULL) if ((t = cmd_string_string(s, &p, '"', 1)) == NULL)
goto error; goto error;
buf = xrealloc(buf, 1, len + strlen(t) + 1); cmd_string_copy(&buf, t, &len);
strlcpy(buf + len, t, strlen(t) + 1);
len += strlen(t);
free(t);
break; break;
case '$': case '$':
if ((t = cmd_string_variable(s, &p)) == NULL) if ((t = cmd_string_variable(s, &p)) == NULL)
goto error; goto error;
buf = xrealloc(buf, 1, len + strlen(t) + 1); cmd_string_copy(&buf, t, &len);
strlcpy(buf + len, t, strlen(t) + 1);
len += strlen(t);
free(t);
break; break;
case '#': case '#':
/* Comment: discard rest of line. */ /* Comment: discard rest of line. */
@@ -147,12 +139,10 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause)
goto out; goto out;
case '~': case '~':
if (buf == NULL) { if (buf == NULL) {
if ((t = cmd_string_expand_tilde(s, &p)) == NULL) t = cmd_string_expand_tilde(s, &p);
if (t == NULL)
goto error; goto error;
buf = xrealloc(buf, 1, len + strlen(t) + 1); cmd_string_copy(&buf, t, &len);
strlcpy(buf + len, t, strlen(t) + 1);
len += strlen(t);
free(t);
break; break;
} }
/* FALLTHROUGH */ /* FALLTHROUGH */
@@ -181,6 +171,20 @@ out:
return (rval); return (rval);
} }
void
cmd_string_copy(char **dst, char *src, size_t *len)
{
size_t srclen;
srclen = strlen(src);
*dst = xrealloc(*dst, 1, *len + srclen + 1);
strlcpy(*dst + *len, src, srclen + 1);
*len += srclen;
free(src);
}
char * char *
cmd_string_string(const char *s, size_t *p, char endch, int esc) cmd_string_string(const char *s, size_t *p, char endch, int esc)
{ {
@@ -220,10 +224,7 @@ cmd_string_string(const char *s, size_t *p, char endch, int esc)
break; break;
if ((t = cmd_string_variable(s, p)) == NULL) if ((t = cmd_string_variable(s, p)) == NULL)
goto error; goto error;
buf = xrealloc(buf, 1, len + strlen(t) + 1); cmd_string_copy(&buf, t, &len);
strlcpy(buf + len, t, strlen(t) + 1);
len += strlen(t);
free(t);
continue; continue;
} }