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

Change STOP@ to @STOP, and fixed bug regarding g_filename with mangled paths after chdir

Browse Source
This commit is contained in:
Emil 2023-10-16 05:48:43 +00:00
parent 4b1ff1f7c2
commit 60a1909aa1
No known key found for this signature in database
GPG Key ID: 5432DB986FDBCF8A
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
bake.c
View File

@ -3,8 +3,9 @@
* *
* Licensed under the GNU Public License version 3 only, see LICENSE. * Licensed under the GNU Public License version 3 only, see LICENSE.
* *
* Using COMPILECMD and including the # STOP for bake/shake support * Using COMPILECMD and including the # STOP for bake & shake support
* @COMPILECMD cc $@ -o $* -std=gnu89 -O2 -Wall -Wextra -Wpedantic -pipe $CFLAGS # STOP@ * @COMPILECMD pwd; cc $@ -o $* -std=gnu89 -O2 -Wall -Wextra -Wpedantic -pipe $CFLAGS # @STOP
* @EXEC pwd; cc $@ -o $* -std=gnu89 -O2 -Wall -Wextra -Wpedantic -pipe $CFLAGS # @STOP
*/ */
#include <assert.h> #include <assert.h>
@ -27,11 +28,11 @@
#define OTHER_START "@EXEC" #define OTHER_START "@EXEC"
#define START "@COMPILECMD" #define START "@COMPILECMD"
#define STOP "STOP@" #define STOP "@STOP"
#define HELP \ #define HELP \
"target-file [arguments ...]\n" \ "target-file [arguments ...]\n" \
"Use the format `@EXEC cmd ...' within the target-file, this will execute the\n" \ "Use the format `@EXEC cmd ...' within the target-file, this will execute the\n" \
"rest of line, or if found within the file, until the STOP@ marker. You may use\n" \ "rest of line, or if found within the file, until the @STOP marker. You may use\n" \
"@COMPILECMD instead of @EXEC. Whitespace is required after and before both\n" \ "@COMPILECMD instead of @EXEC. Whitespace is required after and before both\n" \
"operators always.\n" "operators always.\n"
@ -58,8 +59,8 @@ map(char * fn, size_t * len)
if (fd != -1) if (fd != -1)
{ {
if (!fstat(fd,&s) if (!fstat(fd,&s)
&& s.st_mode & S_IFREG && s.st_mode & S_IFREG
&& s.st_size) && s.st_size)
{ {
*len = s.st_size; *len = s.st_size;
addr = mmap(NULL, s.st_size, PROT_READ, MAP_SHARED, fd, 0); addr = mmap(NULL, s.st_size, PROT_READ, MAP_SHARED, fd, 0);
@ -75,7 +76,8 @@ find(char * x, char * buf, size_t max, size_t min)
char * start = buf; char * start = buf;
for (; *buf; ++buf) for (; *buf; ++buf)
{ {
if (max - (buf - start) > min && !strncmp(buf, x, min)) if (max - (buf - start) > min
&& !strncmp(buf, x, min))
{ return buf; } { return buf; }
} }
return NULL; return NULL;
@ -113,9 +115,11 @@ find_region(char * fn)
if (!stop) if (!stop)
{ {
stop = start; stop = start;
while (*stop && *stop != '\n') while (*stop
&& *stop != '\n')
{ {
if (stop[0] == '\\' && stop[1] == '\n') if (stop[0] == '\\'
&& stop[1] == '\n')
{ stop += 2; } { stop += 2; }
++stop; ++stop;
} }
@ -148,18 +152,21 @@ swap(char * a, char * b)
} }
static int static int
root(char * root) root(char ** rootp)
{ {
int ret;
char x[1] = "\0"; char x[1] = "\0";
char * root = *rootp;
size_t len = strlen(root); size_t len = strlen(root);
while (len && root[len] != '/') int ret;
while (len
&& root[len] != '/')
{ --len; } { --len; }
if (!len) if (!len)
{ return 0; } { return 0; }
swap(root + len, x); swap(root + len, x);
ret = chdir(root); ret = chdir(root);
swap(root + len, x); swap(root + len, x);
*rootp += len + 1;
return ret; return ret;
} }
@ -300,7 +307,6 @@ static int
run(char * buf) run(char * buf)
{ {
fputs("Output:\n", stderr); fputs("Output:\n", stderr);
root(g_filename);
return system(buf); return system(buf);
} }
@ -310,7 +316,7 @@ main(int argc, char ** argv)
int ret = 0; int ret = 0;
char * buf; char * buf;
assert(setlocale(LC_ALL, "C")); setlocale(LC_ALL, "C");
if (argc < 2 if (argc < 2
|| !strcmp(argv[1], "-h") || !strcmp(argv[1], "-h")
@ -339,6 +345,7 @@ main(int argc, char ** argv)
return 1; return 1;
} }
root(&g_filename);
buf = realloc(buf, expand_size(buf, argc, argv)); buf = realloc(buf, expand_size(buf, argc, argv));
local_assert(buf, 1); local_assert(buf, 1);
buf = expand(buf); buf = expand(buf);