From 31d5a4814e867f542182112aed3dedabe8031730 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Wed, 29 May 2024 03:19:18 +0000
Subject: driver: refined the various usage error messages.

---
 src/driver/tpax_driver_ctx.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/driver')

diff --git a/src/driver/tpax_driver_ctx.c b/src/driver/tpax_driver_ctx.c
index 7cae777..b1393d2 100644
--- a/src/driver/tpax_driver_ctx.c
+++ b/src/driver/tpax_driver_ctx.c
@@ -112,9 +112,9 @@ static int tpax_driver_usage_exec_mode(
 
 	tpax_dprintf(
 		fdout,
-		"\nWhen using explicit (long) mode options, "
+		"\n%s: usage error: When using explicit (long) mode options, "
 		"only one of --list, --read, --write, --copy "
-		"may be used.\n");
+		"may be used.\n",program);
 
 	return TPAX_USAGE;
 }
@@ -138,12 +138,12 @@ static int tpax_driver_usage_copy_mode(
 		if (archive) {
 			tpax_dprintf(
 				fdout,
-				"\n%s: the __copy__ mode does not permit specifying "
+				"\n%s: usage error: the __copy__ mode does not permit specifying "
 				"an archive path.\n\n",program);
 		} else {
 			tpax_dprintf(
 				fdout,
-				"\n%s: the __copy__ mode requires a destination "
+				"\n%s: usage error: the __copy__ mode requires a destination "
 				"directory argument.\n\n",program);
 		}
 
@@ -154,7 +154,7 @@ static int tpax_driver_usage_copy_mode(
 		case ENOENT:
 			tpax_dprintf(
 				fdout,
-				"%s: error: "
+				"%s: file-system error: "
 				"the destination directory '%s' "
 				"does not exist.\n\n",
 				program,operand->arg);
@@ -163,7 +163,7 @@ static int tpax_driver_usage_copy_mode(
 		case ENOTDIR:
 			tpax_dprintf(
 				fdout,
-				"%s: error: "
+				"%s: file-system error: "
 				"'%s' is not a directory.\n\n",
 				program,operand->arg);
 			break;
@@ -174,7 +174,7 @@ static int tpax_driver_usage_copy_mode(
 
 			tpax_dprintf(
 				fdout,
-				"%s: error: while opening the "
+				"%s: general error: while opening the "
 				"destination directory '%s': %s.\n\n",
 				program,operand->arg,errdesc);
 			break;
@@ -198,8 +198,8 @@ static int tpax_driver_usage_write_format(
 
 	tpax_dprintf(
 		fdout,
-		"\nArchive format may only be specified "
-		"in write mode.\n");
+		"\n%s: usage error: Archive format may only be specified "
+		"in write mode.\n",program);
 
 	return TPAX_USAGE;
 }
@@ -217,8 +217,8 @@ static int tpax_driver_usage_block_size(
 
 	tpax_dprintf(
 		fdout,
-		"`%s' is not a valid positive decimal integer.\n",
-		arg);
+		"%s: usage error: `%s' is not a valid positive decimal integer.\n",
+		program,arg);
 
 	return TPAX_USAGE;
 }
@@ -236,8 +236,8 @@ static int tpax_driver_usage_block_size_range(
 
 	tpax_dprintf(
 		fdout,
-		"`%s' is outside the specified range of 512 to 32256.\n",
-		arg);
+		"%s: usage error: `%s' is outside the specified range of 512 to 32256.\n",
+		program,arg);
 
 	return TPAX_USAGE;
 }
@@ -262,13 +262,13 @@ static int tpax_driver_error_archive_path(
 	if (fwrite) {
 		tpax_dprintf(
 			fdout,
-			"%s: archive file <%s> could not be created "
+			"%s: file-system error: archive file <%s> could not be created "
 			"or opened for writing (%s).\n",
 			program,arg,errstr);
 	} else {
 		tpax_dprintf(
 			fdout,
-			"%s: archive file <%s> could not be opened "
+			"%s: file-system error: archive file <%s> could not be opened "
 			"for reading (%s).\n",
 			program,arg,errstr);
 	}
-- 
cgit v1.2.3