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

all_args updates and output

Browse Source
This commit is contained in:
Emil Williams 2024-02-27 04:04:18 +00:00
parent ab8bce4461
commit 0530959f92
1 changed files with 16 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
bake.c
View File

@ -103,52 +103,27 @@ shorten(string_t s) {
static string_t static string_t
all_args(int argc, char ** argv) { all_args(int argc, char ** argv) {
char * all = NULL;
size_t len = 0;
if (argc > 2) {
int i;
len = (size_t) argc;
for (i = 2; i < argc; ++i)
{ len += strlen(argv[i]); }
all = malloc(len);
if (all) {
all[len - 1] = '\0';
for (len = 0, i = 2; i < argc; ++i) {
strcpy(all + len, argv[i]);
len += strlen(argv[i]);
len += (i + 1 < argc);
if (i + 1 < argc) { all[len - 1] = ' '; }
}
}
}
return (string_t) { len, all ? all : calloc(0,0) };
}
#if 0
static string_t
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; size_t i, len = 0;
for (i = (size_t) argc; i > 2; --i) { for (i = 2; i < (size_t) argc; ++i) {
s.len += strlen(argv[i]) + 1; len += strlen(argv[i]);
} }
s.buf = malloc(s.len + (size_t) argc); s.buf = malloc(len);
s.len = len;
if (s.buf) { if (s.buf) {
size_t len; for (len = 0, i = 2; i < (size_t) argc; ++i) {
s.buf[s.len - 1] = '\0';
for (len = 0, i = (size_t) argc; i > 2; --i) {
strcpy(s.buf + len, argv[i]); strcpy(s.buf + len, argv[i]);
len += strlen(argv[i]) + 1; len += strlen(argv[i]);
s.buf[len - 1] = ' '; if (i + 1 < argc) {
s.buf[len - 1] = ' ';
len++;
}
} }
} }
} }
return s; return s;
} }
#endif
/*** Map ***/ /*** Map ***/
@ -304,7 +279,7 @@ strip(string_t s) {
static int static int
run(char * buf) { run(char * buf) {
int ret = 127; int ret = 127;
fputs(GREEN "output" RESET ":\n", stderr); fputs(BOLD GREEN "output" RESET ":\n", stderr);
pid_t pid = fork(); pid_t pid = fork();
if (!pid) { if (!pid) {
execl("/bin/sh", "sh", "-c", buf, NULL); execl("/bin/sh", "sh", "-c", buf, NULL);
@ -342,9 +317,9 @@ main(int argc, char ** argv) {
if (!s.buf) { if (!s.buf) {
if (errno) if (errno)
{ fprintf(stderr, BOLD RED "%s" RESET ": %s\n", g_filename.buf, strerror(errno)); } { fprintf(stderr, BOLD RED "%s" RESET ": '" BOLD "%s" RESET "' %s\n", argv[0], g_filename.buf, strerror(errno)); }
else else
{ fprintf(stderr, BOLD RED "%s" RESET ": File unrecognized.\n", g_filename.buf); } { fprintf(stderr, BOLD RED "%s" RESET ": '" BOLD "%s" RESET "' File unrecognized.\n", argv[0], g_filename.buf); }
return 1; return 1;
} }
@ -356,10 +331,10 @@ main(int argc, char ** argv) {
free(g_short.buf); free(g_all.buf); free(g_short.buf); free(g_all.buf);
if (!s.buf) { return 1; } if (!s.buf) { return 1; }
fprintf(stderr, GREEN "%s" RESET ": %s\n", argv[0], s.buf + strip(s)); fprintf(stderr, BOLD GREEN "%s" RESET ": %s\n", argv[0], s.buf + strip(s));
ret = ret ? 0 : run(s.buf); ret = ret ? 0 : run(s.buf);
if (ret) if (ret)
{ fprintf(stderr, RED "result" RESET ": " BOLD "%d\n" RESET, ret); } { fprintf(stderr, BOLD RED "result" RESET ": " BOLD "%d\n" RESET, ret); }
free(s.buf); free(s.buf);
return ret; return ret;
@ -367,4 +342,3 @@ help:
fprintf(stderr, YELLOW "%s" RESET ": %s", argv[0], HELP DESC); fprintf(stderr, YELLOW "%s" RESET ": %s", argv[0], HELP DESC);
return 1; return 1;
} }