summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2009-03-22 15:01:23 (GMT)
committer Jaromil <jaromil@dyne.org>2009-03-22 16:02:43 (GMT)
commitcf03b5a0ec30fa1c3e809440bf6a508bfd3f11e0 (patch)
tree65a4b0f9d0e0a8688819b0bba4973de129b396b4
parentbfdd2738db2b6e1be7cbce11ec8f3b797ce28a1a (diff)
little merging fix
-rw-r--r--cmdline.cpp7
-rw-r--r--tbt.h3
2 files changed, 7 insertions, 3 deletions
diff --git a/cmdline.cpp b/cmdline.cpp
index 2835aad..7ebdf54 100644
--- a/cmdline.cpp
+++ b/cmdline.cpp
@@ -74,8 +74,8 @@ static const char *help =
" -v print version\n"
" -h print this help\n"
"Options:\n"
-" -c console interface mode\n"
-" -s save format in [ bin | ascii | html ]\n"
+" -C stdin/out commandline mode\n"
+" -s save format in [ bin | ascii | html | doku ]\n"
#ifdef linux
" -t timing mode [ posix | rtc ]\n"
#endif
@@ -555,7 +555,8 @@ int main(int argc, char** argv)
(operation==CONV)?"converted":"***",
(render==BIN)?"binary":
(render==ASCII)?"ascii":
- (render==HTML)?"html":"unknown");
+ (render==HTML)?"html":
+ (render==DOKU)?"dokuwiki":"unknown");
act("exiting TBT");
act("%u entries streamed.", tbt.buffer->len());
diff --git a/tbt.h b/tbt.h
index e1307e4..edf9140 100644
--- a/tbt.h
+++ b/tbt.h
@@ -103,6 +103,9 @@ class TBT {
//TODO: int load_html(char *filename);
int save_html(char *filename); ///< save a .html page suitable for web browsers
+ int save_doku(char *filename); ///< save a dokuwiki page
+
+
void clear(); ///< deletes all current keys and frees memory
/// @}