fix
This commit is contained in:
parent
444453a821
commit
1994667ef5
2 changed files with 7 additions and 5 deletions
2
Makefile
2
Makefile
|
|
@ -1,5 +1,5 @@
|
||||||
CC = gcc
|
CC = gcc
|
||||||
CFLAGS = -I include -fPIC -g
|
CFLAGS = -I include -fPIC
|
||||||
LDFLAGS = -shared
|
LDFLAGS = -shared
|
||||||
LIBS =
|
LIBS =
|
||||||
|
|
||||||
|
|
|
||||||
10
example.c
10
example.c
|
|
@ -22,7 +22,7 @@ void recursive(xemil_t* handle, xl_node_t* node, int indent) {
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("%s%s>\n", node->type == XL_NODE_PROCESS ? "?" : "", (node->first_child == NULL && node->text == NULL) ? " /" : "");
|
printf("%s%s>\n", node->type == XL_NODE_PROCESS ? "?" : "", (node->first_child == NULL && node->text == NULL) ? " /" : "");
|
||||||
if(node->text != NULL && !handle->new_text) {
|
if(node->text != NULL && !handle->param.new_text) {
|
||||||
for(i = 0; i < indent + INDENT; i++) printf(" ");
|
for(i = 0; i < indent + INDENT; i++) printf(" ");
|
||||||
printf("%s\n", node->text);
|
printf("%s\n", node->text);
|
||||||
}
|
}
|
||||||
|
|
@ -38,7 +38,7 @@ void recursive(xemil_t* handle, xl_node_t* node, int indent) {
|
||||||
n = n->next;
|
n = n->next;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(node->name != NULL && node->type == XL_NODE_NODE && !(node->first_child == NULL && node->text == NULL && !handle->new_text)) {
|
if(node->name != NULL && node->type == XL_NODE_NODE && !(node->first_child == NULL && node->text == NULL && !handle->param.new_text)) {
|
||||||
for(i = 0; i < indent; i++) printf(" ");
|
for(i = 0; i < indent; i++) printf(" ");
|
||||||
printf("</%s>\n", node->name);
|
printf("</%s>\n", node->name);
|
||||||
}
|
}
|
||||||
|
|
@ -50,8 +50,8 @@ int main(int argc, char** argv) {
|
||||||
|
|
||||||
for(i = 1; i < argc; i++) {
|
for(i = 1; i < argc; i++) {
|
||||||
xemil_t* h = xl_open_file(argv[i]);
|
xemil_t* h = xl_open_file(argv[i]);
|
||||||
h->new_text = 1;
|
h->param.new_text = 1;
|
||||||
h->do_xinclude = 1;
|
h->param.do_xinclude = 1;
|
||||||
if(h != NULL) {
|
if(h != NULL) {
|
||||||
printf("%s:\n", argv[i]);
|
printf("%s:\n", argv[i]);
|
||||||
if(xl_parse(h)) {
|
if(xl_parse(h)) {
|
||||||
|
|
@ -79,6 +79,8 @@ int main(int argc, char** argv) {
|
||||||
} else {
|
} else {
|
||||||
printf("book.title not found in %s\n", argv[i]);
|
printf("book.title not found in %s\n", argv[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
recursive(h, h->root, 0);
|
||||||
} else {
|
} else {
|
||||||
int j;
|
int j;
|
||||||
for(j = 0; j < INDENT; j++) printf(" ");
|
for(j = 0; j < INDENT; j++) printf(" ");
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue