diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2019-05-01 15:36:08 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2019-05-01 15:36:08 +0000 |
| commit | 3a5deb427c87030be41c99aa0b3fa26d9d79ec67 (patch) | |
| tree | 2361460fc620be67749e562bcc644af77848abd1 /src/sg_read.c | |
| parent | c3da9a6b41cbae7940180645721a35becdd5bc99 (diff) | |
| download | sg3_utils-3a5deb427c87030be41c99aa0b3fa26d9d79ec67.tar.gz | |
sg_vpd: add --examine option; gcc-9: suppress warnings; more testing work
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@821 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'src/sg_read.c')
| -rw-r--r-- | src/sg_read.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/sg_read.c b/src/sg_read.c index a356aa35..0c6b9825 100644 --- a/src/sg_read.c +++ b/src/sg_read.c @@ -1,6 +1,6 @@ /* * A utility program for the Linux OS SCSI generic ("sg") device driver. - * Copyright (C) 2001 - 2018 D. Gilbert + * Copyright (C) 2001 - 2019 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) @@ -58,7 +58,7 @@ #include "sg_pr2serr.h" -static const char * version_str = "1.34 20180811"; +static const char * version_str = "1.35 20190501"; #define DEF_BLOCK_SIZE 512 #define DEF_BLOCKS_PER_TRANSFER 128 @@ -491,17 +491,19 @@ main(int argc, char * argv[]) dpo = !! sg_get_num(buf); else if (0 == strcmp(key,"fua")) fua = !! sg_get_num(buf); - else if (strcmp(key,"if") == 0) - strncpy(inf, buf, INF_SZ - 1); - else if (0 == strcmp(key,"mmap")) + else if (strcmp(key,"if") == 0) { + memcpy(inf, buf, INF_SZ - 1); + inf[INF_SZ - 1] = '\0'; + } else if (0 == strcmp(key,"mmap")) do_mmap = !! sg_get_num(buf); else if (0 == strcmp(key,"no_dxfer")) no_dxfer = !! sg_get_num(buf); else if (0 == strcmp(key,"odir")) do_odir = !! sg_get_num(buf); - else if (strcmp(key,"of") == 0) - strncpy(outf, buf, INF_SZ - 1); - else if (0 == strcmp(key,"skip")) { + else if (strcmp(key,"of") == 0) { + memcpy(outf, buf, INF_SZ - 1); + outf[INF_SZ - 1] = '\0'; + } else if (0 == strcmp(key,"skip")) { skip = sg_get_llnum(buf); if (-1 == skip) { pr2serr( ME "bad argument to 'skip'\n"); |