sorted some includes + added version number

diff --git a/include/mdp.h b/include/mdp.h
new file mode 100644 (file)
index 0000000..a1d2e0e
--- /dev/null
+++ b/include/mdp.h
@@ -0,0 +1,10 @@
+#if !defined( MDP_H )
+#define MDP_H
+
+#include "parser.h"
+#include "viewer.h"
+
+#define MAJOR_VERSION 0
+#define MINOR_VERSION 1
+
+#endif // !defined( MDP_H )

diff --git a/include/viewer.h b/include/viewer.h
index c4f4175..c5f4530 100644 (file)
--- a/include/viewer.h
+++ b/include/viewer.h
@@ -3,6 +3,7 @@
 
 #include <ncurses.h>
 
 
 #include <ncurses.h>
 

+#include "parser.h"

 #include "cstack.h"
 
 #define CP_WHITE  1 // 255
 #include "cstack.h"
 
 #define CP_WHITE  1 // 255

diff --git a/markdown.c b/markdown.c
index 9c358d4..762df34 100644 (file)
--- a/markdown.c
+++ b/markdown.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 

-#include "include/cstring.h"

 #include "include/markdown.h"
 
 line_t *new_line() {
 #include "include/markdown.h"
 
 line_t *new_line() {

diff --git a/mdp.c b/mdp.c
index 0671ab6..b12ea97 100644 (file)
--- a/mdp.c
+++ b/mdp.c
@@ -4,34 +4,41 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

-#include "include/parser.h"
-#include "include/viewer.h"
+#include "include/mdp.h"

 
 void usage() {
 
 void usage() {

-    fprintf(stderr, "Usage: mdp [OPTION]... [FILE]\n");
-    fprintf(stderr, "A command-line based markdown presentation tool.\n\n");
-    fprintf(stderr, "  -d, --debug   enable debug messages on STDERR\n");
-    fprintf(stderr, "                add it multiple times to increases debug level\n\n");
-    fprintf(stderr, "  -h, --help    display this help and exit\n");
-    fprintf(stderr, "\nWith no FILE, or when FILE is -, read standard input.\n\n");
+    fprintf(stderr, "%s", "Usage: mdp [OPTION]... [FILE]\n");
+    fprintf(stderr, "%s", "A command-line based markdown presentation tool.\n\n");
+    fprintf(stderr, "%s", "  -d, --debug   enable debug messages on STDERR\n");
+    fprintf(stderr, "%s", "                add it multiple times to increases debug level\n\n");
+    fprintf(stderr, "%s", "  -h, --help    display this help and exit\n");
+    fprintf(stderr, "%s", "\nWith no FILE, or when FILE is -, read standard input.\n\n");

     exit(EXIT_FAILURE);
 }
 
     exit(EXIT_FAILURE);
 }
 

+void version() {
+    printf("mdp %d.%d\n", MAJOR_VERSION, MINOR_VERSION);
+    //TODO add copyright, license, written by
+    exit(EXIT_SUCCESS);
+}
+

 int main(int argc, char *argv[]) {
 
     // define command-line options
     struct option longopts[] = {
 int main(int argc, char *argv[]) {
 
     // define command-line options
     struct option longopts[] = {

-        { "debug", no_argument, 0, 'd' },
-        { "help",  no_argument, 0, 'h' },
+        { "debug",   no_argument, 0, 'd' },
+        { "help",    no_argument, 0, 'h' },
+        { "version", no_argument, 0, 'v' },

         { 0, 0, 0, 0 }
     };
 
     // parse command-line options
     int opt, debug = 0;
         { 0, 0, 0, 0 }
     };
 
     // parse command-line options
     int opt, debug = 0;

-    while ((opt = getopt_long(argc, argv, ":dh", longopts, NULL)) != -1) {
+    while ((opt = getopt_long(argc, argv, ":dhv", longopts, NULL)) != -1) {

         switch(opt) {
             case 'd': debug += 1; break;
             case 'h': usage(); break;
         switch(opt) {
             case 'd': debug += 1; break;
             case 'h': usage(); break;

+            case 'v': version(); break;

             case ':': fprintf(stderr, "%s: '%c' requires an argument\n", argv[0], optopt); usage(); break;
             case '?':
             default : fprintf(stderr, "%s: option '%c' is invalid\n", argv[0], optopt); usage(); break;
             case ':': fprintf(stderr, "%s: '%c' requires an argument\n", argv[0], optopt); usage(); break;
             case '?':
             default : fprintf(stderr, "%s: option '%c' is invalid\n", argv[0], optopt); usage(); break;

diff --git a/viewer.c b/viewer.c
index 2d64b4e..d31fa71 100644 (file)
--- a/viewer.c
+++ b/viewer.c
@@ -3,7 +3,6 @@
 #include <string.h> // strchr
 #include <unistd.h>
 
 #include <string.h> // strchr
 #include <unistd.h>
 

-#include "include/parser.h"

 #include "include/viewer.h"
 
 static short white_ramp[24] = { 16, 232, 233, 234, 235, 236,
 #include "include/viewer.h"
 
 static short white_ramp[24] = { 16, 232, 233, 234, 235, 236,