Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-28 07:58:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

accept multiple cref ids and names on console

Browse source
This commit is contained in:
ehouse 2010-06-03 03:00:35 +00:00
parent 0920eeb6b3
commit 43181f5cd2
1 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
xwords4/relay/ctrl.cpp
View file

@ -47,6 +47,8 @@
#include "configs.h" #include "configs.h"
#include "lstnrmgr.h" #include "lstnrmgr.h"
#define MAX_ARGS 10
/* this is *only* for testing. Don't abuse!!!! */ /* this is *only* for testing. Don't abuse!!!! */
extern pthread_rwlock_t gCookieMapRWLock; extern pthread_rwlock_t gCookieMapRWLock;
@ -193,8 +195,11 @@ cmd_kill_eject( int socket, const char** args )
} }
} else if ( 0 == strcmp( args[1], "cref" ) ) { } else if ( 0 == strcmp( args[1], "cref" ) ) {
const char* idhow = args[2]; const char* idhow = args[2];
const char* id = args[3]; for ( int indx = 3; ; ++indx ) {
if ( idhow != NULL && id != NULL ) { const char* id = args[indx];
if ( idhow == NULL || id == NULL ) {
break;
}
if ( 0 == strcmp( idhow, "name" ) ) { if ( 0 == strcmp( idhow, "name" ) ) {
CRefMgr::Get()->Recycle( id ); CRefMgr::Get()->Recycle( id );
found = true; found = true;
@ -213,8 +218,8 @@ cmd_kill_eject( int socket, const char** args )
if ( !found ) { if ( !found ) {
const char* msg = const char* msg =
"* %s socket <num> -- %s\n" "* %s socket <num> -- %s\n"
" %s cref name <connName>\n" " %s cref name <connName>+\n"
" %s cref id <id>" " %s cref id <id>+"
; ;
print_to_sock( socket, true, msg, args[0], expl, args[0], args[0] ); print_to_sock( socket, true, msg, args[0], expl, args[0], args[0] );
} }
@ -550,7 +555,10 @@ ctrl_thread_main( void* arg )
} }
for ( ; ; ) { for ( ; ; ) {
string cmd, arg1, arg2, arg3; string cmd;
const char* args[MAX_ARGS] = {0};
string sargs[MAX_ARGS];
print_prompt( sock ); print_prompt( sock );
char buf[512]; char buf[512];
@ -561,18 +569,22 @@ ctrl_thread_main( void* arg )
/* if nGot is 2, reuse prev string */ /* if nGot is 2, reuse prev string */
buf[nGot] = '\0'; buf[nGot] = '\0';
istringstream s( buf ); istringstream s( buf );
s >> cmd >> arg1 >> arg2 >> arg3; s >> cmd;
unsigned int ii;
for ( ii = 1; ii < (sizeof(args)/sizeof(args[0])); ++ii ) {
s >> sargs[ii];
args[ii] = sargs[ii].c_str();
if ( NULL == args[ii] ) {
break;
}
}
} }
int index = match( &cmd, (char*const*)&gFuncs[0].name, int index = match( &cmd, (char*const*)&gFuncs[0].name,
sizeof(gFuncs[0]), sizeof(gFuncs[0]),
sizeof(gFuncs)/sizeof(gFuncs[0]) ); sizeof(gFuncs)/sizeof(gFuncs[0]) );
const char* args[] = { args[0] = cmd.c_str();
cmd.c_str(),
arg1.c_str(),
arg2.c_str(),
arg3.c_str()
};
if ( index == -1 ) { if ( index == -1 ) {
print_to_sock( sock, 1, "unknown or ambiguous command: \"%s\"", print_to_sock( sock, 1, "unknown or ambiguous command: \"%s\"",
cmd.c_str() ); cmd.c_str() );