stv0g/sun
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed command line parsing of mode switch

Browse source
This commit is contained in:
Steffen Vogel 2013-01-25 12:06:58 +01:00
parent b9d1c806e0
commit 4bac41cf0b
2 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/sun.h
View file

@ -36,7 +36,7 @@ struct sun_coords { double dk, ra; };
#define M_2PI (M_PI * 2)
enum mode { RISE, SET, NOON, DAYTIME, NIGHTTIME };
enum mode { INVALID, RISE, SET, NOON, DAYTIME, NIGHTTIME };
/* helper function */
void usage();

40
src/sun_main.c
View file

@ -71,19 +71,19 @@ void version () {
}
void usage() {
printf("usage: sun mode [options]\n\n");
printf("Usage:\n sun mode [options]\n\n");
printf(" mode is one of: rise, set, noon, daytime, nighttime\n\n");
printf(" following OPTIONS are available\n");
printf("Options:\n");
struct option *op = long_options;
char **desc = long_options_descs;
while (op->name && desc) {
printf("\t-%c, --%s\t%s\n", op->val, op->name, *desc);
printf(" -%c, --%s%s%s\n", op->val, op->name, (strlen(op->name) <= 7) ? "\t\t" : "\t", *desc);
op++;
desc++;
}
printf("\nA combination of --lat, --lon or --query is required!\n");
printf("\nA combination of --lat, --lon or --query is required.\n");
printf("Please report bugs to: %s\n", PACKAGE_BUGREPORT);
}
@ -122,7 +122,7 @@ int main(int argc, char *argv[]) {
bool error = false;
int timezone = 0;
enum mode mode;
enum mode mode = INVALID;
struct tm date;
struct coords pos = { INFINITY, INFINITY };
@ -137,10 +137,22 @@ int main(int argc, char *argv[]) {
timezone = -tz.tz_minuteswest / 60.0;
}
/* parse mode */
if (argc > 1 && argv[1][0] != '-') {
if (strcmp(argv[1], "rise") == 0) mode = RISE;
else if (strcmp(argv[1], "set") == 0) mode = SET;
else if (strcmp(argv[1], "noon") == 0) mode = NOON;
else if (strcmp(argv[1], "daytime") == 0) mode = DAYTIME;
else if (strcmp(argv[1], "nighttime") == 0) mode = NIGHTTIME;
argc--;
argv++;
}
/* parse command line arguments */
while (1) {
int optidx;
int c = getopt_long(argc-1, argv+1, "+hvt:d:f:a:o:q:z:", long_options, &optidx);
int c = getopt_long(argc, argv, "+hvt:d:f:a:o:q:z:", long_options, &optidx);
/* detect the end of the options. */
if (c == -1) break;
@ -200,22 +212,14 @@ int main(int argc, char *argv[]) {
case '?':
default:
fprintf(stderr, "unrecognized option %s\n", optarg);
error = true;
}
}
/* parse command */
if (argc < 2) {
fprintf(stderr, "mode is missing\n");
error = true;
}
else if (strcmp(argv[1], "rise") == 0) mode = RISE;
else if (strcmp(argv[1], "set") == 0) mode = SET;
else if (strcmp(argv[1], "noon") == 0) mode = NOON;
else if (strcmp(argv[1], "daytime") == 0) mode = DAYTIME;
else if (strcmp(argv[1], "nighttime") == 0) mode = NIGHTTIME;
else {
fprintf(stderr, "invalid mode: %s\n", argv[1]);
/* validate mode */
if (mode == INVALID) {
fprintf(stderr, "invalid mode\n");
error = true;
}