From 1f902c465217f3af7c33e2adb6477e4447edbd8a Mon Sep 17 00:00:00 2001 From: Nishi Date: Thu, 26 Sep 2024 20:24:04 +0000 Subject: [PATCH] fix multiple stuff git-svn-id: file:///raid/svn-personal/tewi/trunk@168 8739d7e6-ffea-ec47-b151-bdff447c6205 --- Makefile | 2 +- Platform/cygwin.mk | 2 +- Server/main.c | 1 + Server/tw_version.h | 2 +- Tool/genconf.c | 1 + Tool/itworks.c | 1 + Tool/option.c | 1 + 7 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 96d9c2b..b84110c 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ all: ./Server ./Module ./Tool/genconf ./Tool/itworks sed "s/@VERSION@/`grep "define TW_VERSION" Server/tw_version.h | grep -Eo '"[^\]+' | sed -E 's/^"//g'`/g" ./README.tmpl > $@ install: all ./Tool/genconf ./Tool/itworks - mkdir -p $(PREFIX)/bin $(PREFIX)/lib/tewi $(PREFIX)/share/man/man5 $(PREFIX)/etc $(PREFIX)/www + mkdir -p $(PREFIX)/bin $(PREFIX)/lib/tewi $(PREFIX)/etc $(PREFIX)/www if [ ! -e $(PREFIX)/etc/tewi.conf ]; then ( ./Tool/genconf $(PREFIX) lib/tewi so > $(PREFIX)/etc/tewi.conf || ( rm $(PREFIX)/etc/tewi.conf ; exit 1 ) ) ; fi if [ ! -e $(PREFIX)/www/index.html ]; then ( ./Tool/itworks > $(PREFIX)/www/index.html || ( rm $(PREFIX)/www/index.html ; exit 1 ) ) ; fi if [ ! -e $(PREFIX)/www/pbtewi.gif ]; then ( cp Binary/pbtewi.gif $(PREFIX)/www/ || ( rm $(PREFIX)/www/pbtewi.gif ; exit 1 ) ) ; fi diff --git a/Platform/cygwin.mk b/Platform/cygwin.mk index c624c6d..5e45edb 100644 --- a/Platform/cygwin.mk +++ b/Platform/cygwin.mk @@ -2,7 +2,7 @@ CC = cc AR = ar -CFLAGS = -g -std=c99 -DPREFIX=\"$(PREFIX)\" -I $(PWD)/Common -fPIC -DNO_IPV6 +CFLAGS = -g -std=c99 -DPREFIX=\"$(PREFIX)\" -I $(PWD)/Common LDFLAGS = LIBS = EXEC = diff --git a/Server/main.c b/Server/main.c index 44f10c7..59789ec 100644 --- a/Server/main.c +++ b/Server/main.c @@ -86,6 +86,7 @@ int main(int argc, char** argv) { if(st != -1) return st; tw_server_loop(); #endif + return 0; } int startup(int argc, char** argv) { diff --git a/Server/tw_version.h b/Server/tw_version.h index c7b8bb7..ada4f4d 100644 --- a/Server/tw_version.h +++ b/Server/tw_version.h @@ -7,7 +7,7 @@ extern "C" { #endif -#define TW_VERSION "1.08B\0" +#define TW_VERSION "1.08C\0" const char* tw_get_version(void); const char* tw_get_platform(void); diff --git a/Tool/genconf.c b/Tool/genconf.c index 450c7e0..b8e35d1 100644 --- a/Tool/genconf.c +++ b/Tool/genconf.c @@ -45,4 +45,5 @@ int main(int argc, char** argv) { printf("BeginDirectory %s/www\n", argv[1]); printf(" Allow all\n"); printf("EndDirectory\n", argv[1]); + return 0; } diff --git a/Tool/itworks.c b/Tool/itworks.c index 5089b62..e0af8db 100644 --- a/Tool/itworks.c +++ b/Tool/itworks.c @@ -32,4 +32,5 @@ int main() { printf(" \n"); printf(" \n"); printf("\n"); + return 0; } diff --git a/Tool/option.c b/Tool/option.c index 7c99294..473f8be 100644 --- a/Tool/option.c +++ b/Tool/option.c @@ -28,4 +28,5 @@ int main(int argc, char** argv) { #endif } printf("\n"); + return 0; } -- 2.45.2