fclose(stdout);
}
+char name[BUFSIZ];
+
void Initialise(int argc, char ** argv, Options * o)
{
srand(time(NULL));
o->logfile = NULL;
o->outfile = NULL;
o->verbosity = 2;
- o->port = 4000 + rand() % 1000;
- o->slavefile = "slaves.swarm";
- o->dummy_shell = false;
+ o->port = 0;
o->append = NULL;
o->prepend = NULL;
o->end = "\a\a\a";
o->daemon = false;
o->encrypt = true;
o->interactive = true;
-
+
+ gethostname(name, sizeof(name));
+ o->name = strdup(name);
o->master_pid = getpid();
error("ParseArguments", "No argument following %s switch", argv[i]);
o->nCPU = atoi(argv[++i]);
}
- else if (argv[i][1] == 'm')
+ else if (argv[i][1] == 'r')
{
if (i >= argc-1)
error("ParseArguments", "No argument following %s switch", argv[i]);
o->master_addr = argv[++i];
+ char * p = strstr(o->master_addr, ":");
+ if (p != NULL)
+ {
+ *(p-1) = '\0';
+ o->port = atoi(p);
+ }
}
else if (argv[i][1] == 'c')
{