summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xa.outbin22400 -> 0 bytes
-rw-r--r--src/bvr.h2
-rw-r--r--src/bvrcommands.c3
-rw-r--r--src/jsbundle.c2
-rw-r--r--test/compose-all-in-dir.c56
-rw-r--r--test/source/1.bvr1
-rw-r--r--test/source/1.html2
-rw-r--r--test/source/12.bvr1
-rw-r--r--test/source/12.html2
-rw-r--r--test/source1.html0
-rw-r--r--tmp/1.html2
-rw-r--r--tmp/12.html2
12 files changed, 72 insertions, 1 deletions
diff --git a/a.out b/a.out
deleted file mode 100755
index 5f5d85b..0000000
--- a/a.out
+++ /dev/null
Binary files differ
diff --git a/src/bvr.h b/src/bvr.h
index dd26653..413fe99 100644
--- a/src/bvr.h
+++ b/src/bvr.h
@@ -1,5 +1,7 @@
#pragma once
#include <strlcpy.c>
+#include <stdlib.h>
+#include <stdio.h>
#define SUCCESS 0
#define FAILURE -1
#define COPY_BUFFER_SIZE 128
diff --git a/src/bvrcommands.c b/src/bvrcommands.c
index f08c0ab..5f58457 100644
--- a/src/bvrcommands.c
+++ b/src/bvrcommands.c
@@ -97,6 +97,9 @@ int bvr_handle_include(FILE * input, FILE * output) {
if(stream == NULL) {
strcat(notgoodatnamingvariables, BVR_COMMAND_FILE_EXT);
stream = fopen(notgoodatnamingvariables+1, "r"); // ob1 fuckery
+ if(stream != NULL) {
+ break;
+ }
}
*singlepath = '\0';
}
diff --git a/src/jsbundle.c b/src/jsbundle.c
index a2f9b61..f7bf8d2 100644
--- a/src/jsbundle.c
+++ b/src/jsbundle.c
@@ -38,7 +38,7 @@ int bundle_js(char* bundle_filename, char* js_source_folder_name, char* file_ext
strcat(source_filename, ent->d_name);
source_file = fopen(source_filename, "r");
// printf("[jsbundle.c] source_filename: %s\n", source_filename);
- fprintf(bundle_file, "\n// %s\n", source_filename);
+ fprintf(bundle_file, "\n/* %s */\n", source_filename);
copy_buffer = fgetc(source_file);
while (copy_buffer != EOF) {
fputc(copy_buffer, bundle_file);
diff --git a/test/compose-all-in-dir.c b/test/compose-all-in-dir.c
new file mode 100644
index 0000000..489891b
--- /dev/null
+++ b/test/compose-all-in-dir.c
@@ -0,0 +1,56 @@
+#include <bvr.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <tape.c>
+#include <dirent.h>
+#include <string.h>
+#include <limits.h>
+extern int main(int argc, char* argv[]) {
+ if(argc != 3) {
+ printf("usage: %s source-dir/ destination-dir/ (trailing slash mandatory)\n", argv[0]);
+ return 1;
+ }
+ char* source_folder_name = argv[1];
+ char* destination_folder_name = argv[2];
+ char* file_extension = ".bvr";
+ char* destination_extension = ".html";
+ char* file_extension2 = ".bverbose"; // unofficial
+ char source_filename[NAME_MAX];
+ char destination_filename[NAME_MAX];
+ int response_from_composer;
+ char copy_buffer;
+ DIR *dir;
+ struct dirent *ent;
+ if ((dir = opendir (source_folder_name)) != NULL) {
+ while ((ent = readdir (dir)) != NULL) {
+ if(strcmp(ent->d_name, ".") != 0 && strcmp(ent->d_name, "..") != 0) {
+ char *dot = strrchr(ent->d_name, '.');
+ if(dot && ( !strcmp(dot, file_extension) || !strcmp(dot, file_extension2) ) ) {
+ strcpy(source_filename, source_folder_name);
+ strcat(source_filename, ent->d_name);
+ strcpy(destination_filename, destination_folder_name);
+ strcat(destination_filename, ent->d_name);
+ char* temp_pointer = strrchr(destination_filename, '.');
+ if (!temp_pointer) {
+ } else {
+ *temp_pointer = '\0';
+ }
+ strcat(destination_filename, destination_extension);
+ fprintf(stderr, "[compose-all-in-dir.c] %s -> %s ", source_filename, destination_filename);
+ fflush(stderr);
+ if(bvr_compose_page(source_filename, 0, destination_filename) == SUCCESS) {
+ fprintf(stderr, "SUCCESS!\n");
+ } else {
+ fprintf(stderr, "FAILURE!!!\n");
+ }
+ }
+ }
+ }
+ closedir (dir);
+ } else {
+ /* could not open directory */
+ return 1;
+ }
+ return 0;
+}
+
diff --git a/test/source/1.bvr b/test/source/1.bvr
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/test/source/1.bvr
@@ -0,0 +1 @@
+1
diff --git a/test/source/1.html b/test/source/1.html
new file mode 100644
index 0000000..a464d9d
--- /dev/null
+++ b/test/source/1.html
@@ -0,0 +1,2 @@
+
+1
diff --git a/test/source/12.bvr b/test/source/12.bvr
new file mode 100644
index 0000000..48082f7
--- /dev/null
+++ b/test/source/12.bvr
@@ -0,0 +1 @@
+12
diff --git a/test/source/12.html b/test/source/12.html
new file mode 100644
index 0000000..b70b26b
--- /dev/null
+++ b/test/source/12.html
@@ -0,0 +1,2 @@
+
+12
diff --git a/test/source1.html b/test/source1.html
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/source1.html
diff --git a/tmp/1.html b/tmp/1.html
new file mode 100644
index 0000000..a464d9d
--- /dev/null
+++ b/tmp/1.html
@@ -0,0 +1,2 @@
+
+1
diff --git a/tmp/12.html b/tmp/12.html
new file mode 100644
index 0000000..b70b26b
--- /dev/null
+++ b/tmp/12.html
@@ -0,0 +1,2 @@
+
+12