From 9f0e2945451dd8a91326ae3e06bee25dfd4c86b3 Mon Sep 17 00:00:00 2001 From: Robert Pengelly Date: Mon, 24 Mar 2025 02:43:28 +0000 Subject: [PATCH] Print program name, filename and line number at the beginning if system call fails --- include/xmake/read.h | 2 +- include/xmake/rule.h | 10 ++++++++-- read.c | 20 +++++++------------- rule.c | 10 ++++++++-- variable.c | 8 ++------ xmake.c | 14 +++++++------- 6 files changed, 33 insertions(+), 31 deletions(-) diff --git a/include/xmake/read.h b/include/xmake/read.h index 532f243..a880c0e 100644 --- a/include/xmake/read.h +++ b/include/xmake/read.h @@ -14,7 +14,7 @@ struct nameseq { }; +void record_files (const char *filename, unsigned long line_no, struct nameseq *filenames, char *cmds, size_t cmds_idx, char *depstr); void *parse_nameseq (char *line, size_t size); -void record_files (struct nameseq *filenames, char *cmds, size_t cmds_idx, char *depstr); #endif /* _READ_H */ diff --git a/include/xmake/rule.h b/include/xmake/rule.h index 9cfdcbf..9e01c7b 100644 --- a/include/xmake/rule.h +++ b/include/xmake/rule.h @@ -13,6 +13,9 @@ struct rule { struct dep *deps; struct commands *cmds; + + const char *filename; + unsigned long line_no; }; @@ -21,6 +24,9 @@ struct suffix_rule { char *first, *second; struct commands *cmds; + const char *filename; + unsigned long line_no; + struct suffix_rule *next; }; @@ -28,8 +34,8 @@ struct suffix_rule { extern struct suffix_rule *suffix_rules; struct rule *rule_find (const char *name); -void rule_add (char *name, struct dep *deps, struct commands *cmds); -void rule_add_suffix (char *name, struct commands *cmds); +void rule_add (const char *filename, unsigned long line_no, char *name, struct dep *deps, struct commands *cmds); +void rule_add_suffix (const char *filename, unsigned long line_no, char *name, struct commands *cmds); void rules_init (void); #endif /* _RULE_H */ diff --git a/read.c b/read.c index 0932c3d..0ebc8dc 100644 --- a/read.c +++ b/read.c @@ -285,7 +285,7 @@ static int read_lbuf (struct linebuf *lbuf, int set_default) { #define record_waiting_files() \ do { \ if (filenames) { \ - record_files (filenames, cmds, cmds_idx, depstr); \ + record_files (lbuf->filename, line_no, filenames, cmds, cmds_idx, depstr); \ filenames = 0; \ } \ cmds_idx = 0; \ @@ -343,10 +343,7 @@ static int read_lbuf (struct linebuf *lbuf, int set_default) { } if (!cur_if_stack) { - - fprintf (stderr, "%s: %s: %lu: *** extraneous 'else'. Stop.\n", program_name, lbuf->filename, line_no); - exit (EXIT_FAILURE); - + fprintf (stderr, "%s: %s: %lu: extraneous 'else'\n", program_name, lbuf->filename, line_no); } if (strncmp (p, "ifeq", 4) == 0 || strncmp (p, "ifneq", 5) == 0 || strncmp (p, "ifdef", 5) == 0 || strncmp (p, "ifndef", 6) == 0) { @@ -597,10 +594,7 @@ static int read_lbuf (struct linebuf *lbuf, int set_default) { } if (!cur_if_stack) { - - fprintf (stderr, "%s: %s: %lu: *** extraneous 'endif'. Stop.\n", program_name, lbuf->filename, line_no); - exit (EXIT_FAILURE); - + fprintf (stderr, "%s: %s: %lu: extraneous 'endif'\n", program_name, lbuf->filename, line_no); } else { struct if_stack *prev = cur_if_stack->prev; @@ -611,7 +605,7 @@ static int read_lbuf (struct linebuf *lbuf, int set_default) { } if (*p) { - fprintf (stderr, "%s: %s: %lu: *** extraneous text after 'endif' directive\n", program_name, lbuf->filename, line_no); + fprintf (stderr, "%s: %s: %lu: extraneous text after 'endif' directive\n", program_name, lbuf->filename, line_no); } continue; @@ -955,7 +949,7 @@ void *parse_nameseq (char *line, size_t size) { } -void record_files (struct nameseq *filenames, char *cmds, size_t cmds_idx, char *depstr) { +void record_files (const char *filename, unsigned long line_no, struct nameseq *filenames, char *cmds, size_t cmds_idx, char *depstr) { struct commands *cmds_p; @@ -982,9 +976,9 @@ void record_files (struct nameseq *filenames, char *cmds, size_t cmds_idx, char for (ns = filenames, old_ns = 0; ns; old_ns = ns, ns = ns->next, free (old_ns->name), free (old_ns)) { if (ns->name[0] == '.' && !strchr (ns->name, '\\') && !strchr (ns->name, '/')) { - rule_add_suffix (ns->name, cmds_p); + rule_add_suffix (filename, line_no - 1, ns->name, cmds_p); } else { - rule_add (ns->name, deps, cmds_p); + rule_add (filename, line_no - 1, ns->name, deps, cmds_p); } } diff --git a/rule.c b/rule.c index 3f75db0..19c7484 100644 --- a/rule.c +++ b/rule.c @@ -24,7 +24,7 @@ struct rule *rule_find (const char *name) { } -void rule_add (char *name, struct dep *deps, struct commands *cmds) { +void rule_add (const char *filename, unsigned long line_no, char *name, struct dep *deps, struct commands *cmds) { struct hashtab_name *key; struct rule *r; @@ -39,11 +39,14 @@ void rule_add (char *name, struct dep *deps, struct commands *cmds) { r->deps = deps; r->cmds = cmds; + r->filename = xstrdup (filename); + r->line_no = line_no; + hashtab_put (&hashtab_rules, key, r); } -void rule_add_suffix (char *name, struct commands *cmds) { +void rule_add_suffix (const char *filename, unsigned long line_no, char *name, struct commands *cmds) { struct suffix_rule *s = xmalloc (sizeof (*s)); char *p; @@ -60,6 +63,9 @@ void rule_add_suffix (char *name, struct commands *cmds) { s->cmds = cmds; s->next = suffix_rules; + s->filename = xstrdup (filename); + s->line_no = line_no; + suffix_rules = s; } diff --git a/variable.c b/variable.c index 8fc50a7..af42567 100644 --- a/variable.c +++ b/variable.c @@ -84,12 +84,8 @@ static char *func_shell (const char *filename, unsigned long line_no, char *inpu struct linebuf lbuf; FILE *fp; - if (!*input) { - - fprintf (stderr, "%s: %s: %lu: empty call\n", program_name, filename, line_no); - return 0; - - } + (void) filename; + (void) line_no; if (!(fp = popen (input, "rb"))) { return 0; diff --git a/xmake.c b/xmake.c index d11ad84..e029e2a 100644 --- a/xmake.c +++ b/xmake.c @@ -34,7 +34,7 @@ const char *os_name = "Unix"; static int doing_inference_rule_commands = 0; -static int rule_run_command (const char *name, char *p, char *q) { +static int rule_run_command (const char *filename, unsigned long line_no, const char *name, char *p, char *q) { int is_quiet = state->quiet, is_ignoring_errors = 0; char *new_cmds, *s; @@ -71,7 +71,7 @@ static int rule_run_command (const char *name, char *p, char *q) { if (!is_ignoring_errors && error) { - fprintf (stderr, "[%s] Error %d\n", name, error); + fprintf (stderr, "%s: *** [%s:%lu: %s] Error %d\n", program_name, filename, line_no, name, error); return 1; } @@ -119,7 +119,7 @@ static char *parse_command (char *text) { } -static int run_commands (struct commands *cmds, char *name) { +static int run_commands (const char *filename, unsigned long line_no, struct commands *cmds, char *name) { char *p = parse_command (cmds->text), *q; int error; @@ -138,7 +138,7 @@ static int run_commands (struct commands *cmds, char *name) { if (!q) { break; }; - if ((error = rule_run_command (name, p, q)) < 0) { + if ((error = rule_run_command (filename, line_no, name, p, q)) < 0) { return error; } @@ -202,7 +202,7 @@ static int rule_use (struct rule *r, char *name) { variable_change ("*", star_name, VAR_ORIGIN_AUTOMATIC); variable_change ("^", xstrdup (str.data), VAR_ORIGIN_AUTOMATIC); - return run_commands (r->cmds, name); + return run_commands (r->filename, r->line_no, r->cmds, name); } @@ -231,7 +231,7 @@ static int suffix_rule_use (struct suffix_rule *s, char *name) { variable_change ("<", lesser_name, VAR_ORIGIN_AUTOMATIC); variable_change ("*", star_name, VAR_ORIGIN_AUTOMATIC); - return run_commands (s->cmds, name); + return run_commands (s->filename, s->line_no, s->cmds, name); } @@ -251,7 +251,7 @@ static int single_suffix_rule_use (struct suffix_rule *s, char *name) { variable_change ("<", lesser_name, VAR_ORIGIN_AUTOMATIC); variable_change ("*", star_name, VAR_ORIGIN_AUTOMATIC); - return run_commands (s->cmds, name); + return run_commands (s->filename, s->line_no, s->cmds, name); } -- 2.34.1