.gitignore

@@ -4,8 +4,5 @@ cosmopolitan
 
 feuille
 feuille.com
-feuille.com.dbg
 
 cgi/feuille.cgi
-
-.ccls-cache

Makefile

@@ -10,21 +10,18 @@ TARGET$(COSMO) = feuille
 SRC = feuille.c util.c server.c bin.c
 OBJ = $(SRC:%.c=%.o)
 
-
 all: $(TARGET) feuille.1 cgi
 
 run: $(TARGET)
 	./$(TARGET)
 
-
 clean:
 	@printf "%-8s $(OBJ)\n" "rm"
 	@rm -f $(OBJ)
 
 distclean:
-	@printf "%-8s feuille feuille.com feuille.com.dbg $(OBJ)\n" "rm"
+	@printf "%-8s feuille feuille.com $(OBJ)\n" "rm"
-	@rm -f feuille feuille.com feuille.com.dbg $(OBJ)
+	@rm -f feuille feuille.com $(OBJ)
-
 
 install: $(TARGET) feuille.1
 	@echo "installing executable file to $(PREFIX)/bin"
@@ -37,44 +34,37 @@ install: $(TARGET) feuille.1
 	@cp -f feuille.1 $(MAN)/man1
 	@chmod 644 $(MAN)/man1/feuille.1
 
-uninstall:
+uninstall: $(PREFIX)/bin/$(TARGET) $(MAN)/man1/feuille.1
 	@echo "removing executable file from $(PREFIX)/bin"
 	@rm -f "$(PREFIX)/bin/$(TARGET)"
 
 	@echo "removing manpage from $(MAN)/man1"
 	@rm -f $(MAN)/man1/feuille.1
 
-
-# manpage
 feuille.1: feuille.1.md config.mk
-	@printf "%-8s $@.md -o $@\n" "pandoc"
+	@printf "%-8s feuille.1.md -o feuille.1\n" "pandoc"
-	@sed "s/{VERSION}/$(VERSION)/g" $@.md | pandoc -s -t man -o $@
+	@sed "s/{VERSION}/$(VERSION)/g" feuille.1.md | pandoc -s -t man -o feuille.1
 
-# standard libc
 feuille: $(OBJ)
-	@printf "%-8s $(OBJ) -o $@\n" "$(CC)"
+	@printf "%-8s $(OBJ) -o feuille\n" "$(CC)"
-	@$(CC) $(OBJ) -o $@ $(LDFLAGS)
+	@$(CC) $(OBJ) -o feuille $(LDFLAGS)
 
 # cosmopolitan libc
+feuille.com: cosmopolitan feuille
+	@printf "%-8s feuille -o feuille.com\n" "objcopy"
+	@objcopy -S -O binary feuille feuille.com
+
 cosmopolitan:
 	@if [ ! -d cosmopolitan ]; then                                                                 \
 	     printf "%-8s https://justine.lol/cosmopolitan/cosmopolitan-amalgamation-2.2.zip\n" "curl" ;\
 	     curl -sO "https://justine.lol/cosmopolitan/cosmopolitan-amalgamation-2.2.zip"             ;\
                                                                                                     \
 	     printf "%-8s cosmopolitan-amalgamation-2.2.zip\n" "unzip"                                 ;\
-	     unzip -q cosmopolitan-amalgamation-2.2.zip -d cosmopolitan                                ;\
+	     unzip -qf cosmopolitan-amalgamation-2.2.zip -d cosmopolitan                               ;\
                                                                                                     \
 	     rm -rf cosmopolitan-amalgamation-*                                                        ;\
 	fi
 
-feuille.com.dbg: $(OBJ)
-	@printf "%-8s $(OBJ) -o $@\n" "$(CC)"
-	@$(CC) $(OBJ) -o $@ $(LDFLAGS)
-
-feuille.com: cosmopolitan feuille.com.dbg
-	@printf "%-8s $@.dbg -o $@\n" "objcopy"
-	@objcopy -S -O binary $@.dbg $@
-
 # CGI script
 ADDR = 127.0.0.1
 PORT = 9999
