emil/bake
1
0
Fork 0
forked from bake/bake
Code Issues Pull Requests Releases Wiki Activity

all_args fix, simplify expand

Browse Source
This commit is contained in:
Emil Williams 2024-02-27 05:34:10 +00:00
parent abc3ee6114
commit c988daa6ae
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bake.c
View File

@ -105,7 +105,7 @@ static string_t
all_args(int argc, char ** argv) { all_args(int argc, char ** argv) {
string_t s = (string_t) { 0, NULL }; string_t s = (string_t) { 0, NULL };
if (argc > 2) { if (argc > 2) {
size_t i, len = 0; size_t i, len = argc - 2;
for (i = 2; i < (size_t) argc; ++i) { for (i = 2; i < (size_t) argc; ++i) {
len += strlen(argv[i]); len += strlen(argv[i]);
} }
@ -115,11 +115,11 @@ all_args(int argc, char ** argv) {
for (len = 0, i = 2; i < (size_t) argc; ++i) { for (len = 0, i = 2; i < (size_t) argc; ++i) {
strcpy(s.buf + len, argv[i]); strcpy(s.buf + len, argv[i]);
len += strlen(argv[i]); len += strlen(argv[i]);
if (i + 1 < argc) { if (i + 1 < (size_t) argc) {
s.buf[len - 1] = ' '; s.buf[len++] = ' ';
len++;
} }
} }
s.len = len;
} }
} }
return s; return s;
@ -240,6 +240,7 @@ expand(string_t s) {
for (f = 0; f < ARRLEN(macro); ++f) { for (f = 0; f < ARRLEN(macro); ++f) {
if (!strncmp(s.buf + i, macro[f].buf, macro[f].len)) { if (!strncmp(s.buf + i, macro[f].buf, macro[f].len)) {
max += globals[f].len; max += globals[f].len;
i += globals[f].len;
} }
} }
} }
@ -251,7 +252,8 @@ expand(string_t s) {
for (i = 0; i < s.len; ++i) { for (i = 0; i < s.len; ++i) {
for (f = 0; f < ARRLEN(macro); ++f) { for (f = 0; f < ARRLEN(macro); ++f) {
if (!strncmp(s.buf + i, macro[f].buf, macro[f].len)) { if (!strncmp(s.buf + i, macro[f].buf, macro[f].len)) {
insert(s.buf + i, s.len - i, globals[f].buf, globals[f].len, 2); insert(s.buf + i, s.len - i, globals[f].buf, globals[f].len, macro[f].len);
i += globals[f].len;
} }
} }
} }