--- lbbs/src/common.c 2025/04/28 12:45:57 1.10 +++ lbbs/src/common.c 2025/05/05 11:11:06 1.14 @@ -15,7 +15,10 @@ * * ***************************************************************************/ +#include "common.h" +#include "log.h" #include "menu.h" +#include #include #include #include @@ -23,10 +26,6 @@ // Version information char app_version[256] = "LBBS-devel version 1.0"; -// Global declaration for enviroment -char app_home_dir[256]; -char app_temp_dir[256]; - // Global declaration for sockets int socket_server; int socket_client; @@ -35,20 +34,12 @@ char hostaddr_client[50]; int port_server; int port_client; -// Global declaration for database -char DB_host[256]; -char DB_username[50]; -char DB_password[50]; -char DB_database[50]; -char DB_timezone[50]; - // Global declaration for system int SYS_exit; int SYS_child_process_count; // Common function -const char * -str_space(char *string, int length) +const char *str_space(char *string, int length) { int i; for (i = 0; i < length; i++) @@ -59,47 +50,45 @@ str_space(char *string, int length) return string; } -const char * -get_time_str(char *string, size_t length) +const char *get_time_str(char *s, size_t len) { - char week[10], buffer[256]; - time_t curtime; + time_t curtime = time(NULL); struct tm *loctime; - - curtime = time(NULL); loctime = localtime(&curtime); - strftime(buffer, 256, "%Y年%m月%d日%H:%M:%S ", loctime); + size_t j = strftime(s, len, "%Y年%m月%d日%H:%M:%S ", loctime); + + if (j == 0) + { + return NULL; + } switch (loctime->tm_wday) { case 0: - strcpy(week, "星期天"); + strncat(s, "星期天", len - j); break; case 1: - strcpy(week, "星期一"); + strncat(s, "星期一", len - j); break; case 2: - strcpy(week, "星期二"); + strncat(s, "星期二", len - j); break; case 3: - strcpy(week, "星期三"); + strncat(s, "星期三", len - j); break; case 4: - strcpy(week, "星期四"); + strncat(s, "星期四", len - j); break; case 5: - strcpy(week, "星期五"); + strncat(s, "星期五", len - j); break; case 6: - strcpy(week, "星期六"); + strncat(s, "星期六", len - j); break; } - strcat(buffer, week); - strncpy(string, buffer, length); - - return string; + return s; } void reload_bbs_menu(int i)