Use basename(argv[0]) where appropriate to avoid hard coded tool name

This commit is contained in:
Heinz Mauelshagen 2011-12-15 15:17:49 +01:00
parent 3d52279dc3
commit 7ba9183d34
3 changed files with 9 additions and 6 deletions

View File

@ -18,6 +18,7 @@
#include <iostream>
#include <getopt.h>
#include <libgen.h>
#include "human_readable_format.h"
#include "metadata_dumper.h"
@ -74,7 +75,7 @@ int main(int argc, char **argv)
while ((c = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) {
switch(c) {
case 'h':
usage(argv[0]);
usage(basename(argv[0]));
return 0;
case 'f':
format = optarg;
@ -89,7 +90,7 @@ int main(int argc, char **argv)
}
if (argc == 1) {
usage(argv[0]);
usage(basename(argv[0]));
return 1;
}

View File

@ -18,6 +18,7 @@
#include <iostream>
#include <getopt.h>
#include <libgen.h>
#include "metadata.h"
#include "metadata_checker.h"
@ -61,7 +62,7 @@ int main(int argc, char **argv)
while ((c = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) {
switch(c) {
case 'h':
usage(argv[0]);
usage(basename(argv[0]));
return 0;
case 'V':
cerr << THIN_PROVISIONING_TOOLS_VERSION << endl;
@ -70,7 +71,7 @@ int main(int argc, char **argv)
}
if (argc != 2) {
usage(argv[0]);
usage(basename(argv[0]));
exit(1);
}

View File

@ -26,6 +26,7 @@
#include <fstream>
#include <iostream>
#include <getopt.h>
#include <libgen.h>
using namespace persistent_data;
using namespace std;
@ -78,7 +79,7 @@ int main(int argc, char **argv)
while ((c = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) {
switch(c) {
case 'h':
usage(argv[0]);
usage(basename(argv[0]));
return 0;
case 'i':
input = optarg;
@ -93,7 +94,7 @@ int main(int argc, char **argv)
}
if (argc == 1) {
usage(argv[0]);
usage(basename(argv[0]));
return 1;
}