Update README.md

Previous implementation allowed static files to overwrite existing files
on generate if static-dir was specified and generate-enable-overwrite
was specified. Now, an additional flag
"--generate-static-enable-overwrite" determines if static-dir files
overwrite on generate.

Changelog.md

@@ -2,6 +2,10 @@
 
 ## Upcoming Changes
 
+Add flag `--generate-static-enable-overwrite`. This flag enables overwriting of
+files from static-dir to generate-dir (if static-dir was specified). Previous
+implementation relied on `--generate-enable-ovewrite` for this behavior.
+
 ## Version 1.4
 
 Implemented "IF", "ELSEIF", "ELSE", "ENDIF", and "INDEX" for templates.
@@ -79,3 +83,7 @@ Features:
   - Reload configuration on SIGUSR1 or by listening (enabled by cmd parameter).
   - Cache served html (enabled by cmd parameter).
   - Serve static files from "static-dir" (enabled by cmd parameter).
+
+<!--
+    vim: textwidth=80 et sw=2 ts=2 sts=2
+-->

README.md

@@ -17,6 +17,7 @@ A simple HTTP/1.1 server written in C.
       --enable-static-dir=<DIR>
       --generate-dir=<DIR>
       --generate-enable-overwrite
+      --generate-static-enable-overwrite
 
 ## Changelog
 

src/arg_parse.c

@@ -46,6 +46,7 @@ void print_usage(void) {
   puts("  --enable-static-dir=<DIR>");
   puts("  --generate-dir=<DIR>");
   puts("  --generate-enable-overwrite");
+  puts("  --generate-static-enable-overwrite");
 }
 
 Args parse_args(int32_t argc, char **argv) {
@@ -189,6 +190,8 @@ Args parse_args(int32_t argc, char **argv) {
       }
     } else if (strcmp(argv[0], "--generate-enable-overwrite") == 0) {
       args.flags |= 4;
+    } else if (strcmp(argv[0], "--generate-static-enable-overwrite") == 0) {
+      args.flags |= 8;
     } else {
       fprintf(stderr, "ERROR: Invalid args!\n");
       print_usage();

src/arg_parse.h

@@ -29,6 +29,7 @@ typedef struct Args {
   // xxxx xx0x - disable listen on config file for reloading.
   // xxxx xx1x - enable listen on config file for reloading.
   // xxxx x1xx - enable overwrite on generate.
+  // xxxx 1xxx - enable overwrite on generate for static dir.
   uint16_t flags;
   uint16_t port;
   // Does not need to be free'd, this should point to a string in argv.

src/main.c

@@ -363,7 +363,7 @@ int main(int argc, char **argv) {
       puts("Static dir option specified, copying over static dir entries...");
       if (c_simple_http_static_copy_over_dir(args.static_dir,
                                              args.generate_dir,
-                                             (args.flags & 4) != 0 ? 1 : 0)
+                                             (args.flags & 8) != 0 ? 1 : 0)
           != 0) {
         fprintf(stderr, "ERROR during static-dir-entires copying!\n");
         return 1;

src/static.c

@@ -421,8 +421,8 @@ int c_simple_http_static_copy_over_dir(const char *from,
         if (fd) {
           fprintf(
             stderr,
-            "WARNING \"%s\" already exists and --generate-enable-overwrite not "
+            "WARNING \"%s\" already exists and "
-              "specified, skipping!\n",
+              "--generate-static-enable-overwrite not specified, skipping!\n",
             combined_to);
           continue;
         }