Print for the less easy commands.

This commit is contained in:
Nicholas Marriott
2008-06-05 17:12:11 +00:00
parent 642c0b00ab
commit ee1a7fded7
13 changed files with 258 additions and 53 deletions

View File

@ -1,4 +1,4 @@
/* $Id: cmd-generic.c,v 1.6 2008-06-05 16:35:31 nicm Exp $ */
/* $Id: cmd-generic.c,v 1.7 2008-06-05 17:12:10 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -101,11 +101,11 @@ cmd_clientonly_print(struct cmd *self, char *buf, size_t len)
struct cmd_clientonly_data *data = self->data;
size_t off = 0;
off += xsnprintf(buf, len, "%s ", self->entry->name);
off += xsnprintf(buf, len, "%s", self->entry->name);
if (data == NULL)
return;
if (off < len && data->cname != NULL)
off += xsnprintf(buf + off, len - off, "-c %s ", data->cname);
off += xsnprintf(buf + off, len - off, " -c %s", data->cname);
}
int
@ -199,13 +199,13 @@ cmd_sessiononly_print(struct cmd *self, char *buf, size_t len)
struct cmd_sessiononly_data *data = self->data;
size_t off = 0;
off += xsnprintf(buf, len, "%s ", self->entry->name);
off += xsnprintf(buf, len, "%s", self->entry->name);
if (data == NULL)
return;
if (off < len && data->cname != NULL)
off += xsnprintf(buf + off, len - off, "-c %s ", data->cname);
off += xsnprintf(buf + off, len - off, " -c %s", data->cname);
if (off < len && data->sname != NULL)
off += xsnprintf(buf + off, len - off, "-s %s ", data->sname);
off += xsnprintf(buf + off, len - off, " -s %s", data->sname);
}
int
@ -313,13 +313,13 @@ cmd_windowonly_print(struct cmd *self, char *buf, size_t len)
struct cmd_windowonly_data *data = self->data;
size_t off = 0;
off += xsnprintf(buf, len, "%s ", self->entry->name);
off += xsnprintf(buf, len, "%s", self->entry->name);
if (data == NULL)
return;
if (off < len && data->cname != NULL)
off += xsnprintf(buf + off, len - off, "-c %s ", data->cname);
off += xsnprintf(buf + off, len - off, " -c %s", data->cname);
if (off < len && data->sname != NULL)
off += xsnprintf(buf + off, len - off, "-s %s ", data->sname);
off += xsnprintf(buf + off, len - off, " -s %s", data->sname);
if (off < len && data->idx != -1)
off += xsnprintf(buf + off, len - off, "-i %d ", data->idx);
off += xsnprintf(buf + off, len - off, " -i %d", data->idx);
}