@@ -117,12 +117,12 @@ sub start_message_loop } -my $prolog; -GetOptions('prolog' => \$prolog); +my $stub; +GetOptions('stub' => \$stub); $|++; -if ($prolog) { +if ($stub) { print "USER $global_setting{nickname} $global_setting{hostname} * $global_setting{realname}\n"; print "NICK $global_setting{nickname}\n"; exit; droids/merlin/core @@ -267,14 +267,14 @@ create_ctrl_context(const char *hostname, const char *service) } static void -send_prolog(struct application_context *actx) +send_stub(struct application_context *actx) { FILE *fp; char *buffer = NULL, *start = NULL; size_t bytes_read = 0; size_t file_size = 256, block_size = 256; - if ((fp = fopen(actx->prolog, "r"))) { + if ((fp = fopen(actx->stub, "r"))) { /* Can not use fstat/stat to find the size of file, since we may use <(xxx) * on command line */ while (!feof(fp)) { @@ -288,7 +288,7 @@ send_prolog(struct application_context *actx) bufferevent_enable(actx->sctx->evt, EV_WRITE); free(buffer); } else { - WARN("Can not open prolog file %s", actx->prolog); + WARN("Can not open stub file %s", actx->stub); } } @@ -355,7 +355,7 @@ server_error_cb(struct bufferevent *evt, short what, void *user) actx->sctx->fd = fd; bufferevent_setfd(actx->sctx->evt, actx->sctx->fd); bufferevent_enable(actx->sctx->evt, EV_READ); - send_prolog(actx); + send_stub(actx); event_base_loopbreak(actx->evbase); } @@ -559,7 +559,7 @@ create_application(struct application_context *actx) sctx->evt = bufferevent_new(sctx->fd, NULL, NULL, server_error_cb, actx); bufferevent_base_set(actx->evbase, sctx->evt); bufferevent_enable(sctx->evt, EV_READ); - send_prolog(actx); + send_stub(actx); /* setup signal handler */ signal_set(&actx->ev_chld, SIGCHLD, chld_cb, actx); @@ -665,7 +665,7 @@ help_message() " -b|--bind <bind_addr:port> Listen for control messages\n" " -c|--connect server_addr:port IRC server address\n" " -n|--num <number> Number of concurrently running droid\n" - " -p|--prolog <prolog_file> Send a prolog before pass control to droid\n" + " -s|--stub <stub_file> Send a stub before pass control to droid\n" "\n" "Report bugs to jianingy.yang@gmail.com\n" , global_application_name); @@ -677,7 +677,7 @@ int main(int argc, char *argv[]) const char dfl_prog[] = "./droid"; const char dfl_server_addr[] = "localhost"; const char dfl_server_port[] = "6667"; - const char dfl_prolog[] = "./prolog"; + const char dfl_stub[] = "./stub"; const size_t dfl_num_handler = 5; const char dfl_bind_addr[] = "0.0.0.0"; const char dfl_bind_port[] = "44944"; @@ -687,7 +687,7 @@ int main(int argc, char *argv[]) {"bind" , required_argument , 0, 'b'}, {"connect" , required_argument , 0, 'c'}, {"num" , required_argument , 0, 'n'}, - {"prolog" , required_argument , 0, 'p'}, + {"stub" , required_argument , 0, 's'}, {0, 0, 0, 0} }; int option_index; @@ -699,14 +699,14 @@ int main(int argc, char *argv[]) actx->server_addr= dfl_server_addr; actx->server_port = dfl_server_port; actx->prog = dfl_prog; - actx->prolog = dfl_prolog; + actx->stub = dfl_stub; actx->server_addr = dfl_server_addr; actx->server_port = dfl_server_port; actx->bind_addr = dfl_bind_addr; actx->bind_port = dfl_bind_port; for (;;) { - c = getopt_long(argc, argv, "hb:c:n:p:", long_options, &option_index); + c = getopt_long(argc, argv, "hb:c:n:s:", long_options, &option_index); if (c == -1) break; char *pch; @@ -735,8 +735,8 @@ int main(int argc, char *argv[]) case 'n': actx->num_handler = atoi(optarg); break; - case 'p': - actx->prolog = optarg; + case 's': + actx->stub = optarg; break; } } src/droid_server.c @@ -94,7 +94,7 @@ struct application_context { const char *prog; const char *server_addr; const char *server_port; - const char *prolog; + const char *stub; const char *bind_addr; const char *bind_port; }; src/droid_server.h @@ -3,4 +3,4 @@ root="$(dirname $0)/.." droid_name=$1 droid_core="$root/droids/${droid_name:-merlin}/core" -exec $root/src/droid_server --connect localhost --num 15 --prolog <($droid_core --prolog) $droid_core +exec $root/src/droid_server --connect localhost --num 15 --stub <($droid_core --stub) $droid_core tools/start a45c3dcd5ff47499e78eadb736fd45db770083b3 Jianing Yang jianingy.yang@gmail.com http://github.com/jianingy/idroid/commit/80d3df393b61f1879db390ed728c0d417e336586 80d3df393b61f1879db390ed728c0d417e336586 2009-10-31T11:29:38-07:00 2009-10-31T11:29:38-07:00 change name from prolog to stub cae9f25f9f72affdf7dfb8cf8a6ba4927aa2b8c4 Jianing Yang jianingy.yang@gmail.com