if (config->verbose)
fprintf(stderr, "Host name conflict\n");
+
+ /* Fall through */
+ case AVAHI_CLIENT_S_REGISTERING:
+
if (entry_group) {
avahi_entry_group_free(entry_group);
entry_group = NULL;
if (config->verbose)
fprintf(stderr, "Waiting for daemon ...\n");
+
break;
- case AVAHI_CLIENT_S_REGISTERING:
;
}
}
" -H --host=DOMAIN Host where service resides\n"
" --subtype=SUBTYPE An additional subtype to register this service with\n"
" -f --no-fail Don't fail if the daemon is not available\n",
- argv0, strstr(argv0, "address") ? "[-a]" : "-a",
- argv0, strstr(argv0, "service") ? "[-s]" : "-s");
+ argv0, strstr(argv0, "service") ? "[-s]" : "-s",
+ argv0, strstr(argv0, "address") ? "[-a]" : "-a");
}
static int parse_command_line(Config *c, const char *argv0, int argc, char *argv[]) {
c->port = 0;
c->txt = c->subtypes = NULL;
- opterr = 0;
while ((o = getopt_long(argc, argv, "hVsavd:H:f", long_options, NULL)) >= 0) {
switch(o) {
c->subtypes = avahi_string_list_add(c->subtypes, optarg);
break;
default:
- fprintf(stderr, "Invalid command line argument: %c\n", o);
return -1;
}
}
fprintf(stderr, "Failed to parse port number: %s\n", argv[optind+2]);
return -1;
}
+
+ c->port = p;
for (i = optind+3; i < argc; i++)
c->txt = avahi_string_list_add(c->txt, argv[i]);