diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-11-19 22:15:58 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-11-19 22:15:58 +0000 |
| commit | 8777a809dc06282c74fad56d2b76c9c2770c89d4 (patch) | |
| tree | 752d70cb4c098835e5086ca6ed09f805f0923e6d /cmd-list-keys.c | |
| parent | ec48709dc2a5866650292c1f9ced66baa150b4a9 (diff) | |
Sync OpenBSD patchset 545:
Mark -n keys with (no prefix) rather than [].
Diffstat (limited to 'cmd-list-keys.c')
| -rw-r--r-- | cmd-list-keys.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/cmd-list-keys.c b/cmd-list-keys.c index f2e626a1..b0e34272 100644 --- a/cmd-list-keys.c +++ b/cmd-list-keys.c @@ -1,4 +1,4 @@ -/* $Id: cmd-list-keys.c,v 1.22 2009-11-14 17:56:39 tcunha Exp $ */ +/* $Id: cmd-list-keys.c,v 1.23 2009-11-19 22:15:58 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -71,13 +71,15 @@ cmd_list_keys_exec(struct cmd *self, struct cmd_ctx *ctx) key = key_string_lookup_key(bd->key & ~KEYC_PREFIX); if (key == NULL) continue; - if (!(bd->key & KEYC_PREFIX)) - used = xsnprintf(tmp, sizeof tmp, "[%s]: ", key); - else - used = xsnprintf(tmp, sizeof tmp, "%*s: ", width, key); + used = xsnprintf(tmp, sizeof tmp, "%*s: ", width, key); if (used >= sizeof tmp) continue; + if (!(bd->key & KEYC_PREFIX)) { + used = strlcat(tmp, "(no prefix) ", sizeof tmp); + if (used >= sizeof tmp) + continue; + } cmd_list_print(bd->cmdlist, tmp + used, (sizeof tmp) - used); ctx->print(ctx, "%s", tmp); } |