/meta/ – Diskussionen über Dietchan

#include <unistd.h>
#include <fcntl.h>
#include <sys/mman.h>
#include <string.h>

int main(void)
{
        int fd = open("test_file", O_RDWR | O_CREAT, (mode_t)0600);
        const char *text = "hello";
        size_t textsize = strlen(text) + 1;
        lseek(fd, textsize-1, SEEK_SET);
        /*write(fd, "", 1);*/
        char *map = mmap(0, textsize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
        memcpy(map, text, strlen(text));
        msync(map, textsize, MS_SYNC);
        munmap(map, textsize);
        close(fd);
        return 0;
}

CC=gcc
CFLAGS=-I/usr/local/include -pedantic -std=c99 -O0 -ggdb
OBJS=arc4random.o bans.o bbcode.o captcha.o context.o db.o db_hashmap.o \
    dietchan.o export.o http.o import.o ip.o job.o mime_types.o \
    params.o permissions.o persistence.o print.o session.o \
    tpl.o upload_job.o util.o
POBJS=pages/banned.o pages/board.o pages/dashboard.o pages/edit_board.o pages/edit_user.o pages/login.o pages/mod.o pages/post.o pages/static.o pages/thread.o 
dietchan: $(OBJS) $(POBJS)
        $(CC) -o dietchan -L/usr/local/lib -lowfat $(OBJS) $(POBJS:S/pages\///g)

clean:
        rm -f $(OBJS) $(POBJS:S/pages\///g) dietchan

FETCH=curl -O
VERIFY=gpg --verify
LFVER=0.32
LFURI=http://www.fefe.de/libowfat/
DLVER=0.34
DLURI=http://www.fefe.de/dietlibc/

libs: libowfat-$(LFVER) dietlibc-$(DLVER)

libowfat-$(LFVER): libowfat-$(LFVER).tar.xz libowfat-$(LFVER).tar.xz.sig
	$(VERIFY) libowfat-$(LFVER).tar.xz.sig
	xzcat libowfat-$(LFVER).tar.xz | tar xf -

dietlibc-$(DLVER): dietlibc-$(DLVER).tar.xz dietlibc-$(DLVER).tar.xz.sig
	$(VERIFY) dietlibc-$(DLVER).tar.xz.sig
	xzcat dietlibc-$(DLVER).tar.xz | tar xf -

libowfat-$(LFVER).tar.xz:
	$(FETCH) $(LFURI)$@

libowfat-$(LFVER).tar.xz.sig:
	$(FETCH) $(LFURI)$@

dietlibc-$(DLVER).tar.xz:
	$(FETCH) $(DLURI)$@

dietlibc-$(DLVER).tar.xz.sig:
	$(FETCH) $(DLURI)$@

CC=diet gcc
CFLAGS=-I.. -pedantic -std=c99 -O0 -ggdb
OBJS=arc4random.o bans.o bbcode.o captcha.o context.o db.o db_hashmap.o \
    dietchan.o export.o http.o import.o ip.o job.o mime_types.o \
    params.o permissions.o persistence.o print.o session.o \
    tpl.o upload_job.o util.o
POBJS=pages/banned.o pages/board.o pages/dashboard.o pages/edit_board.o pages/edit_user.o pages/login.o pages/mod.o pages/post.o pages/static.o pages/thread.o 
dietchan: $(OBJS) $(POBJS)
	$(CC) -o dietchan $(OBJS) $(POBJS) -L.. -lowfat

clean:
	rm -f $(OBJS) $(POBJS) dietchan

diff --git a/src/dietchan/src/dietchan.c b/src/dietchan/src/dietchan.c
index 46727cc..68ad8d2 100644
--- a/src/dietchan/src/dietchan.c
+++ b/src/dietchan/src/dietchan.c
@@ -246,7 +246,7 @@ int handle_write_events(int limit)
 		if (!ctx) {
 			io_dontwantwrite(s);
 			io_close(s);
-			printf("Warning: cookie is null\n");
+			buffer_putsflush(buffer_2, "Warning: cookie is null\n");
 			continue;
 		}
 		context_flush(ctx);
@@ -258,8 +258,11 @@ void add_listener(struct ip ip, uint16 port)
 {
 	char buf[256];
 	buf[fmt_ip(buf,&ip)] = '\0';
-	fprintf(stderr, "Creating listener on port %d for address %s\n", (int)port, buf);
-
+	buffer_puts(buffer_2, "Creating listener (try http://");
+	buffer_puts(buffer_2, buf);
+	buffer_puts(buffer_2, ":");
+	buffer_putulong(buffer_2, (unsigned long)port);
+	buffer_putsflush(buffer_2, "/c for the default board).\n");
 	struct listener *listener = listeners + listener_count;
 	listener->ip = ip;

diff --git a/src/dietchan/src/config.h b/src/dietchan/src/config.h
index 9f64c30..4c3af42 100644
--- a/src/dietchan/src/config.h
+++ b/src/dietchan/src/config.h
@@ -75,5 +75,6 @@
 #define MAX_GET_PARAM_LENGTH           2048
 #define MAX_POST_PARAM_LENGTH         16384
 #define MAX_MULTIPART_BOUNDARY_LENGTH   128
+#define NEED_CAPTCHA                      0
 
 #endif // CONFIG_H
diff --git a/src/dietchan/src/dietchan.c b/src/dietchan/src/dietchan.c
index 65be601..64ce7ed 100644
--- a/src/dietchan/src/dietchan.c
+++ b/src/dietchan/src/dietchan.c
@@ -380,7 +380,7 @@ int main(int argc, char* argv[])
 	mkdir(DOC_ROOT "/uploads", 0755);
 	mkdir(DOC_ROOT "/captchas", 0755);
 	// Start generating captchas
-	generate_captchas();
+	if (NEED_CAPTCHA) generate_captchas();
 
 	// Main loop
 	while (1) {

diff --git a/src/dietchan/src/http.c b/src/dietchan/src/http.c
index c141d33..f82f55f 100644
--- a/src/dietchan/src/http.c
+++ b/src/dietchan/src/http.c
@@ -1,6 +1,8 @@
 #include "http.h"
 
+#ifdef __GLIBC__
 #include <alloca.h>
+#endif
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>

diff --git a/src/dietchan/src/import.c b/src/dietchan/src/import.c
index eab0a6f..a0ca7a2 100644
--- a/src/dietchan/src/import.c
+++ b/src/dietchan/src/import.c
@@ -1,6 +1,5 @@
 #include "import.h"
 
-#include <malloc.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <stdio.h>

diff --git a/src/dietchan/src/pages/post.c b/src/dietchan/src/pages/post.c
index 2971796..16acadc 100644
--- a/src/dietchan/src/pages/post.c
+++ b/src/dietchan/src/pages/post.c
@@ -1,9 +1,8 @@
-#define _BSD_SOURCE 1
+#define _BSD_SOURCE 1
 #define _GNU_SOURCE 1
 #define _XOPEN_SOURCE 1
 #include "post.h"
 
-#include "malloc.h"
 #include <stdio.h>
 #include <sys/socket.h>
 #include <sys/stat.h>

diff --git a/src/dietchan/src/util.c b/src/dietchan/src/util.c
index 3802858..b6c78ab 100644
--- a/src/dietchan/src/util.c
+++ b/src/dietchan/src/util.c
@@ -1,11 +1,15 @@
 #include "util.h"
 
 #include <ctype.h>
+#ifdef __GLIBC__
 #include <alloca.h>
+#endif
 #include <libowfat/str.h>
 #include <libowfat/fmt.h>
 #include <libowfat/scan.h>
+#ifndef arc4random
 #include "arc4random.h"
+#endif
 
 size_t byte_str(const char *haystack, size_t haystack_length, const char *needle)
 {

events {
    worker_connections  4096;
}

http {
    gzip  on;

    upstream dietchan {
        server 127.0.0.1:4000;
    }
    
    server {
        listen       80;
        listen       [::]:80;

        # Statt localhost deine Domäne angeben
        server_name  localhost;

        # Umleitung 
        location = / {
            return 301 /c/;
        }

        # Reverse-Proxy
        location / {
            proxy_request_buffering off;
            proxy_buffering off;
            proxy_http_version 1.1;
            client_max_body_size 0;
        
            proxy_set_header X-Real-IP $remote_addr;
            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
        
            proxy_pass http://dietchan;
        }
    }
}