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.

1 files changed, 4 insertions, 4 deletions

diff --git a/usr.bin/tmux/cmd-paste-buffer.c b/usr.bin/tmux/cmd-paste-buffer.c
index 5801fa45ac5..7e078767b18 100644
--- a/usr.bin/tmux/cmd-paste-buffer.c
+++ b/usr.bin/tmux/cmd-paste-buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-paste-buffer.c,v 1.3 2009/07/11 19:14:56 nicm Exp $ */
+/* $OpenBSD: cmd-paste-buffer.c,v 1.4 2009/07/13 23:11:35 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -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