@@ -83,9 +73,9 @@ cgi: cgi/feuille.cgi
 
 cgi/feuille.cgi: cgi/feuille.cgi.c
 	@printf "%-8s cgi/feuille.cgi.c -o cgi/feuille.cgi\n" "$(CC)"
-	@$(CC) $@.c -o $@ -std=c99 -O3 -static -Wall -Wextra \
+	@$(CC) cgi/feuille.cgi.c -o cgi/feuille.cgi -std=c99 -O3 -static -Wall -Wextra \
-                      -DADDR=\"$(ADDR)\" -DPORT=$(PORT)  \
+                                                -DADDR=\"$(ADDR)\" -DPORT=$(PORT)  \
-                      $(INCS) $(LIBS)
+                                                $(INCS) $(LIBS)
 
 .SUFFIXES: .c .o
 .c.o:

README.md

@@ -8,7 +8,6 @@ code quality, and security.
     <summary>Table of Contents</summary>
     <ol>
         <li><a href="#usage">Usage</a></li>
-        <li><a href="#description">Description</a></li>
         <li>
             <a href="#installation">Installation</a>
             <ul>
@@ -133,8 +132,7 @@ That sould be it. Have fun!
 ## Description
 
 * Focuses on speed,
-    * Handles multiple requests at once (using a pool of `fork`'ed
+    * Multi-threaded (using `fork`)
-      workers)
     * Only does what it needs to do
 
 * code quality,
@@ -161,7 +159,7 @@ That sould be it. Have fun!
 * Works on nearly all POSIX-compliant OSes
 * Can be run in the background and as a service
 * IPv6-enabled
