Don't print usage to stdout for invalid parameters

This commit is contained in:
Robin Gareus 2019-08-15 01:07:41 +02:00
parent 4aedf9c3ea
commit 316880b9cf
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
6 changed files with 48 additions and 40 deletions

View file

@ -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);
}