From 352615331e96531d58ff1394c5c2f53bf9a81c9a Mon Sep 17 00:00:00 2001 From: WANG Cong Date: Fri, 27 Jul 2007 17:40:45 +0800 Subject: [PATCH] Add debug.h and clean Makefile --- server/src/Makefile | 6 ++-- server/src/debug.h | 18 ++++++++++ server/src/parse_cmd.c | 90 +++++++++++++------------------------------------- server/src/xylftp.h | 6 ++++ 4 files changed, 50 insertions(+), 70 deletions(-) create mode 100644 server/src/debug.h diff --git a/server/src/Makefile b/server/src/Makefile index 03f439f..7f98f18 100644 --- a/server/src/Makefile +++ b/server/src/Makefile @@ -13,7 +13,7 @@ all: xylftp xylftp: xylftp.o read_configure.o write_log.o xylsocket.o telnet.o parse_cmd.o do_cmd.o $(CC) $(CFLAGS) $(LDFLAGS) -O2 -o $@ $^ -xylftp.o: xylftp.c +xylftp.o: xylftp.c xylftp.h $(CC) $(CFLAGS) -O2 -c -o $@ $^ read_configure.o: read_configure.c @@ -31,14 +31,14 @@ telnet.o: telnet.c parse_cmd.o: parse_cmd.c $(CC) $(CFLAGS) -O2 -c -o $@ $^ -do_cmd.o: do_cmd.c +do_cmd.o: do_cmd.c do_cmd.h $(CC) $(CFLAGS) -O2 -c -o $@ $^ clean: rm -f *.o xylftp xylftp.debug debug: xylftp.debug -xylftp.debug: xylftp.c read_configure.c write_log.c xylsocket.c telnet.c parse_cmd.c do_cmd.c +xylftp.debug: xylftp.h xylftp.c read_configure.c write_log.c xylsocket.c telnet.c parse_cmd.c do_cmd.h do_cmd.c debug.h $(CC) $(CFLAGS) $(LDFLAGS) -DDEBUG -ggdb -o $@ $^ install: all diff --git a/server/src/debug.h b/server/src/debug.h new file mode 100644 index 0000000..e9d1e11 --- /dev/null +++ b/server/src/debug.h @@ -0,0 +1,18 @@ +#ifndef DEBUG_H +#define DEBUG_H + +#include + +#ifdef DEBUG + +#define debug_printf(fmt, ...) \ + printf("DEBUG: %s:%d@%s: " fmt,\ + __FILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__) + +#else /* !DEBUG */ + +#define debug_printf(fmt, ...) do{} while(0) + +#endif /* DEBUG */ + +#endif /* DEBUG_H */ diff --git a/server/src/parse_cmd.c b/server/src/parse_cmd.c index 4a19f5a..794027d 100644 --- a/server/src/parse_cmd.c +++ b/server/src/parse_cmd.c @@ -18,6 +18,7 @@ #include "xylftp.h" #include "do_cmd.h" +#include "debug.h" #define MAX_CMD 5 #define MAX_ARG 4096 @@ -138,139 +139,94 @@ int parse_cmd(char *p_buf) break; case 3: -#ifdef DEBUG - printf("call syst()\n"); -#endif + debug_printf("call syst()\n"); do_syst(); break; case 4: -#ifdef DEBUG - printf("call quit()\n"); -#endif + debug_printf("call quit()\n"); do_quit(); break; case 5: -#ifdef DEBUG - printf("call retr()\n"); -#endif + debug_printf("call retr()\n"); do_retr(user_cmd.arg); break; case 6: -#ifdef DEBUG - printf("call stor()\n"); -#endif + debug_printf("call stor()\n"); do_stor(user_cmd.arg); break; case 7: -#ifdef DEBUG - printf("call rnfr()\n"); -#endif + debug_printf("call rnfr()\n"); do_rnfr(); strcpy(rnfr_arg, user_cmd.arg); break; case 8: -#ifdef DEBUG - printf("call rnto()\n"); -#endif + debug_printf("call rnto()\n"); do_rnto(rnfr_arg, user_cmd.arg); memset(rnfr_arg, 0, MAX_ARG); break; case 9: -#ifdef DEBUG - printf("call abor()\n"); + debug_printf("call abor()\n"); fflush(stdout); -#endif do_abor(user_cmd.arg); break; case 10: -#ifdef DEBUG - printf("call dele()\n"); -#endif + debug_printf("call dele()\n"); do_dele(user_cmd.arg); break; case 11: -#ifdef DEBUG - printf("call rmd()\n"); -#endif + debug_printf("call rmd()\n"); do_rmd(user_cmd.arg); break; case 12: -#ifdef DEBUG - printf("call mkd()\n"); -#endif + debug_printf("call mkd()\n"); do_mkd(user_cmd.arg); break; case 13: -#ifdef DEBUG - printf("call pwd()\n"); -#endif + debug_printf("call pwd()\n"); do_pwd(); break; case 14: -#ifdef DEBUG - printf("call cwd()\n"); -#endif + debug_printf("call cwd()\n"); do_cwd(user_cmd.arg); break; case 15: -#ifdef DEBUG - printf("call cdup()\n"); -#endif + debug_printf("call cdup()\n"); do_cdup(); break; case 16: -#ifdef DEBUG - printf("call port()\n"); -#endif + debug_printf("call port()\n"); do_port(user_cmd.arg); break; case 17: -#ifdef DEBUG - printf("call noop()\n"); -#endif + debug_printf("call noop()\n"); do_noop(); break; case 18: -#ifdef DEBUG - printf("call pasv()\n"); - printf("\n"); -#endif + debug_printf("call pasv()\n\n"); do_pasv(); break; case 19: -#ifdef DEBUG - printf("call type()\n"); -#endif + debug_printf("call type()\n"); do_type(user_cmd.arg); break; case 20: -#ifdef DEBUG - printf("call mode()\n"); -#endif + debug_printf("call mode()\n"); do_mode(user_cmd.arg); break; case 21: -#ifdef DEBUG - printf("call stat()\n"); -#endif + debug_printf("call stat()\n"); do_stat(user_cmd.arg); break; case 22: -#ifdef DEBUG - printf("call stru()\n"); -#endif + debug_printf("call stru()\n"); do_stru(user_cmd.arg); break; case 23: -#ifdef DEBUG - printf("call list()\n"); -#endif + debug_printf("call list()\n"); do_list(user_cmd.arg); break; default: -#ifdef DEBUG - printf("call failed()\n"); -#endif + debug_printf("call failed()\n"); failed(user_cmd.cmd); break; } diff --git a/server/src/xylftp.h b/server/src/xylftp.h index cf25edf..c04ed22 100644 --- a/server/src/xylftp.h +++ b/server/src/xylftp.h @@ -57,7 +57,13 @@ typedef unsigned int bool; #define LISTENQ 128 #define MAX_ADDR 256 #define _BUFFER_LENGTH 150 + +#ifdef DEBUG +#define CONFIG_FILE "../doc/xylftp.conf" +#else #define CONFIG_FILE "/etc/xylftp/xylftp.conf" +#endif + #define PATH_NAME_LEN 1024 #define USER_NAME_LEN 32 #define MAX_MSG_LEN 256 -- 2.11.4.GIT