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

manually apply patch http://jira.freeswitch.org/browse/FSCORE-24. Thanks dirk. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4998 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-04-21 16:58:35 +00:00
parent b7606ea4ea
commit ca464fd296
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/switch.c
View File

@ -210,6 +210,7 @@ int main(int argc, char *argv[])
int die = 0; int die = 0;
char *usageDesc; char *usageDesc;
int alt_dirs = 0; int alt_dirs = 0;
int known_opt;
#ifdef WIN32 #ifdef WIN32
SERVICE_TABLE_ENTRY dispatchTable[] = { SERVICE_TABLE_ENTRY dispatchTable[] = {
@ -238,13 +239,11 @@ int main(int argc, char *argv[])
#endif #endif
for (x = 1; x < argc; x++) { for (x = 1; x < argc; x++) {
if (argv[x] && !strcmp(argv[x], "-help")) { known_opt = 0;
printf("%s\n", usageDesc);
exit(0);
}
#ifdef WIN32 #ifdef WIN32
if (x == 1) { if (x == 1) {
if (argv[x] && !strcmp(argv[x], "-service")) { if (argv[x] && !strcmp(argv[x], "-service")) {
known_opt++;
if (StartServiceCtrlDispatcher(dispatchTable) == 0) { if (StartServiceCtrlDispatcher(dispatchTable) == 0) {
/* Not loaded as a service */ /* Not loaded as a service */
fprintf(stderr, "Error Freeswitch loaded as a console app with -service option\n"); fprintf(stderr, "Error Freeswitch loaded as a console app with -service option\n");
@ -257,6 +256,7 @@ int main(int argc, char *argv[])
char servicePath[1024]; char servicePath[1024];
SC_HANDLE handle = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); SC_HANDLE handle = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
known_opt++;
GetModuleFileName(NULL, exePath, 1024); GetModuleFileName(NULL, exePath, 1024);
snprintf(servicePath, sizeof(servicePath), "%s -service", exePath); snprintf(servicePath, sizeof(servicePath), "%s -service", exePath);
CreateService(handle, CreateService(handle,
@ -269,6 +269,7 @@ int main(int argc, char *argv[])
if (argv[x] && !strcmp(argv[x], "-uninstall")) { if (argv[x] && !strcmp(argv[x], "-uninstall")) {
SC_HANDLE handle = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); SC_HANDLE handle = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
SC_HANDLE service = OpenService(handle, SERVICENAME, DELETE); SC_HANDLE service = OpenService(handle, SERVICENAME, DELETE);
known_opt++;
if (service != NULL) { if (service != NULL) {
/* remove the service! */ /* remove the service! */
DeleteService(service); DeleteService(service);
@ -280,18 +281,22 @@ int main(int argc, char *argv[])
if (argv[x] && !strcmp(argv[x], "-nf")) { if (argv[x] && !strcmp(argv[x], "-nf")) {
nf++; nf++;
known_opt++;
} }
#endif #endif
if (argv[x] && !strcmp(argv[x], "-hp")) { if (argv[x] && !strcmp(argv[x], "-hp")) {
set_high_priority(); set_high_priority();
known_opt++;
} }
if (argv[x] && !strcmp(argv[x], "-stop")) { if (argv[x] && !strcmp(argv[x], "-stop")) {
die++; die++;
known_opt++;
} }
if (argv[x] && !strcmp(argv[x], "-nc")) { if (argv[x] && !strcmp(argv[x], "-nc")) {
nc++; nc++;
known_opt++;
} }
@ -305,6 +310,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "When using -conf you must specify a config directory\n"); fprintf(stderr, "When using -conf you must specify a config directory\n");
return 255; return 255;
} }
known_opt++;
} }
if (argv[x] && !strcmp(argv[x], "-log")) { if (argv[x] && !strcmp(argv[x], "-log")) {
@ -317,6 +323,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "When using -log you must specify a log directory\n"); fprintf(stderr, "When using -log you must specify a log directory\n");
return 255; return 255;
} }
known_opt++;
} }
if (argv[x] && !strcmp(argv[x], "-db")) { if (argv[x] && !strcmp(argv[x], "-db")) {
@ -329,6 +336,12 @@ int main(int argc, char *argv[])
fprintf(stderr, "When using -db you must specify a db directory\n"); fprintf(stderr, "When using -db you must specify a db directory\n");
return 255; return 255;
} }
known_opt++;
}
if (!known_opt || argv[x] && !strcmp(argv[x], "-help")) {
printf("%s\n", usageDesc);
exit(0);
} }
} }