builtin-grep: unparse more command line options.
The earlier one to use external grep missed some often used options. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
May 15, 2006 at 13:28 UTC
ffa0a7ab36c1e8a528e4cc0ff451f5fea68658a8
1 file changed
+57
-8
builtin-grep.c
+57
-8
@@ -437,24 +437,73 @@ static int exec_grep(int argc, const char **argv)
437
}
438
439
#define MAXARGS 1000
440
+#define ARGBUF 4096
441
+#define push_arg(a) do { \
442
+ if (nr < MAXARGS) argv[nr++] = (a); \
443
+ else die("maximum number of args exceeded"); \
444
+ } while (0)
445
446
static int external_grep(struct grep_opt *opt, const char **paths, int cached)
447
{
443
- int i, nr, argc, hit;
448
+ int i, nr, argc, hit, len;
449
const char *argv[MAXARGS+1];
450
+ char randarg[ARGBUF];
451
+ char *argptr = randarg;
452
struct grep_pat *p;
453
447
- nr = 0;
448
- argv[nr++] = "grep";
454
+ len = nr = 0;
455
+ push_arg("grep");
456
+ push_arg("-H");
457
+ if (opt->fixed)
458
+ push_arg("-H");
459
+ if (opt->linenum)
460
+ push_arg("-n");
461
+ if (opt->regflags & REG_EXTENDED)
462
+ push_arg("-E");
463
if (opt->word_regexp)
450
- argv[nr++] = "-w";
464
+ push_arg("-w");
465
if (opt->name_only)
452
- argv[nr++] = "-l";
466
+ push_arg("-l");
467
+ if (opt->unmatch_name_only)
468
+ push_arg("-L");
469
+ if (opt->count)
470
+ push_arg("-c");
471
+ if (opt->post_context || opt->pre_context) {
472
+ if (opt->post_context != opt->pre_context) {
473
+ if (opt->pre_context) {
474
+ push_arg("-B");
475
+ len += snprintf(argptr, sizeof(randarg)-len,
476
+ "%u", opt->pre_context);
477
+ if (sizeof(randarg) <= len)
478
+ die("maximum length of args exceeded");
479
+ push_arg(argptr);
480
+ argptr += len;
481
+ }
482
+ if (opt->post_context) {
483
+ push_arg("-A");
484
+ len += snprintf(argptr, sizeof(randarg)-len,
485
+ "%u", opt->post_context);
486
+ if (sizeof(randarg) <= len)
487
+ die("maximum length of args exceeded");
488
+ push_arg(argptr);
489
+ argptr += len;
490
+ }
491
+ }
492
+ else {
493
+ push_arg("-C");
494
+ len += snprintf(argptr, sizeof(randarg)-len,
495
+ "%u", opt->post_context);
496
+ if (sizeof(randarg) <= len)
497
+ die("maximum length of args exceeded");
498
+ push_arg(argptr);
499
+ argptr += len;
500
+ }
501
+ }
502
for (p = opt->pattern_list; p; p = p->next) {
454
- argv[nr++] = "-e";
455
- argv[nr++] = p->pattern;
503
+ push_arg("-e");
504
+ push_arg(p->pattern);
505
}
457
- argv[nr++] = "--";
506
+ push_arg("--");
507
508
hit = 0;
509
argc = nr;