aboutsummaryrefslogtreecommitdiff
path: root/src/sg_start.c
diff options
context:
space:
mode:
authorDouglas Gilbert <dgilbert@interlog.com>2018-03-05 03:44:16 +0000
committerDouglas Gilbert <dgilbert@interlog.com>2018-03-05 03:44:16 +0000
commitbb1ca28ae1a69909b23522bcd412244b0c8e583c (patch)
tree5df479456e4f6b4d0a0dcc203abed41f69e03ff0 /src/sg_start.c
parent090d6026610616895444792b75d90861b3c968f9 (diff)
downloadsg3_utils-bb1ca28ae1a69909b23522bcd412244b0c8e583c.tar.gz
sg_ses: --data=@FN with --status now decodes dpage(s) in FN; add --quiet option to suppress messages
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@758 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'src/sg_start.c')
-rw-r--r--src/sg_start.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/sg_start.c b/src/sg_start.c
index 685af0de..8fee166e 100644
--- a/src/sg_start.c
+++ b/src/sg_start.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1999-2017 D. Gilbert
+ * Copyright (C) 1999-2018 D. Gilbert
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
@@ -34,7 +34,7 @@
#include "sg_pr2serr.h"
-static const char * version_str = "0.63 20171010"; /* sbc3r14; mmc6r01a */
+static const char * version_str = "0.64 20180302"; /* sbc3r14; mmc6r01a */
static struct option long_options[] = {
{"eject", no_argument, 0, 'e'},
@@ -169,7 +169,7 @@ usage_old()
}
static int
-process_cl_new(struct opts_t * op, int argc, char * argv[])
+news_parse_cmd_line(struct opts_t * op, int argc, char * argv[])
{
int c, n, err;
@@ -286,7 +286,7 @@ process_cl_new(struct opts_t * op, int argc, char * argv[])
}
static int
-process_cl_old(struct opts_t * op, int argc, char * argv[])
+old_parse_cmd_line(struct opts_t * op, int argc, char * argv[])
{
bool ambigu = false;
bool jmp_out;
@@ -458,7 +458,7 @@ process_cl_old(struct opts_t * op, int argc, char * argv[])
}
static int
-process_cl(struct opts_t * op, int argc, char * argv[])
+parse_cmd_line(struct opts_t * op, int argc, char * argv[])
{
int res;
char * cp;
@@ -466,14 +466,14 @@ process_cl(struct opts_t * op, int argc, char * argv[])
cp = getenv("SG3_UTILS_OLD_OPTS");
if (cp) {
op->opt_new = false;
- res = process_cl_old(op, argc, argv);
+ res = old_parse_cmd_line(op, argc, argv);
if ((0 == res) && op->opt_new)
- res = process_cl_new(op, argc, argv);
+ res = news_parse_cmd_line(op, argc, argv);
} else {
op->opt_new = true;
- res = process_cl_new(op, argc, argv);
+ res = news_parse_cmd_line(op, argc, argv);
if ((0 == res) && (! op->opt_new))
- res = process_cl_old(op, argc, argv);
+ res = old_parse_cmd_line(op, argc, argv);
}
return res;
}
@@ -490,7 +490,7 @@ main(int argc, char * argv[])
op = &opts;
memset(op, 0, sizeof(opts));
op->do_fl = -1; /* only when >= 0 set FL bit */
- res = process_cl(op, argc, argv);
+ res = parse_cmd_line(op, argc, argv);
if (res)
return SG_LIB_SYNTAX_ERROR;
if (op->do_help) {