Don't print usage to stdout for invalid parameters

5 files changed, 38 insertions, 32 deletions

diff --git a/session_utils/copy-mixer.cc b/session_utils/copy-mixer.cc
index 529f32eecc..e1e8526b31 100644
--- a/session_utils/copy-mixer.cc
+++ b/session_utils/copy-mixer.cc
@@ -246,7 +246,7 @@ copy_session_routes (
 }
 
 
-static void usage (int status) {
+static void usage () {
 	// help2man compatible format (standard GNU help-text)
 	printf (UTILNAME " - copy mixer settings from one session to another.\n\n");
 	printf ("Usage: " UTILNAME " [ OPTIONS ] <src> <dst>\n\n");
@@ -270,7 +270,7 @@ When --snapshot is set, a new snaphot in the <dst> session is created.\n\
 
 	printf ("Report bugs to <http://tracker.ardour.org/>\n"
 	        "Website: <http://ardour.org/>\n");
-	::exit (status);
+	::exit (EXIT_SUCCESS);
 }
 
 static bool ends_with (std::string const& value, std::string const& ending)
@@ -308,7 +308,7 @@ int main (int argc, char* argv[])
 				break;
 
 			case 'h':
-				usage (EXIT_SUCCESS);
+				usage ();
 				break;
 
 			case 'l':
@@ -330,15 +330,17 @@ int main (int argc, char* argv[])
 				break;
 
 			default:
-					usage (EXIT_FAILURE);
-					break;
+				cerr << "Error: unrecognized option. See --help for usage information.\n";
+				::exit (EXIT_FAILURE);
+				break;
 		}
 	}
 
 	// TODO parse path/name  from a single argument.
 
 	if (optind + 2 > argc) {
-		usage (EXIT_FAILURE);
+		cerr << "Error: Missing parameter. See --help for usage information.\n";
+		::exit (EXIT_FAILURE);
 	}
 
 	std::string src = argv[optind];
diff --git a/session_utils/export.cc b/session_utils/export.cc
index 76b5474156..15b9991fce 100644
--- a/session_utils/export.cc
+++ b/session_utils/export.cc
@@ -207,7 +207,7 @@ static int export_session (Session *session,
 	return 0;
 }
 
-static void usage (int status) {
+static void usage () {
 	// help2man compatible format (standard GNU help-text)
 	printf (UTILNAME " - export an ardour session from the commandline.\n\n");
 	printf ("Usage: " UTILNAME " [ OPTIONS ] <session-dir> <session/snapshot-name>\n\n");
@@ -231,7 +231,7 @@ Note: the tool expects a session-name without .ardour file-name extension.\n\
 
 	printf ("Report bugs to <http://tracker.ardour.org/>\n"
 	        "Website: <http://ardour.org/>\n");
-	::exit (status);
+	::exit (EXIT_SUCCESS);
 }
 
 int main (int argc, char* argv[])
@@ -309,17 +309,19 @@ int main (int argc, char* argv[])
 				break;
 
 			case 'h':
-				usage (EXIT_SUCCESS);
+				usage ();
 				break;
 
 			default:
-					usage (EXIT_FAILURE);
-					break;
+				cerr << "Error: unrecognized option. See --help for usage information.\n";
+				::exit (EXIT_FAILURE);
+				break;
 		}
 	}
 
 	if (optind + 2 > argc) {
-		usage (EXIT_FAILURE);
+		cerr << "Error: Missing parameter. See --help for usage information.\n";
+		::exit (EXIT_FAILURE);
 	}
 
 	SessionUtils::init(false);
diff --git a/session_utils/fix_bbtppq.cc b/session_utils/fix_bbtppq.cc
index 5a2988f448..71f84774f9 100644
--- a/session_utils/fix_bbtppq.cc
+++ b/session_utils/fix_bbtppq.cc
@@ -334,7 +334,7 @@ apply_one_source_per_source_fix (Session* session)
 	return true;
 }
 
