Commit b13494b9 authored by Kir Kolyshkin's avatar Kir Kolyshkin Committed by Pavel Emelyanov

criu --help: don't use argv[0], print help in one call

This patch

1. Replaces using argv[0] with criu literal. Using argv[0] is bad
because it can be a relative path, and it can be not "criu" but
say a symlink pointing to criu.

2. Reformats the source to print basic help test in justone call to
pr_msg(), same as commit 6ea0e002 did for extended help, for same
reasons: having it this way is easier to do further edits.
Signed-off-by: 's avatarKir Kolyshkin <kir@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent c459e417
...@@ -348,21 +348,23 @@ int main(int argc, char *argv[]) ...@@ -348,21 +348,23 @@ int main(int argc, char *argv[])
if (!strcmp(argv[optind], "page-server")) if (!strcmp(argv[optind], "page-server"))
return cr_page_server(); return cr_page_server();
usage: usage:
pr_msg("\nUsage:\n"); pr_msg("\n"
pr_msg(" %s dump -t PID [<options>]\n", argv[0]); "Usage:\n"
pr_msg(" %s restore [<options>]\n", argv[0]); " criu dump -t PID [<options>]\n"
pr_msg(" %s show (-D DIR)|(-f FILE) [<options>]\n", argv[0]); " criu restore [<options>]\n"
pr_msg(" %s check [--ms]\n", argv[0]); " criu show (-D DIR)|(-f FILE) [<options>]\n"
pr_msg(" %s exec -p PID <syscall-string>\n", argv[0]); " criu check [--ms]\n"
" criu exec -p PID <syscall-string>\n"
pr_msg("\nCommands:\n"); "\n"
pr_msg(" dump checkpoint a process/tree identified by pid\n"); "Commands:\n"
pr_msg(" pre-dump pre-dump task(s) minimizing their frozen time\n"); " dump checkpoint a process/tree identified by pid\n"
pr_msg(" restore restore a process/tree identified by pid\n"); " pre-dump pre-dump task(s) minimizing their frozen time\n"
pr_msg(" show show dump file(s) contents\n"); " restore restore a process/tree identified by pid\n"
pr_msg(" check checks whether the kernel support is up-to-date\n"); " show show dump file(s) contents\n"
pr_msg(" exec execute a system call by other task\n"); " check checks whether the kernel support is up-to-date\n"
pr_msg(" page-server launch page server\n"); " exec execute a system call by other task\n"
" page-server launch page server\n"
);
if (argc < 2) { if (argc < 2) {
pr_msg("\nTry -h|--help for more info\n"); pr_msg("\nTry -h|--help for more info\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment