kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make script_dir setting on command line FSCORE-48 

cleanup the usage string

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6011 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-10-20 06:46:16 +00:00
parent 3ccda4e25e
commit 6b2a40b938
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/switch.c
View File

@ -221,28 +221,24 @@ int main(int argc, char *argv[])
{SERVICENAME, &service_main}, {SERVICENAME, &service_main},
{NULL, NULL} {NULL, NULL}
}; };
#endif
usageDesc = "these are the optional arguments you can pass to freeswitch\n" usageDesc = "these are the optional arguments you can pass to freeswitch\n"
#ifdef WIN32
"\t-service -- start freeswitch as a service, cannot be used if loaded as a console app\n" "\t-service -- start freeswitch as a service, cannot be used if loaded as a console app\n"
"\t-install -- install freeswitch as a service\n" "\t-install -- install freeswitch as a service\n"
"\t-uninstall -- remove freeswitch as a service\n" "\t-uninstall -- remove freeswitch as a service\n"
"\t-hp -- enable high priority settings\n"
"\t-nosql -- disable internal sql scoreboard\n"
"\t-stop -- stop freeswitch\n"
"\t-nc -- do not output to a console and background\n"
"\t-conf [confdir] -- specify an alternate config dir\n"
"\t-log [logdir] -- specify an alternate log dir\n" "\t-db [dbdir] -- specify an alternate db dir\n";
#else #else
usageDesc = "these are the optional arguments you can pass to freeswitch\n"
"\t-help -- this message\n"
"\t-nf -- no forking\n" "\t-nf -- no forking\n"
#endif
"\t-help -- this message\n"
"\t-hp -- enable high priority settings\n" "\t-hp -- enable high priority settings\n"
"\t-nosql -- disable internal sql scoreboard\n" "\t-nosql -- disable internal sql scoreboard\n"
"\t-stop -- stop freeswitch\n" "\t-stop -- stop freeswitch\n"
"\t-nc -- do not output to a console and background\n" "\t-nc -- do not output to a console and background\n"
"\t-conf [confdir] -- specify an alternate config dir\n" "\t-conf [confdir] -- specify an alternate config dir\n"
"\t-log [logdir] -- specify an alternate log dir\n" "\t-db [dbdir] -- specify an alternate db dir\n"; "\t-log [logdir] -- specify an alternate log dir\n"
"\t-db [dbdir] -- specify an alternate db dir\n"
#endif "\t-scripts [scriptsdir] -- specify an alternate scripts dir\n";
for (x = 1; x < argc; x++) { for (x = 1; x < argc; x++) {
known_opt = 0; known_opt = 0;
@ -350,7 +346,19 @@ int main(int argc, char *argv[])
known_opt++; known_opt++;
} }
if ((!known_opt || argv[x]) && !strcmp(argv[x], "-help")) { if (argv[x] && !strcmp(argv[x], "-scripts")) {
x++;
if (argv[x] && strlen(argv[x])) {
SWITCH_GLOBAL_dirs.script_dir = (char *) malloc(strlen(argv[x]) + 1);
strcpy(SWITCH_GLOBAL_dirs.script_dir, argv[x]);
} else {
fprintf(stderr, "When using -scripts you must specify a scripts directory\n");
return 255;
}
known_opt++;
}
if ((!known_opt || argv[x]) && (!strcmp(argv[x], "-help") || !strcmp(argv[x], "-h") || !strcmp(argv[x], "-?"))) {
printf("%s\n", usageDesc); printf("%s\n", usageDesc);
exit(0); exit(0);
} }
@ -362,7 +370,7 @@ int main(int argc, char *argv[])
} }
if (alt_dirs && alt_dirs != 3) { if (alt_dirs && alt_dirs != 3) {
fprintf(stderr, "You must use -conf, -log, and -db together\n"); fprintf(stderr, "You must specify all or none of -conf, -log, and -db\n");
return 255; return 255;
} }