From 2b310a2161d5d239b31f980caad4922df726b749 Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Sat, 28 Apr 2012 14:03:55 -0400 Subject: [PATCH] more flags --- flags.h | 1 + main.c | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/flags.h b/flags.h index 86e05ae..f439a44 100644 --- a/flags.h +++ b/flags.h @@ -5,6 +5,7 @@ typedef struct Flags { int _0:1; // -1 (use http 1.0) int _9:1; // -9 (use http 0.9) + int _i:1; // -i (include http headers) int _O:1; // -O (file name from url) int _v:1; // -v (verbose) diff --git a/main.c b/main.c index 4aa6421..5da896d 100644 --- a/main.c +++ b/main.c @@ -91,6 +91,7 @@ void help(void) fputs("gopher [options] url\n", stdout); fputs("-h display help information.\n", stdout); fputs("-V display version information.\n", stdout); + fputs("-i display http headers.\n", stdout); fputs("-O write output to file.\n", stdout); fputs("-o write output to instead of stdout.\n", stdout); fputs("-0 use HTTP 1.0\n", stdout); @@ -152,23 +153,19 @@ int main(int argc, char **argv) if (mf == -1) { - fprintf(stderr, "Marinetti 3.0b3 or higher is required.\n"); + fprintf(stderr, "Marinetti 3.0b3 or greater is required.\n"); exit(1); } memset(&flags, 0, sizeof(flags)); - while ((ch = getopt(argc, argv, "o:OhVv09")) != -1) + while ((ch = getopt(argc, argv, "o:hiOVv09")) != -1) { switch (ch) { - case 'V': - fputs("gopher v 0.2\n", stdout); - exit(0); - break; - - case 'v': - flags._v = 1; + + case 'i': + flags._i = 1; break; case 'o': @@ -180,6 +177,10 @@ int main(int argc, char **argv) flags._O = 1; flags._o = NULL; break; + + case 'v': + flags._v = 1; + break; case '9': flags._9 = 1; @@ -190,6 +191,11 @@ int main(int argc, char **argv) flags._0 = 1; flags._9 = 0; break; + + case 'V': + fputs("gopher v 0.2\n", stdout); + exit(0); + break; case 'h': case '?':