git.ucc.asn.au
/
matches
/
swarm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Things seem to work...
[matches/swarm.git]
/
src
/
options.c
diff --git
a/src/options.c
b/src/options.c
index
6ef6119
..
ddd2ddc
100644
(file)
--- a/
src/options.c
+++ b/
src/options.c
@@
-35,6
+35,8
@@
void close_out()
fclose(stdout);
}
fclose(stdout);
}
+char name[BUFSIZ];
+
void Initialise(int argc, char ** argv, Options * o)
{
srand(time(NULL));
void Initialise(int argc, char ** argv, Options * o)
{
srand(time(NULL));
@@
-44,9
+46,7
@@
void Initialise(int argc, char ** argv, Options * o)
o->logfile = NULL;
o->outfile = NULL;
o->verbosity = 2;
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->append = NULL;
o->prepend = NULL;
o->end = "\a\a\a";
@@
-54,7
+54,9
@@
void Initialise(int argc, char ** argv, Options * o)
o->daemon = false;
o->encrypt = true;
o->interactive = true;
o->daemon = false;
o->encrypt = true;
o->interactive = true;
-
+
+ gethostname(name, sizeof(name));
+ o->name = strdup(name);
o->master_pid = getpid();
o->master_pid = getpid();
@@
-140,11
+142,17
@@
void ParseArguments(int argc, char ** argv, Options * o)
error("ParseArguments", "No argument following %s switch", argv[i]);
o->nCPU = atoi(argv[++i]);
}
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];
{
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')
{
}
else if (argv[i][1] == 'c')
{
UCC
git Repository :: git.ucc.asn.au