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

1 files changed, 5 insertions, 8 deletions

diff --git a/src/sg_format.c b/src/sg_format.c
index 32ff0bed..bdfb1a25 100644
--- a/src/sg_format.c
+++ b/src/sg_format.c
@@ -72,7 +72,7 @@
 #define MAX_BUFF_SZ     252
 static unsigned char dbuff[MAX_BUFF_SZ];
 
-static char * version_str = "1.14 20070830";
+static char * version_str = "1.15 20070918";
 
 static struct option long_options[] = {
         {"count", 1, 0, 'c'},
@@ -326,12 +326,11 @@ int main(int argc, char **argv)
         int dcrt = 0;
         int do_si = 0;
         int early = 0;
-        char device_name[256];
+        const char * device_name = NULL;
         char pdt_name[64];
         struct sg_simple_inquiry_resp inq_out;
         int ret = 0;
 
-        device_name[0] = '\0';
         while (1) {
                 int option_index = 0;
                 int c;
@@ -425,10 +424,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;
                 }
         }
@@ -439,7 +436,7 @@ int main(int argc, char **argv)
                 usage();
                 return SG_LIB_SYNTAX_ERROR;
         }
-        if ('\0' == device_name[0]) {
+        if (NULL == device_name) {
                 fprintf(stderr, "no device name given\n");
                 usage();
                 return SG_LIB_SYNTAX_ERROR;