--- lbbs/src/common.c 2025/06/26 12:17:02 1.35 +++ lbbs/src/common.c 2025/11/04 14:58:56 1.42 @@ -1,26 +1,12 @@ -/*************************************************************************** - common.c - description - ------------------- - Copyright : (C) 2004-2025 by Leaflet - Email : leaflet@leafok.com - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/* SPDX-License-Identifier: GPL-3.0-or-later */ +/* + * common + * - common definitions + * + * Copyright (C) 2004-2025 Leaflet + */ #include "common.h" -#include "log.h" -#include "menu.h" -#include -#include -#include -#include // File loader const char *data_files_load_startup[] = { @@ -29,11 +15,14 @@ const char *data_files_load_startup[] = DATA_GOODBYE, DATA_LICENSE, DATA_COPYRIGHT, + DATA_VERSION, DATA_LOGIN_ERROR, DATA_ACTIVE_BOARD, DATA_READ_HELP, + DATA_EDITOR_HELP, VAR_BBS_TOP}; -int data_files_load_startup_count = 9; // Count of data_files_load_startup[] + +const int data_files_load_startup_count = sizeof(data_files_load_startup) / sizeof(const char *); // Global declaration for sockets int socket_server[2]; @@ -53,29 +42,7 @@ volatile int SYS_child_process_count = 0 volatile int SYS_child_exit = 0; volatile int SYS_conf_reload = 0; -static const char *weekday[] = { - "天", "一", "二", "三", "四", "五", "六"}; - // Common function -const char *get_time_str(char *s, size_t len) -{ - time_t curtime; - struct tm local_tm; - - time(&curtime); - localtime_r(&curtime, &local_tm); - size_t j = strftime(s, len, "%b %d %H:%M 星期", &local_tm); - - if (j == 0 || j + strlen(weekday[local_tm.tm_wday]) + 1 > len) - { - return NULL; - } - - strncat(s, weekday[local_tm.tm_wday], len - 1 - j); - - return s; -} - void sig_hup_handler(int i) { SYS_conf_reload = 1; @@ -90,41 +57,3 @@ void sig_chld_handler(int i) { SYS_child_exit = 1; } - -const char *ip_mask(char *s, int level, char mask) -{ - char *p = s; - - if (level <= 0) - { - return s; - } - if (level > 4) - { - level = 4; - } - - for (int i = 0; i < 4 - level; i++) - { - p = strchr(p, '.'); - if (p == NULL) - { - return s; - } - p++; - } - - for (int i = 0; i < level; i++) - { - *p = mask; - p++; - if (i < level - 1) - { - *p = '.'; - p++; - } - } - *p = '\0'; - - return s; -}