Merge branch 'cb/array-size' into maint

diff --git a/line-range.c b/line-range.c
index 70484899aca0592de3f08e31ca05d9d668ccb7ff..de4e32f9424fbc0770756c3f61751fc69bfeb17e 100644 (file)
--- a/line-range.c
+++ b/line-range.c
@@ -54,8 +54,11 @@ static const char *parse_loc(const char *spec, nth_line_fn_t nth_line,
        }
        num = strtol(spec, &term, 10);
        if (term != spec) {
-               if (ret)
+               if (ret) {
+                       if (num <= 0)
+                               die("-L invalid line number: %ld", num);
                        *ret = num;
+               }
                return term;
        }
 
@@ -161,7 +164,7 @@ static const char *find_funcname_matching_regexp(xdemitconf_t *xecfg, const char
 }
 
 static const char *parse_range_funcname(const char *arg, nth_line_fn_t nth_line_cb,
-                                       void *cb_data, long lines, long *begin, long *end,
+                                       void *cb_data, long lines, long anchor, long *begin, long *end,
                                        const char *path)
 {
        char *pattern;
@@ -173,6 +176,11 @@ static const char *parse_range_funcname(const char *arg, nth_line_fn_t nth_line_
        int reg_error;
        regex_t regexp;
 
+       if (*arg == '^') {
+               anchor = 1;
+               arg++;
+       }
+
        assert(*arg == ':');
        term = arg+1;
        while (*term && *term != ':') {
@@ -187,7 +195,8 @@ static const char *parse_range_funcname(const char *arg, nth_line_fn_t nth_line_
 
        pattern = xstrndup(arg+1, term-(arg+1));
 
-       start = nth_line_cb(cb_data, 0);
+       anchor--; /* input is in human terms */
+       start = nth_line_cb(cb_data, anchor);
 
        drv = userdiff_find_by_path(path);
        if (drv && drv->funcname.pattern) {
@@ -205,7 +214,8 @@ static const char *parse_range_funcname(const char *arg, nth_line_fn_t nth_line_
 
        p = find_funcname_matching_regexp(xecfg, (char*) start, &regexp);
        if (!p)
-               die("-L parameter '%s': no match", pattern);
+               die("-L parameter '%s' starting at line %ld: no match",
+                   pattern, anchor + 1);
        *begin = 0;
        while (p > nth_line_cb(cb_data, *begin))
                (*begin)++;
@@ -243,8 +253,8 @@ int parse_range_arg(const char *arg, nth_line_fn_t nth_line_cb,
        if (anchor > lines)
                anchor = lines + 1;
 
-       if (*arg == ':') {
-               arg = parse_range_funcname(arg, nth_line_cb, cb_data, lines, begin, end, path);
+       if (*arg == ':' || (*arg == '^' && *(arg + 1) == ':')) {
+               arg = parse_range_funcname(arg, nth_line_cb, cb_data, lines, anchor, begin, end, path);
                if (!arg || *arg)
                        return -1;
                return 0;
@@ -268,8 +278,8 @@ int parse_range_arg(const char *arg, nth_line_fn_t nth_line_cb,
 
 const char *skip_range_arg(const char *arg)
 {
-       if (*arg == ':')
-               return parse_range_funcname(arg, NULL, NULL, 0, NULL, NULL, NULL);
+       if (*arg == ':' || (*arg == '^' && *(arg + 1) == ':'))
+               return parse_range_funcname(arg, NULL, NULL, 0, 0, NULL, NULL, NULL);
 
        arg = parse_loc(arg, NULL, NULL, 0, -1, NULL);