sttemp

commit f02c3d700e16738190c84a643ab6a070aafe4b01
parent dbc33052368e1e6c88b9be782cde3608ad2ea06f
Author: Anton Konyahin <me@konyahin.xyz>
Date:   Thu,  6 Jan 2022 11:29:55 +0300

template generation

Diffstat:
M
Makefile
 | 
7
+++++--
M
src/files.c
 | 
4
+++-
M
src/files.h
 | 
2
+-
M
src/main.c
 | 
44
++++++++++++++++++++++++--------------------
A
src/strings.c
 | 
11
+++++++++++
A
src/strings.h
 | 
7
+++++++

6 files changed, 51 insertions(+), 24 deletions(-)
diff --git a/Makefile b/Makefile
@@ -7,14 +7,17 @@ CFLAGS = -Wall -Werror -O
 
 all: $(BIN)
 
+strings.o: src/strings.c src/strings.h
+	$(CC) $(CFLAGS) -c src/strings.c
+
 files.o : src/files.c src/files.h
 	$(CC) $(CFLAGS) -c src/files.c
 
 main.o : src/main.c src/config.h
 	$(CC) $(CFLAGS) -c src/main.c
 
-$(BIN): main.o files.o
-	$(CC) $(CFLAGS) main.o files.o -o $(BIN)
+$(BIN): main.o files.o strings.o
+	$(CC) main.o files.o strings.o -o $(BIN)
 
 clean:
 	rm $(BIN)
diff --git a/src/files.c b/src/files.c
@@ -3,7 +3,7 @@
 #include "files.h"
 
 
-char* freadall(FILE* input) {
+char* freadall(FILE* input, size_t* length) {
     char *buf = malloc(BUF_SIZE);
     size_t used = 0;
     size_t len  = 0;
@@ -17,6 +17,8 @@ char* freadall(FILE* input) {
     buf = realloc(buf, used + 1);
     buf[used] = '\0';
 
+    *length = used;
+
     return buf;
 }
 
diff --git a/src/files.h b/src/files.h
@@ -15,4 +15,4 @@ char* freadline(FILE *input);
 /**
  * Read all content of file `input` and return it.
  */
-char* freadall(FILE* input);
+char* freadall(FILE* input, size_t* length);
diff --git a/src/main.c b/src/main.c
@@ -2,6 +2,8 @@
 
 #include "config.h"
 #include "files.h"
+#include "strings.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -9,16 +11,14 @@
 
 void show_usage() {
     printf("sttemp - simple template manager\n");
-    printf("Usage:\n\tsttemp template_name\n");
+    printf("Usage:\n\tsttemp template_name file_name\n");
 }
 
-char* strconcat(const char* first, const char* second) {
-    size_t first_len = strlen(first);
-    size_t second_len = strlen(second);
-    char *buf = malloc(first_len + second_len + 1);
-    memcpy(buf, first, first_len);
-    memcpy(buf + first_len, second, second_len + 1);
-    return buf;
+FILE* open_template(const char* template_name) {
+    char *template_path = strconcat(template_dir, template_name);
+    FILE *template = fopen(template_path, "rb");
+    free(template_path);
+    return template;
 }
 
 char* get_placeholder_value(const char* placeholder_name) {
@@ -33,37 +33,38 @@ struct token {
 typedef struct token Token;
 
 int main(int argc, char *argv[]) {
-    if (argc < 2) {
+    if (argc < 3) {
         show_usage();
         return 1;
     }
 
     char* template_name = argv[1];
-    if (strcmp("-h", template_name) == 0) {
-        show_usage();
-        return 0;
-    }
-
-    char *temp_path = strconcat(template_dir, template_name);
-    FILE *template = fopen(temp_path, "rb");
+    FILE* template = open_template(template_name);
     if (template == NULL) {
-        fprintf(stderr, "Template doesn't exist: %s\n", temp_path);
+        fprintf(stderr, "Template doesn't exist: %s\n", template_name);
         return 1;
     }
-    free(temp_path);
 
-    char *buf = freadall(template);
+    size_t buf_len = 0;
+    char *buf = freadall(template, &buf_len);
     fclose(template);
 
     const int pat_start_len = strlen(pattern_start);
     const int pat_end_len = strlen(pattern_end);
 
+    FILE* output = fopen(argv[2], "w");
+
     char *start = buf;
+    char *last = start;
     while ((start = strstr(start, pattern_start)) != NULL) {
+        fwrite(last, sizeof(char), start - last, output);
         start = start + pat_start_len;
+
         char* end = strstr(start, pattern_end);
         if (end == NULL) {
             fprintf(stderr, "Unfinished pattern: %10s", start);
+            fclose(output);
+            free(buf);
             return 1;
         }
 
@@ -73,13 +74,16 @@ int main(int argc, char *argv[]) {
         token_name[token_length] = '\0';
 
         char *value = get_placeholder_value(token_name);
-        printf("%s:%s\n", token_name, value);
+        fwrite(value, sizeof(char), strlen(value), output);
 
         free(token_name);
 
         start = end + pat_end_len;
+        last = start;
     }
 
+    fwrite(last, sizeof(char), buf_len - (last - buf), output);
+    fclose(output);
     free(buf);
 
     return 0;
diff --git a/src/strings.c b/src/strings.c
@@ -0,0 +1,11 @@
+#include "strings.h"
+
+
+char* strconcat(const char* first, const char* second) {
+    size_t first_len = strlen(first);
+    size_t second_len = strlen(second);
+    char *buf = malloc(first_len + second_len + 1);
+    memcpy(buf, first, first_len);
+    memcpy(buf + first_len, second, second_len + 1);
+    return buf;
+}
diff --git a/src/strings.h b/src/strings.h
@@ -0,0 +1,7 @@
+#include <stdlib.h>
+#include <string.h>
+
+/**
+ * Concat two string buffers in new one.
+ */
+char* strconcat(const char* first, const char* second);