diff options
| author | Chris Hall <chris.hall@highwayman.com> | 2011-09-05 13:26:35 +0100 |
|---|---|---|
| committer | Chris Hall <chris.hall@highwayman.com> | 2011-09-05 13:26:35 +0100 |
| commit | 1bc859b342e415a4c7de2956a6b5fd732923d9da (patch) | |
| tree | c777c770aebd90e3808153d4ce24c6f45984247e | |
| parent | 142c0edf9bc04c86a754de0991ba75e5c8ca03ef (diff) | |
| download | quagga-1bc859b342e415a4c7de2956a6b5fd732923d9da.tar.bz2 quagga-1bc859b342e415a4c7de2956a6b5fd732923d9da.tar.xz | |
Fix absolute paths in bgp dump configuration commands.
| -rw-r--r-- | lib/qpath.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/qpath.c b/lib/qpath.c index 1a05e507..033b3b69 100644 --- a/lib/qpath.c +++ b/lib/qpath.c @@ -948,21 +948,21 @@ qpath_make(const char* src, const qpath dir) } ; /*------------------------------------------------------------------------------ - * If given dst path is not rooted (does not start with '/', prepend the + * If given dst path is not rooted (does not start with '/'), prepend the * given src path to it. Result is reduced. */ extern qpath qpath_complete(qpath dst, const qpath src) { if (src != NULL) - return qpath_prepend_str_n(dst, qs_char_nn(src->path), - qs_len_nn(src->path)) ; + return qpath_complete_str_n(dst, qs_char_nn(src->path), + qs_len_nn(src->path)) ; else - return qpath_prepend_str_n(dst, NULL, 0) ; + return qpath_complete_str_n(dst, NULL, 0) ; } ; /*------------------------------------------------------------------------------ - * If given dst path is not rooted (does not start with '/', prepend the + * If given dst path is not rooted (does not start with '/'), prepend the * given src qstring to it. Result is reduced. */ extern qpath @@ -972,7 +972,7 @@ qpath_complete_qs(qpath dst, const qstring src) } ; /*------------------------------------------------------------------------------ - * If given dst path is not rooted (does not start with '/', prepend the + * If given dst path is not rooted (does not start with '/'), prepend the * given src string to it. Result is reduced. */ extern qpath @@ -982,7 +982,7 @@ qpath_complete_str(qpath dst, const char* src) } ; /*------------------------------------------------------------------------------ - * If given dst path is not rooted (does not start with '/', prepend the + * If given dst path is not rooted (does not start with '/'), prepend the * given src string of given length to it. Result is reduced. */ extern qpath @@ -990,7 +990,7 @@ qpath_complete_str_n(qpath dst, const char* src, ulen n) { dst = qpath_make_if_null(dst) ; - if ((qs_len_nn(dst->path) == 0) || (*(qs_char_nn(dst->path)) == '/')) + if ((qs_len_nn(dst->path) == 0) || (*(qs_char_nn(dst->path)) != '/')) qpath_prepend_str_n(dst, src, n) ; else qpath_reduce(dst) ; |