simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor improvements

Browse source 
* Use stdout for usage and version information. Patch taken from
  issue #344.
* Removed automatic usage display when command line parsing fails.
* Added version information in debug output.
This commit is contained in:
KLuka 2015-09-03 18:58:51 +02:00
parent b58542eb99
commit 7dd9d4300c
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
shellinabox/shellinaboxd.c
View file

@ -768,7 +768,7 @@ static void usage(void) {
const char *user = getUserName(r_uid); const char *user = getUserName(r_uid);
const char *group = getGroupName(r_gid); const char *group = getGroupName(r_gid);
message("Usage: shellinaboxd [OPTIONS]...\n" printf("Usage: shellinaboxd [OPTIONS]...\n"
"Starts an HTTP server that serves terminal emulators to AJAX " "Starts an HTTP server that serves terminal emulators to AJAX "
"enabled browsers.\n" "enabled browsers.\n"
"\n" "\n"
@ -835,7 +835,8 @@ static void usage(void) {
"\n" "\n"
"OPTIONs that make up a GROUP are mutually exclusive. But " "OPTIONs that make up a GROUP are mutually exclusive. But "
"individual GROUPs are\n" "individual GROUPs are\n"
"independent of each other.\n", "independent of each other.\n"
"\n",
!serverSupportsSSL() ? "" : !serverSupportsSSL() ? "" :
" -c, --cert=CERTDIR set certificate dir " " -c, --cert=CERTDIR set certificate dir "
"(default: $PWD)\n" "(default: $PWD)\n"
@ -1211,18 +1212,19 @@ static void parseArgs(int argc, char * const argv[]) {
logSetLogLevel(verbosity); logSetLogLevel(verbosity);
} else if (!idx--) { } else if (!idx--) {
// Version // Version
message("ShellInABox version " VERSION VCS_REVISION); printf("ShellInABox version " VERSION VCS_REVISION "\n");
exit(0); exit(0);
} }
} }
if (optind != argc) { if (optind != argc) {
usage();
fatal("[config] Failed to parse command line!"); fatal("[config] Failed to parse command line!");
} }
char *buf = NULL; char *buf = NULL;
check(argc >= 1); check(argc >= 1);
info("[server] Version " VERSION VCS_REVISION);
for (int i = 0; i < argc; i++) { for (int i = 0; i < argc; i++) {
buf = stringPrintf(buf, " %s", argv[i]); buf = stringPrintf(buf, "%s ", argv[i]);
} }
info("[server] Command line: %s", buf); info("[server] Command line: %s", buf);
free(buf); free(buf);