diff options
| author | Andreas Eversberg <jolly@eversberg.eu> | 2016-03-26 18:42:38 +0100 |
|---|---|---|
| committer | Andreas Eversberg <jolly@eversberg.eu> | 2016-03-27 17:56:04 +0200 |
| commit | 17a93b501b42f6d2638afe87765f08b31373daf0 (patch) | |
| tree | 42430064c69807fa7d6ae26e0caaaceb6e4ca938 /src | |
| parent | 4d84da31a8b15085729a8cf0f7f8197a072eda5a (diff) | |
NMT: Fix hint and list of traffic area configuration
Diffstat (limited to 'src')
| -rw-r--r-- | src/nmt/main.c | 12 | ||||
| -rw-r--r-- | src/nmt/nmt.c | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/nmt/main.c b/src/nmt/main.c index 0d6a7d4..adbc673 100644 --- a/src/nmt/main.c +++ b/src/nmt/main.c @@ -191,6 +191,7 @@ int main(int argc, char *argv[]) int rc; int skip_args; const char *station_id = ""; + int mandatory = 0; /* init common tones */ init_nmt_tones(); @@ -204,13 +205,16 @@ int main(int argc, char *argv[]) station_id = argv[1]; if (!kanal) { - printf("No channel (\"Kanal\") is specified, I suggest channel 1.\n\n"); - print_help(argv[0]); - return 0; + printf("No channel (\"Kanal\") is specified, I suggest channel 1 (-k 1).\n\n"); + mandatory = 1; } if (!traffic_area[0]) { - printf("No traffic area is specified, I suggest to use 'SE' for Sweden and set the phone's roaming to 'SE' also.\n\n"); + printf("No traffic area is specified, I suggest to use Sweden (-y SE,1) and set the phone's roaming to 'SE' also.\n\n"); + mandatory = 1; + } + + if (mandatory) { print_help(argv[0]); return 0; } diff --git a/src/nmt/nmt.c b/src/nmt/nmt.c index 22c9295..b7c8323 100644 --- a/src/nmt/nmt.c +++ b/src/nmt/nmt.c @@ -258,7 +258,7 @@ void nmt_country_list(void) printf("TA\tShort\tCountry (Provider)\n"); printf("------------------------------------------------------------------------\n"); for (i = 0; nmt_country[i].short_name; i++) { - if (nmt_country[i].short_name[0]) + if (nmt_country[i].long_name[0]) printf("%d\t%s\t%s (%s)\n", nmt_country[i].y, nmt_country[i].short_name, nmt_country[i].long_name, nmt_country[i].provider_name); else printf("%d\t%s\n", nmt_country[i].y, nmt_country[i].short_name); |