From 702561d9418ed1f5676932b315e17692c0f2347a Mon Sep 17 00:00:00 2001 From: Masanori Ogino Date: Wed, 29 Nov 2023 13:31:08 +0900 Subject: [PATCH] sj3serv: Fold time_stamp and version into main.c Signed-off-by: Masanori Ogino --- CMakeLists.txt | 2 -- sj3serv/main.c | 3 +++ sj3serv/time_stamp.c | 31 ------------------------------- sj3serv/version.c | 31 ------------------------------- 4 files changed, 3 insertions(+), 64 deletions(-) delete mode 100644 sj3serv/time_stamp.c delete mode 100644 sj3serv/version.c diff --git a/CMakeLists.txt b/CMakeLists.txt index d59ed05..50d4e34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,8 +126,6 @@ add_executable(sj3serv sj3serv/execute.c sj3serv/main.c sj3serv/setup.c - sj3serv/time_stamp.c - sj3serv/version.c ) target_include_directories(sj3serv PRIVATE include sj3lib diff --git a/sj3serv/main.c b/sj3serv/main.c index b59f25f..6998bf7 100644 --- a/sj3serv/main.c +++ b/sj3serv/main.c @@ -48,6 +48,9 @@ #define signal sigset #endif +char *version_number = "2.08C"; +char *time_stamp = "Mon Mar 23 16:42:59 JST 1998"; + extern int fork_flag; extern char *lock_file; diff --git a/sj3serv/time_stamp.c b/sj3serv/time_stamp.c deleted file mode 100644 index 71162c9..0000000 --- a/sj3serv/time_stamp.c +++ /dev/null @@ -1,31 +0,0 @@ -/*- - * SPDX-License-Identifier: MIT-open-group - * - * Copyright (c) 1991-1994 Sony Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL SONY CORPORATION BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name of Sony Corporation - * shall not be used in advertising or otherwise to promote the sale, use - * or other dealings in this Software without prior written authorization - * from Sony Corporation. - */ - -char *time_stamp = "Mon Mar 23 16:42:59 JST 1998"; diff --git a/sj3serv/version.c b/sj3serv/version.c deleted file mode 100644 index 0ec8bf6..0000000 --- a/sj3serv/version.c +++ /dev/null @@ -1,31 +0,0 @@ -/*- - * SPDX-License-Identifier: MIT-open-group - * - * Copyright (c) 1991-1994 Sony Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL SONY CORPORATION BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name of Sony Corporation - * shall not be used in advertising or otherwise to promote the sale, use - * or other dealings in this Software without prior written authorization - * from Sony Corporation. - */ - -char *version_number = "2.08C";