diff options
author | Douglas Gilbert <dgilbert@interlog.com> | 2007-09-19 13:48:40 +0000 |
---|---|---|
committer | Douglas Gilbert <dgilbert@interlog.com> | 2007-09-19 13:48:40 +0000 |
commit | b6bc9ee42522285a70bcb1a4b81f052cc1c08bf6 (patch) | |
tree | 502c25bb85251fb8215a4305920ff004c6dcf2ad /src/sg_get_config.c | |
parent | b28016b015c62fc9a94828aaea10a394112ee1be (diff) | |
download | sg3_utils-b6bc9ee42522285a70bcb1a4b81f052cc1c08bf6.tar.gz |
sg_stpg work, device_name simplification, restore sg_read_buffer to build
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@103 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'src/sg_get_config.c')
-rw-r--r-- | src/sg_get_config.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/sg_get_config.c b/src/sg_get_config.c index 11bc2e2a..dccde24b 100644 --- a/src/sg_get_config.c +++ b/src/sg_get_config.c @@ -49,7 +49,7 @@ */ -static char * version_str = "0.30 20070714"; +static char * version_str = "0.30 20070919"; #define MX_ALLOC_LEN 8192 #define NAME_BUFF_SZ 64 @@ -885,13 +885,12 @@ int main(int argc, char * argv[]) int rt = 0; int starting = 0; int verbose = 0; - char device_name[256]; + const char * device_name = NULL; char buff[64]; const char * cp; struct sg_simple_inquiry_resp inq_resp; int ret = 0; - memset(device_name, 0, sizeof device_name); while (1) { int option_index = 0; @@ -947,9 +946,8 @@ int main(int argc, char * argv[]) } } if (optind < argc) { - if ('\0' == device_name[0]) { - strncpy(device_name, argv[optind], sizeof(device_name) - 1); - device_name[sizeof(device_name) - 1] = '\0'; + if (NULL == device_name) { + device_name = argv[optind]; ++optind; } if (optind < argc) { @@ -965,7 +963,7 @@ int main(int argc, char * argv[]) list_known(brief); return 0; } - if (0 == device_name[0]) { + if (NULL == device_name) { fprintf(stderr, "missing device name!\n"); usage(); return SG_LIB_SYNTAX_ERROR; |