-static void usage (int status) {
+static void usage () {
 	// help2man compatible format (standard GNU help-text)
 	printf (UTILNAME " - convert an ardour session with 5.0 - 5.3 midi sources to be compatible with 5.4.\n\n");
 	printf ("Usage: " UTILNAME " [ OPTIONS ] <session-dir> <snapshot-name>\n\n");
@@ -389,7 +389,7 @@ If a MIDI session only contains quarter note meter divisors, it will be unaffect
 
 	printf ("Report bugs to <http://tracker.ardour.org/>\n"
 	        "Website: <http://ardour.org/>\n");
-	::exit (status);
+	::exit (EXIT_SUCCESS);
 }
 
 int main (int argc, char* argv[])
@@ -417,9 +417,6 @@ int main (int argc, char* argv[])
 
 		case 'o':
 			outfile = optarg;
-			if (outfile.empty()) {
-				usage (EXIT_SUCCESS);
-			}
 			break;
 
 		case 'V':
@@ -429,17 +426,19 @@ int main (int argc, char* argv[])
 			break;
 
 		case 'h':
-			usage (EXIT_SUCCESS);
+			usage ();
 			break;
 
 		default:
-			usage (EXIT_FAILURE);
+			cerr << "Error: unrecognized option. See --help for usage information.\n";
+			::exit (EXIT_FAILURE);
 			break;
 		}
 	}
 
 	if (optind + 2 > argc) {
-		usage (EXIT_FAILURE);
+		cerr << "Error: Missing parameter. See --help for usage information.\n";
+		::exit (EXIT_FAILURE);
 	}
 
 	SessionDirectory* session_dir = new SessionDirectory (argv[optind]);
diff --git a/session_utils/new_empty_session.cc b/session_utils/new_empty_session.cc
index 2871852e1e..86fba1a324 100644
--- a/session_utils/new_empty_session.cc
+++ b/session_utils/new_empty_session.cc
@@ -29,7 +29,7 @@ using namespace ARDOUR;
 using namespace SessionUtils;
 
 
-static void usage (int status)
+static void usage ()
 {
 	// help2man compatible format (standard GNU help-text)
 	printf (UTILNAME " - create a new empty session from the commandline.\n\n");
@@ -55,7 +55,7 @@ Examples:\n\
 
 	printf ("Report bugs to <http://tracker.ardour.org/>\n"
 	        "Website: <http://ardour.org/>\n");
-	::exit (status);
+	::exit (EXIT_SUCCESS);
 }
 
 int main (int argc, char* argv[])
@@ -92,11 +92,12 @@ int main (int argc, char* argv[])
 				break;
 
 			case 'h':
-				usage (EXIT_SUCCESS);
+				usage ();
 				break;
 
 			default:
-				usage (EXIT_FAILURE);
+				cerr << "Error: unrecognized option. See --help for usage information.\n";
+				::exit (EXIT_FAILURE);
 				break;
 		}
 	}
@@ -108,11 +109,12 @@ int main (int argc, char* argv[])
 	} else if (optind + 1 == argc) {
 		snapshot_name = Glib::path_get_basename (argv[optind]);
 	} else  {
-		usage (EXIT_FAILURE);
+		cerr << "Error: Missing parameter. See --help for usage information.\n";
+		::exit (EXIT_FAILURE);
 	}
 
 	if (snapshot_name.empty ()) {
-		fprintf(stderr, "Error: Invalid empty session/snapshot name.\n");
+		cerr << "Error: Invalid empty session/snapshot name.\n";
 		::exit (EXIT_FAILURE);
 	}
 
diff --git a/session_utils/new_session.cc b/session_utils/new_session.cc
index 86e085ef72..6ad46f8770 100644
--- a/session_utils/new_session.cc
+++ b/session_utils/new_session.cc
@@ -32,8 +32,7 @@ using namespace std;
 using namespace ARDOUR;
 using namespace SessionUtils;
 
-static void
-usage (int status)
+static void usage ()
 {
 	// help2man compatible format (standard GNU help-text)
 	printf (UTILNAME " - create a new session from the commandline.\n\n");
@@ -70,7 +69,7 @@ Examples:\n\
 
 	printf ("Report bugs to <http://tracker.ardour.org/>\n"
 	        "Website: <http://ardour.org/>\n");
-	::exit (status);
+	::exit (EXIT_SUCCESS);
 }
 
 static void
@@ -210,11 +209,12 @@ main (int argc, char* argv[])
 				break;
 
 			case 'h':
-				usage (EXIT_SUCCESS);
+				usage ();
 				break;
 
 			default:
-				usage (EXIT_FAILURE);
+				cerr << "Error: unrecognized option. See --help for usage information.\n";
+				::exit (EXIT_FAILURE);
 				break;
 		}
 	}
@@ -226,7 +226,8 @@ main (int argc, char* argv[])
 	} else if (optind + 1 == argc) {
 		snapshot_name = Glib::path_get_basename (argv[optind]);
 	} else {
-		usage (EXIT_FAILURE);
+		cerr << "Error: Missing parameter. See --help for usage information.\n";
+		::exit (EXIT_FAILURE);
 	}
 
 	if (snapshot_name.empty ()) {