diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/blogc/main.c | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/src/blogc/main.c b/src/blogc/main.c index 6a1839f..b1ea6a9 100644 --- a/src/blogc/main.c +++ b/src/blogc/main.c @@ -29,12 +29,14 @@ #include <string.h> #include "debug.h" +#include "filelist-parser.h" #include "template-parser.h" #include "loader.h" #include "renderer.h" #include "../common/error.h" #include "../common/utf8.h" #include "../common/utils.h" +#include "../common/stdin.h" #ifdef MAKE_EMBEDDED extern int bm_main(int argc, char **argv); @@ -126,28 +128,6 @@ blogc_mkdir_recursive(const char *filename) } -static bc_slist_t* -blogc_read_stdin_to_list(bc_slist_t *l) -{ - char buffer[4096]; - while (NULL != fgets(buffer, 4096, stdin)) { - size_t len = strlen(buffer); - if (len == 0) - continue; - if (buffer[0] == '#') - continue; - if (len >= 2 && ((buffer[len - 2] == '\r') || (buffer[len - 2] == '\n'))) - buffer[len - 2] = '\0'; - if ((buffer[len - 1] == '\r') || (buffer[len - 1] == '\n')) - buffer[len - 1] = '\0'; - if (strlen(buffer) == 0) - continue; - l = bc_slist_append(l, bc_strdup(buffer)); - } - return l; -} - - int main(int argc, char **argv) { @@ -289,8 +269,12 @@ main(int argc, char **argv) } - if (input_stdin) - sources = blogc_read_stdin_to_list(sources); + if (input_stdin) { + char *in = bc_stdin_read(); + bc_slist_t *in_list = blogc_filelist_parse(in, strlen(in)); + free(in); + sources = bc_slist_append_list(sources, in_list); + } if (!listing && bc_slist_length(sources) == 0) { blogc_print_usage(); |