diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2009-07-13 23:11:35 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2009-07-13 23:11:35 +0000 |
| commit | 5f108d9df6bada119def52518152a487f8695702 (patch) | |
| tree | 2ae6420cfdea4f68ce031e9a1ed62c2756c2c588 /cmd-paste-buffer.c | |
| parent | 5d91555c7c8d88577892e0a2e2bde2cde60a2882 (diff) | |
Having fixed flags for single-character getopt options is a bit hard to
maintain and is only going to get worse as more are used. So instead, add a new
uint64_t member to cmd_entry which is a bitmask of upper and lowercase options
accepted by the command.
This means new single character options can be used without the need to add it
explicitly to the list.
Diffstat (limited to 'cmd-paste-buffer.c')
| -rw-r--r-- | cmd-paste-buffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd-paste-buffer.c b/cmd-paste-buffer.c index c586e0fc..76a92eaf 100644 --- a/cmd-paste-buffer.c +++ b/cmd-paste-buffer.c @@ -32,7 +32,7 @@ void cmd_paste_buffer_lf2cr(struct buffer *, const char *, size_t); const struct cmd_entry cmd_paste_buffer_entry = { "paste-buffer", "pasteb", "[-dr] " CMD_BUFFER_WINDOW_USAGE, - CMD_DFLAG|CMD_RFLAG, + 0, CMD_CHFLAG('d')|CMD_CHFLAG('r'), cmd_buffer_init, cmd_buffer_parse, cmd_paste_buffer_exec, @@ -66,7 +66,7 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) if (pb != NULL && *pb->data != '\0') { /* -r means raw data without LF->CR conversion. */ - if (data->flags & CMD_RFLAG) { + if (data->chflags & CMD_CHFLAG('r')) { buffer_write( w->active->out, pb->data, strlen(pb->data)); } else { @@ -76,7 +76,7 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) } /* Delete the buffer if -d. */ - if (data->flags & CMD_DFLAG) { + if (data->chflags & CMD_CHFLAG('d')) { if (data->buffer == -1) paste_free_top(&s->buffers); else |