Minor cleanup in dnssec-* tools

diff --git a/bin/dnssec/dnssec-keyfromlabel.c b/bin/dnssec/dnssec-keyfromlabel.c
index 58eb349aaab84f1665cec5596fb7e308ac88e163..ed88a374455f88afa98ec98271b6f9ae3e04aeac 100644 (file)
--- a/bin/dnssec/dnssec-keyfromlabel.c
+++ b/bin/dnssec/dnssec-keyfromlabel.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-keyfromlabel.c,v 1.24 2009/10/24 00:00:06 each Exp $ */
+/* $Id: dnssec-keyfromlabel.c,v 1.25 2009/10/27 18:56:48 each Exp $ */
 
 /*! \file */
 
@@ -190,7 +190,7 @@ main(int argc, char **argv) {
                        directory = isc_commandline_argument;
                        ret = try_dir(directory);
                        if (ret != ISC_R_SUCCESS)
-                               fatal("Cannot write to directory %s: %s",
+                               fatal("cannot open directory %s: %s",
                                      directory, isc_result_totext(ret));
                        break;
                case 'k':

diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index fb5782d110a597558c856a6a29b42551948b332a..b7ec3d1de097b9726692fddb6f872e5ec37406be 100644 (file)
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -29,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-keygen.c,v 1.104 2009/10/24 09:46:18 fdupont Exp $ */
+/* $Id: dnssec-keygen.c,v 1.105 2009/10/27 18:56:48 each Exp $ */
 
 /*! \file */
 
@@ -310,7 +310,7 @@ main(int argc, char **argv) {
                        directory = isc_commandline_argument;
                        ret = try_dir(directory);
                        if (ret != ISC_R_SUCCESS)
-                               fatal("cannot write to directory %s: %s",
+                               fatal("cannot open directory %s: %s",
                                      directory, isc_result_totext(ret));
                        break;
                case 'k':

diff --git a/bin/dnssec/dnssec-revoke.c b/bin/dnssec/dnssec-revoke.c
index a04cabeecb15cd6ebb51dfb0fde5a4a3a7e391ae..4df61fd5c011f18983d6393cf39015c6a560c44d 100644 (file)
--- a/bin/dnssec/dnssec-revoke.c
+++ b/bin/dnssec/dnssec-revoke.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-revoke.c,v 1.17 2009/10/26 21:18:24 each Exp $ */
+/* $Id: dnssec-revoke.c,v 1.18 2009/10/27 18:56:48 each Exp $ */
 
 /*! \file */
 
@@ -156,8 +156,12 @@ main(int argc, char **argv) {
        if (dir != NULL) {
                filename = argv[isc_commandline_index];
        } else {
-               isc_file_splitpath(mctx, argv[isc_commandline_index],
-                                  &dir, &filename);
+               result = isc_file_splitpath(mctx, argv[isc_commandline_index],
+                                           &dir, &filename);
+               if (result != ISC_R_SUCCESS)
+                       fatal("cannot process filename %s: %s",
+                             argv[isc_commandline_index],
+                             isc_result_totext(result));
        }
 
        if (ectx == NULL)

diff --git a/bin/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c
index 4a7f04811c85b4cc632a64c5c0ce59a37d3c5cd9..0fedbbb7f930a43838ab4f2adec79909afda73be 100644 (file)
--- a/bin/dnssec/dnssec-settime.c
+++ b/bin/dnssec/dnssec-settime.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-settime.c,v 1.18 2009/10/26 21:18:24 each Exp $ */
+/* $Id: dnssec-settime.c,v 1.19 2009/10/27 18:56:49 each Exp $ */
 
 /*! \file */
 
@@ -317,8 +317,12 @@ main(int argc, char **argv) {
        if (directory != NULL) {
                filename = argv[isc_commandline_index];
        } else {
-               isc_file_splitpath(mctx, argv[isc_commandline_index],
-                                  &directory, &filename);
+               result = isc_file_splitpath(mctx, argv[isc_commandline_index],
+                                           &directory, &filename);
+               if (result != ISC_R_SUCCESS)
+                       fatal("cannot process filename %s: %s",
+                             argv[isc_commandline_index],
+                             isc_result_totext(result));
        }
 
        if (ectx == NULL)

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index e493642e564a31d4b9b545ca5f013409c3e06a80..da80bd2205ae7864fd6da29c9b0e5cf0b73234a5 100644 (file)
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -29,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.250 2009/10/27 04:46:58 marka Exp $ */
+/* $Id: dnssec-signzone.c,v 1.251 2009/10/27 18:56:49 each Exp $ */
 
 /*! \file */
 
@@ -3343,7 +3343,7 @@ main(int argc, char *argv[]) {
                                fatal("DS directory must be non-empty string");
                        result = try_dir(dsdir);
                        if (result != ISC_R_SUCCESS)
-                               fatal("Cannot write to directory %s: %s",
+                               fatal("cannot open directory %s: %s",
                                      dsdir, isc_result_totext(result));
                        break;