From c83a66e2a8a459d2aadef8b4dad05a1d2c45bef2 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Mon, 26 Oct 2015 22:21:48 +0100 Subject: rename shquote to print_shquoted (clashes with NetBSD libc) --- lr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lr.c') diff --git a/lr.c b/lr.c index bac781f..b323fb6 100644 --- a/lr.c +++ b/lr.c @@ -900,7 +900,7 @@ print_human(intmax_t i) } static void -shquote(const char *s) +print_shquoted(const char *s) { if (Qflag || !strpbrk(s, "\001\002\003\004\005\006\007\010" "\011\012\013\014\015\016\017\020" @@ -962,13 +962,13 @@ print(const void *nodep, const VISIT which, const int depth) printf(" "); break; } - case 'p': shquote( + case 'p': print_shquoted( sflag && strncmp(fi->fpath, "./", 2) == 0 ? fi->fpath+2 : fi->fpath); break; case 'l': if (S_ISLNK(fi->sb.st_mode)) - shquote(readlin(fi->fpath, "")); + print_shquoted(readlin(fi->fpath, "")); break; case 'n': printf("%*jd", intlen(maxlinks), (intmax_t)fi->sb.st_nlink); break; case 'F': @@ -987,7 +987,7 @@ print(const void *nodep, const VISIT which, const int depth) putchar('*'); } break; - case 'f': shquote(basenam(fi->fpath)); break; + case 'f': print_shquoted(basenam(fi->fpath)); break; case 'A': case 'C': case 'T': { -- cgit 1.4.1