-* Now with 100% more [Cosmopolitan libc](http://justine.lol/cosmopolitan/) support!
+* Now with 100% more (Cosmopolitan libc)[http://justine.lol/cosmopolitan/] support!
 
 ## Installation
 
@@ -198,11 +196,11 @@ $ sudo make install
 ```
 
 You can also build using the
-[Cosmopolitan libc](http://justine.lol/cosmopolitan/), which will
+(Cosmopolitan libc)[http://justine.lol/cosmopolitan/], which will
 make an executable capable of running on Linux, OpenBSD, FreeBSD,
 Mac... out of the box. To do so, build with the `COSMO` flag.
-It will produce `feuille.com.dbg` and `feuille.com`, the former being
+It will produce `feuille` and `feuille.com`, the former being the
-the debug binary, and the latter the portable one.
+debug binary, and the former the portable one.
 
 If you wish to make a debug build, you can set `DEBUG` to whatever
 comes to your mind.

arg.h

@@ -31,7 +31,8 @@
  * by 20h
  */
 
-#pragma once
+#ifndef _ARG_H_
+#define _ARG_H_
 
 #ifndef COSMOPOLITAN
 #include <stdlib.h>
@@ -78,3 +79,5 @@ extern char *argv0;
                 (brk_ = 1, (argv[0][i_+1] != '\0')?\
                     (&argv[0][i_+1]) :\
                     (argc--, argv++, argv[0])))
+
+#endif

bin.h

@@ -11,7 +11,8 @@
  * <https://basedwa.re/tmtt/feuille/src/branch/main/LICENSE>.
  */
 
-#pragma once
+#ifndef _BIN_H_
+#define _BIN_H_
 
 #include "feuille.h"
 
@@ -20,3 +21,5 @@ int      write_paste(char *, unsigned long, char *);
 
 char    *generate_id(int);
 char    *create_url(char *);
+
+#endif

config.mk

@@ -1,5 +1,5 @@
 # feuille version
-VERSION = 2.1.4
+VERSION = 2.1.0
 
 # paths (customize them to fit your system)
 PREFIX = /usr/local
@@ -41,4 +41,4 @@ CFLAGS$(DEBUG)  = -O3 -Wall -Wextra -Wno-sign-compare $(CCFLAGS)
 LDFLAGS$(DEBUG) = -s $(CLDFLAGS)
 
 # static build (uncomment)
-#LDFLAGS += -static
+#LD_FLAGS += -static

feuille.1

@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "feuille" "1" "November 2022" "feuille 2.1.4" ""
+.TH "feuille" "1" "November 2022" "feuille 2.1.0" ""
 .hy
 .SH NAME
 .PP
@@ -45,7 +45,7 @@ The difference is minimal, no need to worry about it.
 Default: \f[V]131072\f[R]B (128KiB)
 .TP
 \f[B]-f\f[R]
-Makes \f[B]feuille\f[R] run in the foreground.
+Makes \f[B]feuille\f[R] run in the forground.
 Default: disabled
 .TP
 \f[B]-h\f[R]

feuille.1.md

@@ -30,7 +30,7 @@ and IPv6 addresses (won't work on OpenBSD).
 : Default: `131072`B (128KiB)
 
 **-f**
-: Makes **feuille** run in the foreground.
+: Makes **feuille** run in the forground.
 : Default: disabled
 
 **-h**

feuille.c

@@ -41,20 +41,20 @@ char    *argv0;
 
 /* default settings */
 Settings settings = {
-    .address            = "0.0.0.0",
+    .address             = "0.0.0.0",
-    .url                = "http://localhost",
+    .url                 = "http://localhost",
-    .output             = "/var/www/feuille",
+    .output              = "/var/www/feuille",
-    .user               = "www",
+    .user                = "www",
 
-    .id_length          = 4,
+    .id_length           = 4,
-    .worker_count       = 4,
+    .worker_count        = 4,
-    .port               = 9999,
+    .port                = 9999,
-    .timeout            = 2,
+    .timeout             = 2,
-    .max_size           = 1048576, /* = 1MiB   = 1024 * 1024 */
+    .max_size            = 1048576, /* = 1MiB   = 1024 * 1024 */
-    .buffer_size        = 131072,  /* = 128KiB = 1024 * 128  */
+    .buffer_size         = 131072,  /* = 128KiB = 1024 * 128  */
 
-    .verbose            = 0,
+    .verbose             = 0,
-    .foreground         = 0
+    .foreground          = 0
 };
 
 /* functions declarations */
@@ -389,11 +389,11 @@ int main(int argc, char *argv[])
         if (setgid(gid) != 0 || getgid() != gid)
             die(1, "could not switch to group for user `%s'.\n", settings.user);
 
-#ifndef COSMOPOLITAN
+        #ifndef COSMOPOLITAN
         /* initgroups doesn't work on cosmopolitan libc yet */
         if (initgroups(settings.user, gid) != 0)
             die(1, "could not initialize other groups for user `%s'.\n", settings.user);
-#endif
+        #endif
 
         /* switching user */
         if (setuid(uid) != 0 || getuid() != uid)

feuille.h

@@ -11,7 +11,8 @@
  * <https://basedwa.re/tmtt/feuille/src/branch/main/LICENSE>.
  */
 
-#pragma once
+#ifndef _FEUILLE_H_
+#define _FEUILLE_H_
 
 typedef struct Settings {
     char            *address;
@@ -31,3 +32,5 @@ typedef struct Settings {
 } Settings;
 
 extern Settings settings;
+
+#endif

server.h

@@ -11,7 +11,8 @@
  * <https://basedwa.re/tmtt/feuille/src/branch/main/LICENSE>.
  */
 
-#pragma once
+#ifndef _SERVER_H_
+#define _SERVER_H_
 
 #include "feuille.h"
 
@@ -22,3 +23,5 @@ void     close_connection(int);
 
 unsigned long   read_paste(int, char **);
 int             send_response(int, char *);
+
+#endif

util.h

@@ -11,8 +11,11 @@
  * <https://basedwa.re/tmtt/feuille/src/branch/main/LICENSE>.
  */
 
-#pragma once
+#ifndef _UTIL_H_
+#define _UTIL_H_
 
 void     die(int, char *, ...);
 void     error(char *, ...);
 void     verbose(int, char *, ...);
+
+#endif