From 0de4466f7cefb55584b24589acaca2284fea8d24 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 28 Dec 2015 01:43:39 +0100 Subject: fix errors and tidy up MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/satr.c | 57 +++++++++------------------------------------------------ 1 file changed, 9 insertions(+), 48 deletions(-) (limited to 'src/satr.c') diff --git a/src/satr.c b/src/satr.c index ef5da6e..b1a587b 100644 --- a/src/satr.c +++ b/src/satr.c @@ -19,34 +19,16 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include -#include -#include -#include - #include "client.h" +#include "common.h" -/** - * The name of the process. - */ -char *argv0 = "satr"; +COMMAND("satr") +USAGE("[JOB-ID]...") -/** - * Print usage information. - */ -static void -usage(void) -{ - fprintf(stderr, "usage: %s [JOB-ID]...\n", - strrchr(argv0) ? (strrchr(argv0) + 1) : argv0); - exit(2); -} - - /** * Run all queued jobs even if it is not time yet. * @@ -62,35 +44,14 @@ main(int argc, char *argv[]) { size_t n = 0; char *msg = NULL; - int i; - if (argc > 0) - argv0 = argv[0]; - if (argc < 2) - goto run; - if (!strcmp(argv[1], "--")) - argv++, argc--; - for (i = 1; i < argc; i++) - if (strchr("-", argv[i][0])) - usage(); - - n = measure_array(argv + 1); - if (n ? !(msg = malloc(n)) : 0) - goto fail; - store_array(msg, argv + 1); + if (argc > 0) argv0 = argv[0]; + if (argc < 2) goto run; + NO_OPTIONS; + CONSTRUCT_MESSAGE; run: - if (send_command(SAT_RUN, n, msg)) { - if (errno) - goto fail; - free(msg); - return 3; - } - return 0; - -fail: - perror(*argv); - free(msg); - return 1; + SEND(SAT_RUN, n, msg); + END(msg); } -- cgit v1.2.3-70-g09d2