From ce58644871e585ad53295ce7d6a356a747fee9e7 Mon Sep 17 00:00:00 2001 From: nishi Date: Fri, 14 Jun 2024 03:24:27 +0000 Subject: [PATCH] add pnsk-lab to copyright git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@299 d4a5a174-5a4a-5b4b-b672-37683c10d7d5 --- Library/dataworks.c | 1 + Makefiles/common.mk | 12 ++++++------ RemoteClient/rcli.c | 7 +++++-- Server/server.c | 4 ++++ 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Library/dataworks.c b/Library/dataworks.c index 904d6bc..8e4eb0a 100644 --- a/Library/dataworks.c +++ b/Library/dataworks.c @@ -36,6 +36,7 @@ const char* dataworks_version = "0.1.0"; const char* dataworks_compile_date = __DATE__; const char* dataworks_copyright = "Copyright (c) Crabware 2024\n" + " pnsk-lab 2024\n" " Crabware is the software-development division of\n" " Hinode Gakuen PC-Club. Contact: "; diff --git a/Makefiles/common.mk b/Makefiles/common.mk index 137d0f8..b19aba0 100644 --- a/Makefiles/common.mk +++ b/Makefiles/common.mk @@ -9,12 +9,12 @@ no-doc: ./Grammar ./Library ./Client $(SERVER) $(RCLI) @$(MAKE) thanks-banner thanks-banner: - @echo "************************************" - @echo "* *" - @echo "* Thanks for choosing DataWorks. *" - @echo "* - Nishi *" - @echo "* *" - @echo "************************************" + @echo "+-----------------------------------------+" + @echo "| |" + @echo "| Thanks for choosing DataWorks. |" + @echo "| - Nishi |" + @echo "| |" + @echo "+-----------------------------------------+" ./Grammar:: $(MAKE) -C $@ $(COMPILE_FLAGS) diff --git a/RemoteClient/rcli.c b/RemoteClient/rcli.c index ffe9091..c17bbc6 100644 --- a/RemoteClient/rcli.c +++ b/RemoteClient/rcli.c @@ -69,6 +69,9 @@ void discon(int sig) { int main(int _argc, char** _argv) { printf("DataWorks Remote Client version %s %s %s\n", dataworks_get_version(), dataworks_get_compile_date(), dataworks_get_platform()); + printf("\n"); + printf("%s\n", dataworks_get_copyright()); + printf("\n"); argc = _argc; argv = _argv; bool auth = false; @@ -160,7 +163,7 @@ int main(int _argc, char** _argv) { int ch = getchar(); #endif if(ch == EOF || ch == match) { - if(ch == EOF){ + if(ch == EOF) { free(username); free(password); goto go_quit; @@ -199,7 +202,7 @@ int main(int _argc, char** _argv) { int ch = getchar(); #endif if(ch == EOF || ch == match) { - if(ch == EOF){ + if(ch == EOF) { free(username); free(password); goto go_quit; diff --git a/Server/server.c b/Server/server.c index efbbf25..ab621f7 100644 --- a/Server/server.c +++ b/Server/server.c @@ -199,6 +199,7 @@ void protocol_loop(int sock) { if(strcmp(entries[j]->pass, buf + i + 1) == 0) { writeline(sock, "LOGIN"); login = true; + printf("User %s is in\n", user); break; } else { writeline(sock, "ERROR:INVALID_PASSWORD"); @@ -251,6 +252,9 @@ int main(int _argc, char** _argv) { signal(SIGINT, exitnow); signal(SIGTERM, exitnow); printf("DataWorks Server version %s %s %s\n", dataworks_get_version(), dataworks_get_compile_date(), dataworks_get_platform()); + printf("\n"); + printf("%s\n", dataworks_get_copyright()); + printf("\n"); int st; if((st = server_init()) != 0) return st; if(auth) { -- 2.43.0