diff options
Diffstat (limited to 'bp.c')
| -rw-r--r-- | bp.c | 288 |
1 files changed, 125 insertions, 163 deletions
@@ -30,27 +30,27 @@ #define BP_NAME "bp" #endif -static const char *description = BP_NAME" - a Parsing Expression Grammar command line tool"; -static const char *usage = ( - "Usage:\n" - " "BP_NAME" [flags] <pattern> [<files>...]\n\n" - "Flags:\n" - " -A --context-after <n> set number of lines of context to print after the match\n" - " -B --context-before <n> set number of lines of context to print before the match\n" - " -C --context <context> set number of lines of context to print before and after the match\n" - " -G --git in a git repository, treat filenames as patterns for `git ls-files`\n" - " -I --inplace modify a file in-place\n" - " -c --case use case sensitivity\n" - " -e --explain explain the matches\n" - " -f --format fancy|plain|bare|file:line set the output format\n" - " -g --grammar <grammar-file> use the specified file as a grammar\n" - " -h --help print the usage and quit\n" - " -i --ignore-case preform matching case-insensitively\n" - " -l --list-files list filenames only\n" - " -r --replace <replacement> replace the input pattern with the given replacement\n" - " -s --skip <skip-pattern> skip over the given pattern when looking for matches\n" - " -v --verbose print verbose debugging info\n" - " -w --word <string-pat> find words matching the given string pattern\n"); +static const char *description = BP_NAME " - a Parsing Expression Grammar command line tool"; +static const char *usage = + ("Usage:\n" + " " BP_NAME " [flags] <pattern> [<files>...]\n\n" + "Flags:\n" + " -A --context-after <n> set number of lines of context to print after the match\n" + " -B --context-before <n> set number of lines of context to print before the match\n" + " -C --context <context> set number of lines of context to print before and after the match\n" + " -G --git in a git repository, treat filenames as patterns for `git ls-files`\n" + " -I --inplace modify a file in-place\n" + " -c --case use case sensitivity\n" + " -e --explain explain the matches\n" + " -f --format fancy|plain|bare|file:line set the output format\n" + " -g --grammar <grammar-file> use the specified file as a grammar\n" + " -h --help print the usage and quit\n" + " -i --ignore-case preform matching case-insensitively\n" + " -l --list-files list filenames only\n" + " -r --replace <replacement> replace the input pattern with the given replacement\n" + " -s --skip <skip-pattern> skip over the given pattern when looking for matches\n" + " -v --verbose print verbose debugging info\n" + " -w --word <string-pat> find words matching the given string pattern\n"); // Used as a heuristic to check if a file is binary or text: #define CHECK_FIRST_N_BYTES 256 @@ -91,8 +91,7 @@ static file_t *backup_file; // // Helper function to reduce code duplication // -static inline void fprint_filename(FILE *out, const char *filename) -{ +static inline void fprint_filename(FILE *out, const char *filename) { if (!filename[0]) return; if (options.format == FORMAT_FANCY) fprintf(out, "\033[0;1;4;33m%s\033[m\n", filename); else fprintf(out, "%s:\n", filename); @@ -101,59 +100,51 @@ static inline void fprint_filename(FILE *out, const char *filename) // // If there was a parse error while building a pattern, print an error message and exit. // -static inline bp_pat_t *assert_pat(const char *start, const char *end, maybe_pat_t maybe_pat) -{ +static inline bp_pat_t *assert_pat(const char *start, const char *end, maybe_pat_t maybe_pat) { if (!end) end = start + strlen(start); if (!maybe_pat.success) { - const char *err_start = maybe_pat.value.error.start, - *err_end = maybe_pat.value.error.end, - *err_msg = maybe_pat.value.error.msg; + const char *err_start = maybe_pat.value.error.start, *err_end = maybe_pat.value.error.end, + *err_msg = maybe_pat.value.error.msg; const char *nl = memrchr(start, '\n', (size_t)(err_start - start)); - const char *sol = nl ? nl+1 : start; + const char *sol = nl ? nl + 1 : start; nl = memchr(err_start, '\n', (size_t)(end - err_start)); const char *eol = nl ? nl : end; if (eol < err_end) err_end = eol; fprintf(stderr, "\033[31;1m%s\033[0m\n", err_msg); - fprintf(stderr, "%.*s\033[41;30m%.*s\033[m%.*s\n", - (int)(err_start - sol), sol, - (int)(err_end - err_start), err_start, - (int)(eol - err_end), err_end); + fprintf(stderr, "%.*s\033[41;30m%.*s\033[m%.*s\n", (int)(err_start - sol), sol, (int)(err_end - err_start), + err_start, (int)(eol - err_end), err_end); fprintf(stderr, "\033[34;1m"); const char *p = sol; - for (; p < err_start; ++p) (void)fputc(*p == '\t' ? '\t' : ' ', stderr); + for (; p < err_start; ++p) + (void)fputc(*p == '\t' ? '\t' : ' ', stderr); if (err_start == err_end) ++err_end; for (; p < err_end; ++p) if (*p == '\t') // Some janky hacks: 8 ^'s, backtrack 8 spaces, move forward a tab stop, clear any ^'s that overshot fprintf(stderr, "^^^^^^^^\033[8D\033[I\033[K"); - else - (void)fputc('^', stderr); + else (void)fputc('^', stderr); fprintf(stderr, "\033[m\n"); exit(EXIT_FAILURE); } return maybe_pat.value.pat; } - // // Look for a key/value flag at the first position in the given argument list. // If the flag is found, update `next` to point to the next place to check for a flag. // The contents of argv[0] may be modified for single-char flags. // Return the flag's value. // -__attribute__((nonnull)) -static char *get_flag(char *argv[], const char *flag, char ***next) -{ +__attribute__((nonnull)) static char *get_flag(char *argv[], const char *flag, char ***next) { size_t n = strlen(flag); if (strncmp(argv[0], flag, n) != 0) return NULL; if (argv[0][n] == '=') { // --foo=baz, -f=baz *next = &argv[1]; - return &argv[0][n+1]; + return &argv[0][n + 1]; } else if (argv[0][n] == '\0') { // --foo baz, -f baz - if (!argv[1]) - errx(EXIT_FAILURE, "Expected argument after '%s'\n\n%s", flag, usage); + if (!argv[1]) errx(EXIT_FAILURE, "Expected argument after '%s'\n\n%s", flag, usage); *next = &argv[2]; return argv[1]; } else if (flag[0] == '-' && flag[1] != '-' && flag[2] == '\0') { // -f... @@ -169,16 +160,14 @@ static char *get_flag(char *argv[], const char *flag, char ***next) // The contents of argv[0] may be modified for single-char flags. // Return a boolean for whether or not the flag was found. // -__attribute__((nonnull)) -static bool get_boolflag(char *argv[], const char *flag, char ***next) -{ +__attribute__((nonnull)) static bool get_boolflag(char *argv[], const char *flag, char ***next) { size_t n = strlen(flag); if (strncmp(argv[0], flag, n) != 0) return false; if (argv[0][n] == '\0') { // --foo, -f *next = &argv[1]; return true; } else if (flag[0] == '-' && flag[1] != '-' && flag[2] == '\0') { // -f... - memmove(&argv[0][1], &argv[0][2], 1+strlen(&argv[0][2])); // Shift the flags down + memmove(&argv[0][1], &argv[0][2], 1 + strlen(&argv[0][2])); // Shift the flags down *next = argv; return true; } @@ -189,32 +178,27 @@ static bool get_boolflag(char *argv[], const char *flag, char ***next) // Scan the first few dozen bytes of a file and return 1 if the contents all // look like printable text characters, otherwise return 0. // -static int is_text_file(const char *filename) -{ +static int is_text_file(const char *filename) { int fd = open(filename, O_RDONLY); if (fd < 0) return 0; char buf[CHECK_FIRST_N_BYTES]; - ssize_t len = read(fd, buf, sizeof(buf)/sizeof(char)); + ssize_t len = read(fd, buf, sizeof(buf) / sizeof(char)); (void)close(fd); if (len < 0) return 0; for (ssize_t i = 0; i < len; i++) - if (isascii(buf[i]) && !(isprint(buf[i]) || isspace(buf[i]))) - return 0; + if (isascii(buf[i]) && !(isprint(buf[i]) || isspace(buf[i]))) return 0; return 1; } // // Print matches in a visual explanation style // -static int explain_matches(file_t *f, bp_pat_t *pattern, bp_pat_t *defs) -{ +static int explain_matches(file_t *f, bp_pat_t *pattern, bp_pat_t *defs) { int nmatches = 0; - for (bp_match_t *m = NULL; next_match(&m, f->start, f->end, pattern, defs, options.skip, options.ignorecase); ) { + for (bp_match_t *m = NULL; next_match(&m, f->start, f->end, pattern, defs, options.skip, options.ignorecase);) { if (++nmatches == 1) { - if (options.print_filenames) - fprint_filename(stdout, f->filename); - } else - printf("\n\n"); + if (options.print_filenames) fprint_filename(stdout, f->filename); + } else printf("\n\n"); explain_match(m); } return nmatches; @@ -224,14 +208,11 @@ static int explain_matches(file_t *f, bp_pat_t *pattern, bp_pat_t *defs) // Cleanup function to ensure no temp files are left around if the program // exits unexpectedly. // -static void cleanup(void) -{ +static void cleanup(void) { if (modifying_file && backup_file) { rewind(modifying_file); ftruncate(fileno(modifying_file), 0); - (void)fwrite(backup_file->start, 1, - (size_t)(backup_file->end - backup_file->start), - modifying_file); + (void)fwrite(backup_file->start, 1, (size_t)(backup_file->end - backup_file->start), modifying_file); fclose(modifying_file); modifying_file = NULL; } @@ -241,23 +222,22 @@ static void cleanup(void) // // Signal handler to ensure cleanup happens. // -static void sig_handler(int sig) -{ +static void sig_handler(int sig) { cleanup(); if (kill(0, sig)) _exit(EXIT_FAILURE); } -int fprint_linenum(FILE *out, file_t *f, int linenum, const char *normal_color) -{ +int fprint_linenum(FILE *out, file_t *f, int linenum, const char *normal_color) { int printed = 0; switch (options.format) { - case FORMAT_FANCY: case FORMAT_PLAIN: { + case FORMAT_FANCY: + case FORMAT_PLAIN: { int space = 0; - for (int i = (int)f->nlines; i > 0; i /= 10) ++space; + for (int i = (int)f->nlines; i > 0; i /= 10) + ++space; if (options.format == FORMAT_FANCY) printed += fprintf(out, "\033[0;2m%*d\033(0\x78\033(B%s", space, linenum, normal_color ? normal_color : ""); - else - printed += fprintf(out, "%*d|", space, linenum); + else printed += fprintf(out, "%*d|", space, linenum); break; } case FORMAT_FILE_LINE: { @@ -271,8 +251,7 @@ int fprint_linenum(FILE *out, file_t *f, int linenum, const char *normal_color) static file_t *printing_file = NULL; static int last_line_num = -1; -static int _fprint_between(FILE *out, const char *start, const char *end, const char *normal_color) -{ +static int _fprint_between(FILE *out, const char *start, const char *end, const char *normal_color) { int printed = 0; do { // Cheeky lookbehind to see if line number should be printed @@ -295,8 +274,7 @@ static int _fprint_between(FILE *out, const char *start, const char *end, const return printed; } -static void fprint_context(FILE *out, file_t *f, const char *prev, const char *next) -{ +static void fprint_context(FILE *out, file_t *f, const char *prev, const char *next) { if (options.context_before == ALL_CONTEXT || options.context_after == ALL_CONTEXT) { _fprint_between(out, prev ? prev : f->start, next ? next : f->end, "\033[m"); return; @@ -304,15 +282,18 @@ static void fprint_context(FILE *out, file_t *f, const char *prev, const char *n const char *before_next = next; if (next && options.context_before >= 0) { size_t line_before_next = get_line_number(printing_file, next); - line_before_next = options.context_before >= (int)line_before_next ? 1 : line_before_next - (size_t)options.context_before; + line_before_next = + options.context_before >= (int)line_before_next ? 1 : line_before_next - (size_t)options.context_before; before_next = get_line(printing_file, line_before_next); if (prev && before_next < prev) before_next = prev; } const char *after_prev = prev; if (prev && options.context_after >= 0) { size_t line_after_prev = get_line_number(printing_file, prev) + (size_t)options.context_after + 1; - after_prev = line_after_prev > printing_file->nlines ? - printing_file->end : get_line(printing_file, line_after_prev > printing_file->nlines ? printing_file->nlines : line_after_prev); + after_prev = line_after_prev > printing_file->nlines + ? printing_file->end + : get_line(printing_file, + line_after_prev > printing_file->nlines ? printing_file->nlines : line_after_prev); if (next && after_prev > next) after_prev = next; } if (next && prev && after_prev >= before_next) { @@ -323,11 +304,12 @@ static void fprint_context(FILE *out, file_t *f, const char *prev, const char *n } } -static void on_nl(FILE *out) -{ +static void on_nl(FILE *out) { switch (options.format) { - case FORMAT_FANCY: case FORMAT_PLAIN: - for (int i = (int)printing_file->nlines; i > 0; i /= 10) fputc('.', out); + case FORMAT_FANCY: + case FORMAT_PLAIN: + for (int i = (int)printing_file->nlines; i > 0; i /= 10) + fputc('.', out); fprintf(out, "%s", options.format == FORMAT_FANCY ? "\033[0;2m\033(0\x78\033(B\033[m" : "|"); break; default: break; @@ -337,8 +319,7 @@ static void on_nl(FILE *out) // // Print all the matches in a file. // -static int print_matches(FILE *out, file_t *f, bp_pat_t *pattern, bp_pat_t *defs) -{ +static int print_matches(FILE *out, file_t *f, bp_pat_t *pattern, bp_pat_t *defs) { static int printed_filenames = 0; int matches = 0; const char *prev = NULL; @@ -352,7 +333,7 @@ static int print_matches(FILE *out, file_t *f, bp_pat_t *pattern, bp_pat_t *defs print_opts.replace_color = "\033[0;34;1m"; print_opts.normal_color = "\033[m"; } - for (bp_match_t *m = NULL; next_match(&m, f->start, f->end, pattern, defs, options.skip, options.ignorecase); ) { + for (bp_match_t *m = NULL; next_match(&m, f->start, f->end, pattern, defs, options.skip, options.ignorecase);) { if (++matches == 1 && options.print_filenames) { if (printed_filenames++ > 0) printf("\n"); fprint_filename(out, f->filename); @@ -381,9 +362,7 @@ static int print_matches(FILE *out, file_t *f, bp_pat_t *pattern, bp_pat_t *defs // For a given filename, open the file and attempt to match the given pattern // against it, printing any results according to the flags. // -__attribute__((nonnull)) -static int process_file(const char *filename, bp_pat_t *pattern, bp_pat_t *defs) -{ +__attribute__((nonnull)) static int process_file(const char *filename, bp_pat_t *pattern, bp_pat_t *defs) { file_t *f = load_file(NULL, filename); if (f == NULL) { fprintf(stderr, "Could not open file: %s\n%s\n", filename, strerror(errno)); @@ -416,15 +395,17 @@ static int process_file(const char *filename, bp_pat_t *pattern, bp_pat_t *defs) // Set these temporary values in case the program crashes while in the // middle of inplace modifying a file. If that happens, these variables // are used to restore the original file contents. - modifying_file = out; backup_file = f; + modifying_file = out; + backup_file = f; { matches += print_matches(out, f, pattern, defs); } - modifying_file = NULL; backup_file = NULL; + modifying_file = NULL; + backup_file = NULL; fclose(out); if (matches > 0) - printf(getenv("NO_COLOR") ? "%s: %d replacement%s\n" : "\x1b[33;1m%s:\x1b[m %d replacement%s\n", - filename, matches, matches == 1 ? "" : "s"); + printf(getenv("NO_COLOR") ? "%s: %d replacement%s\n" : "\x1b[33;1m%s:\x1b[m %d replacement%s\n", filename, + matches, matches == 1 ? "" : "s"); } else { matches += print_matches(stdout, f, pattern, defs); } @@ -440,12 +421,10 @@ static int process_file(const char *filename, bp_pat_t *pattern, bp_pat_t *defs) // // Recursively process all non-dotfile files in the given directory. // -__attribute__((nonnull)) -static int process_dir(const char *dirname, bp_pat_t *pattern, bp_pat_t *defs) -{ +__attribute__((nonnull)) static int process_dir(const char *dirname, bp_pat_t *pattern, bp_pat_t *defs) { int matches = 0; glob_t globbuf; - char globpath[PATH_MAX+1] = {'\0'}; + char globpath[PATH_MAX + 1] = {'\0'}; if (snprintf(globpath, PATH_MAX, "%s/*", dirname) > (int)PATH_MAX) errx(EXIT_FAILURE, "Filename is too long: %s/*", dirname); int status = glob(globpath, 0, NULL, &globbuf); @@ -455,12 +434,9 @@ static int process_dir(const char *dirname, bp_pat_t *pattern, bp_pat_t *defs) struct stat statbuf; for (size_t i = 0; i < globbuf.gl_pathc; i++) { if (lstat(globbuf.gl_pathv[i], &statbuf) != 0) continue; - if (S_ISLNK(statbuf.st_mode)) - continue; // Skip symbolic links - else if (S_ISDIR(statbuf.st_mode)) - matches += process_dir(globbuf.gl_pathv[i], pattern, defs); - else if (is_text_file(globbuf.gl_pathv[i])) - matches += process_file(globbuf.gl_pathv[i], pattern, defs); + if (S_ISLNK(statbuf.st_mode)) continue; // Skip symbolic links + else if (S_ISDIR(statbuf.st_mode)) matches += process_dir(globbuf.gl_pathv[i], pattern, defs); + else if (is_text_file(globbuf.gl_pathv[i])) matches += process_file(globbuf.gl_pathv[i], pattern, defs); } } globfree(&globbuf); @@ -470,22 +446,21 @@ static int process_dir(const char *dirname, bp_pat_t *pattern, bp_pat_t *defs) // // Process git files using `git ls-files ...` // -__attribute__((nonnull(1))) -static int process_git_files(bp_pat_t *pattern, bp_pat_t *defs, int argc, char *argv[]) -{ +__attribute__((nonnull(1))) static int process_git_files(bp_pat_t *pattern, bp_pat_t *defs, int argc, char *argv[]) { int fds[2]; require(pipe(fds), "Failed to create pipe"); pid_t child = require(fork(), "Failed to fork"); if (child == 0) { - const char **git_args = new(char*[3+argc+1]); + const char **git_args = new (char * [3 + argc + 1]); int g = 0; git_args[g++] = "git"; git_args[g++] = "ls-files"; git_args[g++] = "-z"; - while (*argv) git_args[g++] = *(argv++); + while (*argv) + git_args[g++] = *(argv++); require(dup2(fds[STDOUT_FILENO], STDOUT_FILENO), "Failed to hook up pipe to stdout"); require(close(fds[STDIN_FILENO]), "Failed to close read end of pipe"); - (void)execvp("git", (char**)git_args); + (void)execvp("git", (char **)git_args); _exit(EXIT_FAILURE); } require(close(fds[STDOUT_FILENO]), "Failed to close write end of pipe"); @@ -495,12 +470,12 @@ static int process_git_files(bp_pat_t *pattern, bp_pat_t *defs, int argc, char * int found = 0; while (getdelim(&path, &path_size, '\0', fp) > 0) found += process_file(path, pattern, defs); - if (path) delete(&path); + if (path) delete (&path); require(fclose(fp), "Failed to close read end of pipe"); int status; - while (waitpid(child, &status, 0) != child) continue; - if (!((WIFEXITED(status) == 1) && (WEXITSTATUS(status) == 0))) - errx(EXIT_FAILURE, "`git ls-files -z` failed."); + while (waitpid(child, &status, 0) != child) + continue; + if (!((WIFEXITED(status) == 1) && (WEXITSTATUS(status) == 0))) errx(EXIT_FAILURE, "`git ls-files -z` failed."); return found; } @@ -508,16 +483,14 @@ static int process_git_files(bp_pat_t *pattern, bp_pat_t *defs, int argc, char * // Load the given grammar (semicolon-separated definitions) // and return the first rule defined. // -static bp_pat_t *load_grammar(bp_pat_t *defs, file_t *f) -{ +static bp_pat_t *load_grammar(bp_pat_t *defs, file_t *f) { return chain_together(defs, assert_pat(f->start, f->end, bp_pattern(f->start, f->end))); } // // Convert a context string to an integer // -static int context_from_flag(const char *flag) -{ +static int context_from_flag(const char *flag) { if (streq(flag, "all")) return ALL_CONTEXT; if (streq(flag, "none")) return NO_CONTEXT; return (int)strtol(flag, NULL, 10); @@ -526,11 +499,9 @@ static int context_from_flag(const char *flag) // // Check if any letters are uppercase // -static bool any_uppercase(const char *str) -{ +static bool any_uppercase(const char *str) { for (; *str; ++str) { - if (isupper(*str)) - return true; + if (isupper(*str)) return true; } return false; } @@ -538,8 +509,7 @@ static bool any_uppercase(const char *str) #define FLAG(f) (flag = get_flag(argv, f, &argv)) #define BOOLFLAG(f) get_boolflag(argv, f, &argv) -int main(int argc, char *argv[]) -{ +int main(int argc, char *argv[]) { char *flag = NULL; bp_pat_t *defs = NULL; @@ -547,9 +517,9 @@ int main(int argc, char *argv[]) bp_pat_t *pattern = NULL; // Load builtins: - file_t *builtins_file = load_file(&loaded_files, "/etc/"BP_NAME"/builtins.bp"); + file_t *builtins_file = load_file(&loaded_files, "/etc/" BP_NAME "/builtins.bp"); if (builtins_file) defs = load_grammar(defs, builtins_file); - file_t *local_file = load_filef(&loaded_files, "%s/.config/"BP_NAME"/builtins.bp", getenv("HOME")); + file_t *local_file = load_filef(&loaded_files, "%s/.config/" BP_NAME "/builtins.bp", getenv("HOME")); if (local_file) defs = load_grammar(defs, local_file); bool explicit_case_sensitivity = false; @@ -580,58 +550,50 @@ int main(int argc, char *argv[]) explicit_case_sensitivity = true; } else if (BOOLFLAG("-l") || BOOLFLAG("--list-files")) { options.mode = MODE_LISTFILES; - } else if (FLAG("-r") || FLAG("--replace")) { - if (!pattern) - errx(EXIT_FAILURE, "No pattern has been defined for replacement to operate on"); + } else if (FLAG("-r") || FLAG("--replace")) { + if (!pattern) errx(EXIT_FAILURE, "No pattern has been defined for replacement to operate on"); // TODO: spoof file as sprintf("pattern => '%s'", flag) // except that would require handling edge cases like quotation marks etc. - pattern = assert_pat(flag, NULL, bp_replacement(pattern, flag, flag+strlen(flag))); + pattern = assert_pat(flag, NULL, bp_replacement(pattern, flag, flag + strlen(flag))); if (options.context_before == USE_DEFAULT_CONTEXT) options.context_before = ALL_CONTEXT; if (options.context_after == USE_DEFAULT_CONTEXT) options.context_after = ALL_CONTEXT; - } else if (FLAG("-g") || FLAG("--grammar")) { + } else if (FLAG("-g") || FLAG("--grammar")) { file_t *f = NULL; - if (strlen(flag) > 3 && strncmp(&flag[strlen(flag)-3], ".bp", 3) == 0) - f = load_file(&loaded_files, flag); - if (f == NULL) - f = load_filef(&loaded_files, "%s/.config/"BP_NAME"/%s.bp", getenv("HOME"), flag); - if (f == NULL) - f = load_filef(&loaded_files, "/etc/"BP_NAME"/%s.bp", flag); - if (f == NULL) - errx(EXIT_FAILURE, "Couldn't find grammar: %s", flag); + if (strlen(flag) > 3 && strncmp(&flag[strlen(flag) - 3], ".bp", 3) == 0) f = load_file(&loaded_files, flag); + if (f == NULL) f = load_filef(&loaded_files, "%s/.config/" BP_NAME "/%s.bp", getenv("HOME"), flag); + if (f == NULL) f = load_filef(&loaded_files, "/etc/" BP_NAME "/%s.bp", flag); + if (f == NULL) errx(EXIT_FAILURE, "Couldn't find grammar: %s", flag); defs = load_grammar(defs, f); // Keep in memory for debug output - } else if (FLAG("-w") || FLAG("--word")) { + } else if (FLAG("-w") || FLAG("--word")) { require(asprintf(&flag, "{|}%s{|}", flag), "Could not allocate memory"); file_t *arg_file = spoof_file(&loaded_files, "<word pattern>", flag, -1); - if (!explicit_case_sensitivity) - options.ignorecase = !any_uppercase(flag); - delete(&flag); + if (!explicit_case_sensitivity) options.ignorecase = !any_uppercase(flag); + delete (&flag); bp_pat_t *p = assert_pat(arg_file->start, arg_file->end, bp_stringpattern(arg_file->start, arg_file->end)); pattern = chain_together(pattern, p); - } else if (FLAG("-s") || FLAG("--skip")) { - bp_pat_t *s = assert_pat(flag, NULL, bp_pattern(flag, flag+strlen(flag))); + } else if (FLAG("-s") || FLAG("--skip")) { + bp_pat_t *s = assert_pat(flag, NULL, bp_pattern(flag, flag + strlen(flag))); options.skip = either_pat(options.skip, s); - } else if (FLAG("-C") || FLAG("--context")) { + } else if (FLAG("-C") || FLAG("--context")) { options.context_before = options.context_after = context_from_flag(flag); - } else if (FLAG("-B") || FLAG("--before-context")) { + } else if (FLAG("-B") || FLAG("--before-context")) { options.context_before = context_from_flag(flag); - } else if (FLAG("-A") || FLAG("--after-context")) { + } else if (FLAG("-A") || FLAG("--after-context")) { options.context_after = context_from_flag(flag); - } else if (FLAG("-f") || FLAG("--format")) { + } else if (FLAG("-f") || FLAG("--format")) { if (streq(flag, "fancy")) options.format = FORMAT_FANCY; else if (streq(flag, "plain")) options.format = FORMAT_PLAIN; else if (streq(flag, "bare")) options.format = FORMAT_BARE; else if (streq(flag, "file:line")) { options.format = FORMAT_FILE_LINE; options.print_filenames = 0; - } else if (!streq(flag, "auto")) - errx(EXIT_FAILURE, "Unknown --format option: %s", flag); + } else if (!streq(flag, "auto")) errx(EXIT_FAILURE, "Unknown --format option: %s", flag); } else if (argv[0][0] != '-' || strncmp(argv[0], "->", 2) == 0) { // As a special case, support `bp '->foo'` as a way to search for // pointer field accesses without needing to escape anything. if (pattern != NULL) break; - bp_pat_t *p = assert_pat(argv[0], NULL, bp_stringpattern(argv[0], argv[0]+strlen(argv[0]))); - if (!explicit_case_sensitivity) - options.ignorecase = !any_uppercase(argv[0]); + bp_pat_t *p = assert_pat(argv[0], NULL, bp_stringpattern(argv[0], argv[0] + strlen(argv[0]))); + if (!explicit_case_sensitivity) options.ignorecase = !any_uppercase(argv[0]); pattern = chain_together(pattern, p); ++argv; } else { @@ -639,10 +601,10 @@ int main(int argc, char *argv[]) } } - if (pattern == NULL) - errx(EXIT_FAILURE, "No pattern provided.\n\n%s", usage); + if (pattern == NULL) errx(EXIT_FAILURE, "No pattern provided.\n\n%s", usage); - for (argc = 0; argv[argc]; ++argc) ; // update argc + for (argc = 0; argv[argc]; ++argc) + ; // update argc if (options.context_before == USE_DEFAULT_CONTEXT) options.context_before = 0; if (options.context_after == USE_DEFAULT_CONTEXT) options.context_after = 0; @@ -654,7 +616,7 @@ int main(int argc, char *argv[]) // be sure to clean it up before exiting. int signals[] = {SIGTERM, SIGINT, SIGXCPU, SIGXFSZ, SIGVTALRM, SIGPROF, SIGSEGV, SIGTSTP}; struct sigaction sa = {.sa_handler = &sig_handler, .sa_flags = (int)(SA_NODEFER | SA_RESETHAND)}; - for (size_t i = 0; i < sizeof(signals)/sizeof(signals[0]); i++) + for (size_t i = 0; i < sizeof(signals) / sizeof(signals[0]); i++) require(sigaction(signals[i], &sa, NULL), "Failed to set signal handler"); // Handle exit() calls gracefully: @@ -668,8 +630,7 @@ int main(int argc, char *argv[]) // Default to git mode if there's a .git directory and no files were specified: struct stat gitdir; - if (argc == 0 && stat(".git", &gitdir) == 0 && S_ISDIR(gitdir.st_mode)) - options.git_mode = true; + if (argc == 0 && stat(".git", &gitdir) == 0 && S_ISDIR(gitdir.st_mode)) options.git_mode = true; int found = 0; if (!isatty(STDIN_FILENO) && !argv[0]) { @@ -682,13 +643,14 @@ int main(int argc, char *argv[]) } else if (argv[0]) { // Files passed in as command line args: struct stat statbuf; - if (!argv[1] && !(stat(argv[0], &statbuf) == 0 && S_ISDIR(statbuf.st_mode))) // Don't print filename for single-file matching + if (!argv[1] + && !(stat(argv[0], &statbuf) == 0 + && S_ISDIR(statbuf.st_mode))) // Don't print filename for single-file matching options.print_filenames = false; - for ( ; argv[0]; argv++) { + for (; argv[0]; argv++) { if (stat(argv[0], &statbuf) == 0 && S_ISDIR(statbuf.st_mode)) // Symlinks are okay if manually specified found += process_dir(argv[0], pattern, defs); - else - found += process_file(argv[0], pattern, defs); + else found += process_file(argv[0], pattern, defs); } } else { // No files, no piped in input, so use files in current dir, recursively |