diff options
Diffstat (limited to 'src/location.c')
| -rw-r--r-- | src/location.c | 86 |
1 files changed, 63 insertions, 23 deletions
diff --git a/src/location.c b/src/location.c index 216b7a9..60a1ca0 100644 --- a/src/location.c +++ b/src/location.c @@ -31,9 +31,8 @@ const struct location_provider *location_providers[] = { }; - static int -try_start(const struct location_provider *provider, LOCATION_STATE **state, struct config_ini_state *config, char *args) +try_start(const struct location_provider *provider, LOCATION_STATE **state_out, struct config_ini_state *config, char *args) { const char *manual_keys[] = {"lat", "lon"}; struct config_ini_section *section; @@ -42,18 +41,18 @@ try_start(const struct location_provider *provider, LOCATION_STATE **state, stru const char *key; int i; - if (provider->init(state) < 0) { + if (provider->create(state_out) < 0) { weprintf(_("Initialization of %s failed."), provider->name); - return -1; + goto fail; } - /* Set provider options from config file. */ + /* Set provider options from config file */ if ((section = config_ini_get_section(config, provider->name))) for (setting = section->settings; setting; setting = setting->next) - if (provider->set_option(*state, setting->name, setting->value) < 0) + if (provider->set_option(*state_out, setting->name, setting->value) < 0) goto set_option_fail; - /* Set provider options from command line. */ + /* Set provider options from command line */ for (i = 0; args; i++) { next_arg = strchr(args, ':'); if (next_arg) @@ -63,40 +62,43 @@ try_start(const struct location_provider *provider, LOCATION_STATE **state, stru value = strchr(args, '='); if (!value) { /* The options for the "manual" method can be set - without keys on the command line for convencience - and for backwards compatability. We add the proper - keys here before calling set_option(). */ + * without keys on the command line for convencience + * and for backwards compatability. We add the proper + * keys here before calling set_option(). */ if (!strcmp(provider->name, "manual") && i < ELEMSOF(manual_keys)) { key = manual_keys[i]; value = args; } else { weprintf(_("Failed to parse option `%s'."), args); - return -1; + goto fail; } } else { *value++ = '\0'; } - if (provider->set_option(*state, key, value) < 0) + if (provider->set_option(*state_out, key, value) < 0) goto set_option_fail; args = next_arg; } - /* Start provider. */ - if (provider->start(*state) < 0) { - provider->free(*state); + /* Start provider */ + if (provider->start(*state_out) < 0) { weprintf(_("Failed to start provider %s."), provider->name); - return -1; + goto fail; } return 0; set_option_fail: - provider->free(*state); weprintf(_("Failed to set %s option."), provider->name); /* TRANSLATORS: `help' must not be translated. */ weprintf(_("Try `-l %s:help' for more information."), provider->name); +fail: + if (*state_out) { + provider->free(*state_out); + *state_out = NULL; + } return -1; } @@ -130,7 +132,7 @@ get_location(const struct location_provider *provider, LOCATION_STATE *state, in do { pollfds[0].fd = provider->get_fd(state); if (pollfds[0].fd >= 0) { - /* Poll on file descriptor until ready. */ + /* Poll on file descriptor until ready */ pollfds[0].events = POLLIN; timeout = (int)MAX(end - now, 0); r = poll(pollfds, 1, timeout); @@ -148,7 +150,7 @@ get_location(const struct location_provider *provider, LOCATION_STATE *state, in } } - if (provider->handle(state, loc, &available) < 0) + if (provider->fetch(state, loc, &available) < 0) return -1; } while (!available); @@ -162,11 +164,11 @@ acquire_location_provider(struct settings *settings, LOCATION_STATE **location_s size_t i; if (settings->provider) { - /* Use provider specified on command line. */ + /* Use provider specified on command line */ if (try_start(settings->provider, location_state_out, &settings->config, settings->provider_args) < 0) exit(1); } else { - /* Try all providers, use the first that works. */ + /* Try all providers, use the first that works */ for (i = 0; location_providers[i]; i++) { weprintf(_("Trying location provider `%s'..."), location_providers[i]->name); if (try_start(location_providers[i], location_state_out, &settings->config, NULL) < 0) { @@ -174,14 +176,52 @@ acquire_location_provider(struct settings *settings, LOCATION_STATE **location_s continue; } - /* Found provider that works. */ + /* Found provider that works */ printf(_("Using provider `%s'.\n"), location_providers[i]->name); settings->provider = location_providers[i]; break; } - /* Failure if no providers were successful at this point. */ + /* Failure if no providers were successful at this point */ if (!settings->provider) eprintf(_("No more location providers to try.")); } } + + +int +location_is_valid(const struct location *location) +{ + if (!WITHIN(MIN_LATITUDE, location->latitude, MAX_LATITUDE)) { + /* TRANSLATORS: Append degree symbols if possible. */ + weprintf(_("Latitude must be between %.1f and %.1f."), MIN_LATITUDE, MAX_LATITUDE); + return 0; + } + if (!WITHIN(MIN_LONGITUDE, location->longitude, MAX_LONGITUDE)) { + /* TRANSLATORS: Append degree symbols if possible. */ + weprintf(_("Longitude must be between %.1f and %.1f."), MIN_LONGITUDE, MAX_LONGITUDE); + return 0; + } + return 1; +} + + +void +print_location(const struct location *location) +{ + /* TRANSLATORS: Abbreviation for `north' */ + const char *north = _("N"); + /* TRANSLATORS: Abbreviation for `south' */ + const char *south = _("S"); + /* TRANSLATORS: Abbreviation for `east' */ + const char *east = _("E"); + /* TRANSLATORS: Abbreviation for `west' */ + const char *west = _("W"); + + /* TRANSLATORS: Append degree symbols after %f if possible. + * The string following each number is an abreviation for + * north, source, east or west (N, S, E, W). */ + printf(_("Location: %.2f %s, %.2f %s\n"), + fabs(location->latitude), signbit(location->latitude) ? south : north, + fabs(location->longitude), signbit(location->longitude) ? west : east); +} |