From 14bce1fa832ea4309eeb66b4f6372d8518602707 Mon Sep 17 00:00:00 2001 From: masashi Date: Sun, 23 Feb 2014 13:34:50 +0900 Subject: [PATCH] I was library can be compiled 20140223 --- libms/CMakeLists.txt | 104 +++++++++++++++++++++ {sources/lib/libms => libms}/INSTALL.utfjp | 0 {sources/lib/libms => libms}/README.utfjp | 4 +- {sources/lib/libms => libms}/alget_read.c | 5 +- {sources/lib/libms => libms}/alget_write.c | 5 +- libms/alversion.c | 11 +++ {sources/lib/libms => libms}/base64.c | 0 {sources/lib/libms => libms}/bit.c | 0 {sources/lib/libms => libms}/ch_char.c | 0 {sources/lib/libms => libms}/ch_float.c | 0 {sources/lib/libms => libms}/ch_int.c | 0 {sources/lib/libms => libms}/ch_int2.c | 0 {sources/lib/libms => libms}/ch_int3.c | 0 {sources/lib/libms => libms}/ch_int4.c | 0 {sources/lib/libms => libms}/ch_int_v4.c | 0 {sources/lib/libms => libms}/ch_int_v6.c | 0 {sources/lib/libms => libms}/char_count.c | 0 {sources/lib/libms => libms}/char_get.c | 0 {sources/lib/libms => libms}/char_mon.c | 5 +- {sources/lib/libms => libms}/char_point.c | 0 {sources/lib/libms => libms}/char_wday.c | 5 +- {sources/lib/libms => libms}/chmem.c | 0 {sources/lib/libms => libms}/clean_mem.c | 0 {sources/lib/libms => libms}/convert.c | 6 +- {sources/lib/libms => libms}/count_memcpy.c | 0 {sources/lib/libms => libms}/count_memcpy2.c | 5 +- {sources/lib/libms => libms}/counts.c | 5 +- {sources/lib/libms => libms}/ctime_getr.c | 5 +- {sources/lib/libms => libms}/day_minus.c | 5 +- {sources/lib/libms => libms}/day_plasminus.c | 0 {sources/lib/libms => libms}/delim_count.c | 0 {sources/lib/libms => libms}/delim_f.c | 5 +- {sources/lib/libms => libms}/delim_get.c | 5 +- {sources/lib/libms => libms}/delim_r.c | 4 +- {sources/lib/libms => libms}/file_copy.c | 0 {sources/lib/libms => libms}/get_unixtime.c | 0 {sources/lib/libms => libms}/gettimeofday_se.c | 0 {sources/lib/libms => libms}/initdaemon.c | 0 {sources/include/libms => libms}/libms.h | 5 +- {sources/lib/libms => libms}/mem_count.c | 0 {sources/lib/libms => libms}/mem_tcount.c | 0 {sources/lib/libms => libms}/memcount_cpm.c | 0 {sources/lib/libms => libms}/message_id.c | 5 +- {sources/lib/libms => libms}/mime_ujtoj.c | 5 +- {sources/lib/libms => libms}/mlexit.c | 0 {sources/lib/libms => libms}/month_last.c | 0 {sources/lib/libms => libms}/month_minus.c | 0 {sources/lib/libms => libms}/null_free.c | 0 {sources/lib/libms => libms}/randdata.c | 0 {sources/lib/libms => libms}/rm_char.c | 5 +- {sources/lib/libms => libms}/rm_crlf.c | 0 {sources/lib/libms => libms}/safe_base64.c | 5 +- {sources/lib/libms => libms}/safe_convert_data.c | 6 +- {sources/lib/libms => libms}/safe_fdcat.c | 5 +- {sources/lib/libms => libms}/safe_fdcpm.c | 5 +- {sources/lib/libms => libms}/safe_filefdcat.c | 5 +- {sources/lib/libms => libms}/safe_fpcat.c | 5 +- {sources/lib/libms => libms}/safe_memcpy.c | 5 +- .../lib/libms => libms}/safe_pthread_mutex_lock.c | 0 {sources/lib/libms => libms}/safe_sprintf.c | 5 +- {sources/lib/libms => libms}/safe_strncat.c | 7 +- {sources/lib/libms => libms}/safe_ujtoj.c | 4 +- {sources/lib/libms => libms}/select_connect.c | 0 {sources/lib/libms => libms}/select_fdcat.c | 4 +- {sources/lib/libms => libms}/self_convert_data.c | 6 +- {sources/lib/libms => libms}/self_delim_get.c | 6 +- {sources/lib/libms => libms}/self_memcmp.c | 0 {sources/lib/libms => libms}/self_memcpy.c | 0 {sources/lib/libms => libms}/self_strncat.c | 0 {sources/lib/libms => libms}/set_mem.c | 0 {sources/lib/libms => libms}/shift8_updown_in.c | 0 {sources/lib/libms => libms}/shift8_updown_out.c | 0 {sources/lib/libms => libms}/socket_accept.c | 0 {sources/lib/libms => libms}/socket_accept46.c | 4 +- {sources/lib/libms => libms}/socket_accept46rfd.c | 0 {sources/lib/libms => libms}/socket_bind.c | 0 {sources/lib/libms => libms}/socket_bind46.c | 0 {sources/lib/libms => libms}/socket_connect.c | 0 {sources/lib/libms => libms}/socket_connect46.c | 3 + .../lib/libms => libms}/socket_connect46select.c | 4 +- {sources/lib/libms => libms}/socket_read.c | 1 + {sources/lib/libms => libms}/socket_reada.c | 4 +- {sources/lib/libms => libms}/socket_readas.c | 4 +- {sources/lib/libms => libms}/socket_readasth.c | 7 +- {sources/lib/libms => libms}/socket_reads.c | 1 + {sources/lib/libms => libms}/socket_send.c | 4 +- {sources/lib/libms => libms}/socket_send2.c | 4 +- {sources/lib/libms => libms}/socket_sends.c | 0 {sources/lib/libms => libms}/swap_armem.c | 0 {sources/lib/libms => libms}/swap_mem.c | 0 {sources/lib/libms => libms}/swap_rn.c | 5 +- {sources/lib/libms => libms}/time_getr.c | 5 +- {sources/lib/libms => libms}/time_minus.c | 0 {sources/lib/libms => libms}/time_plas.c | 0 {sources/lib/libms => libms}/ujtoj.c | 0 {sources/lib/libms => libms}/unlinkdir.c | 5 +- {sources/lib/libms => libms}/utime_getr.c | 5 +- sources/CMakeLists.txt | 19 ---- sources/lib/CMakeLists.txt | 7 -- sources/lib/libms/alversion.c | 12 --- test/CMakeLists.txt | 17 ++++ {sources/lib/libms => test}/libms_test.c | 5 +- 102 files changed, 261 insertions(+), 122 deletions(-) create mode 100644 libms/CMakeLists.txt rename {sources/lib/libms => libms}/INSTALL.utfjp (100%) rename {sources/lib/libms => libms}/README.utfjp (99%) rename {sources/lib/libms => libms}/alget_read.c (96%) rename {sources/lib/libms => libms}/alget_write.c (95%) create mode 100644 libms/alversion.c rename {sources/lib/libms => libms}/base64.c (100%) rename {sources/lib/libms => libms}/bit.c (100%) rename {sources/lib/libms => libms}/ch_char.c (100%) rename {sources/lib/libms => libms}/ch_float.c (100%) rename {sources/lib/libms => libms}/ch_int.c (100%) rename {sources/lib/libms => libms}/ch_int2.c (100%) rename {sources/lib/libms => libms}/ch_int3.c (100%) rename {sources/lib/libms => libms}/ch_int4.c (100%) rename {sources/lib/libms => libms}/ch_int_v4.c (100%) rename {sources/lib/libms => libms}/ch_int_v6.c (100%) rename {sources/lib/libms => libms}/char_count.c (100%) rename {sources/lib/libms => libms}/char_get.c (100%) rename {sources/lib/libms => libms}/char_mon.c (89%) rename {sources/lib/libms => libms}/char_point.c (100%) rename {sources/lib/libms => libms}/char_wday.c (86%) rename {sources/lib/libms => libms}/chmem.c (100%) rename {sources/lib/libms => libms}/clean_mem.c (100%) rename {sources/lib/libms => libms}/convert.c (90%) rename {sources/lib/libms => libms}/count_memcpy.c (100%) rename {sources/lib/libms => libms}/count_memcpy2.c (86%) rename {sources/lib/libms => libms}/counts.c (94%) rename {sources/lib/libms => libms}/ctime_getr.c (87%) rename {sources/lib/libms => libms}/day_minus.c (94%) rename {sources/lib/libms => libms}/day_plasminus.c (100%) rename {sources/lib/libms => libms}/delim_count.c (100%) rename {sources/lib/libms => libms}/delim_f.c (93%) rename {sources/lib/libms => libms}/delim_get.c (89%) rename {sources/lib/libms => libms}/delim_r.c (94%) rename {sources/lib/libms => libms}/file_copy.c (100%) rename {sources/lib/libms => libms}/get_unixtime.c (100%) rename {sources/lib/libms => libms}/gettimeofday_se.c (100%) rename {sources/lib/libms => libms}/initdaemon.c (100%) rename {sources/include/libms => libms}/libms.h (98%) rename {sources/lib/libms => libms}/mem_count.c (100%) rename {sources/lib/libms => libms}/mem_tcount.c (100%) rename {sources/lib/libms => libms}/memcount_cpm.c (100%) rename {sources/lib/libms => libms}/message_id.c (86%) rename {sources/lib/libms => libms}/mime_ujtoj.c (98%) rename {sources/lib/libms => libms}/mlexit.c (100%) rename {sources/lib/libms => libms}/month_last.c (100%) rename {sources/lib/libms => libms}/month_minus.c (100%) rename {sources/lib/libms => libms}/null_free.c (100%) rename {sources/lib/libms => libms}/randdata.c (100%) rename {sources/lib/libms => libms}/rm_char.c (88%) rename {sources/lib/libms => libms}/rm_crlf.c (100%) rename {sources/lib/libms => libms}/safe_base64.c (86%) rename {sources/lib/libms => libms}/safe_convert_data.c (88%) rename {sources/lib/libms => libms}/safe_fdcat.c (94%) rename {sources/lib/libms => libms}/safe_fdcpm.c (95%) rename {sources/lib/libms => libms}/safe_filefdcat.c (95%) rename {sources/lib/libms => libms}/safe_fpcat.c (93%) rename {sources/lib/libms => libms}/safe_memcpy.c (92%) rename {sources/lib/libms => libms}/safe_pthread_mutex_lock.c (100%) rename {sources/lib/libms => libms}/safe_sprintf.c (89%) rename {sources/lib/libms => libms}/safe_strncat.c (92%) rename {sources/lib/libms => libms}/safe_ujtoj.c (89%) rename {sources/lib/libms => libms}/select_connect.c (100%) rename {sources/lib/libms => libms}/select_fdcat.c (98%) rename {sources/lib/libms => libms}/self_convert_data.c (80%) rename {sources/lib/libms => libms}/self_delim_get.c (83%) rename {sources/lib/libms => libms}/self_memcmp.c (100%) rename {sources/lib/libms => libms}/self_memcpy.c (100%) rename {sources/lib/libms => libms}/self_strncat.c (100%) rename {sources/lib/libms => libms}/set_mem.c (100%) rename {sources/lib/libms => libms}/shift8_updown_in.c (100%) rename {sources/lib/libms => libms}/shift8_updown_out.c (100%) rename {sources/lib/libms => libms}/socket_accept.c (100%) rename {sources/lib/libms => libms}/socket_accept46.c (96%) rename {sources/lib/libms => libms}/socket_accept46rfd.c (100%) rename {sources/lib/libms => libms}/socket_bind.c (100%) rename {sources/lib/libms => libms}/socket_bind46.c (100%) rename {sources/lib/libms => libms}/socket_connect.c (100%) rename {sources/lib/libms => libms}/socket_connect46.c (97%) rename {sources/lib/libms => libms}/socket_connect46select.c (96%) rename {sources/lib/libms => libms}/socket_read.c (98%) rename {sources/lib/libms => libms}/socket_reada.c (92%) rename {sources/lib/libms => libms}/socket_readas.c (97%) rename {sources/lib/libms => libms}/socket_readasth.c (98%) rename {sources/lib/libms => libms}/socket_reads.c (98%) rename {sources/lib/libms => libms}/socket_send.c (97%) rename {sources/lib/libms => libms}/socket_send2.c (97%) rename {sources/lib/libms => libms}/socket_sends.c (100%) rename {sources/lib/libms => libms}/swap_armem.c (100%) rename {sources/lib/libms => libms}/swap_mem.c (100%) rename {sources/lib/libms => libms}/swap_rn.c (94%) rename {sources/lib/libms => libms}/time_getr.c (84%) rename {sources/lib/libms => libms}/time_minus.c (100%) rename {sources/lib/libms => libms}/time_plas.c (100%) rename {sources/lib/libms => libms}/ujtoj.c (100%) rename {sources/lib/libms => libms}/unlinkdir.c (95%) rename {sources/lib/libms => libms}/utime_getr.c (88%) delete mode 100644 sources/CMakeLists.txt delete mode 100644 sources/lib/CMakeLists.txt delete mode 100644 sources/lib/libms/alversion.c create mode 100644 test/CMakeLists.txt rename {sources/lib/libms => test}/libms_test.c (98%) diff --git a/libms/CMakeLists.txt b/libms/CMakeLists.txt new file mode 100644 index 0000000..f7bbb7e --- /dev/null +++ b/libms/CMakeLists.txt @@ -0,0 +1,104 @@ +cmake_minimum_required (VERSION 2.6) + +project (libms C) + +add_library (libms_lib STATIC +alget_read.c +alget_write.c +alversion.c +base64.c +bit.c +ch_char.c +ch_float.c +ch_int.c +ch_int2.c +ch_int3.c +ch_int4.c +ch_int_v4.c +ch_int_v6.c +char_count.c +char_get.c +char_mon.c +char_point.c +char_wday.c +chmem.c +clean_mem.c +convert.c +count_memcpy.c +count_memcpy2.c +counts.c +ctime_getr.c +day_minus.c +day_plasminus.c +delim_count.c +delim_f.c +delim_get.c +delim_r.c +file_copy.c +get_unixtime.c +gettimeofday_se.c +initdaemon.c +mem_count.c +mem_tcount.c +memcount_cpm.c +message_id.c +mime_ujtoj.c +mlexit.c +month_last.c +month_minus.c +null_free.c +randdata.c +rm_char.c +rm_crlf.c +safe_base64.c +safe_convert_data.c +safe_fdcat.c +safe_fdcpm.c +safe_filefdcat.c +safe_fpcat.c +safe_memcpy.c +safe_pthread_mutex_lock.c +safe_sprintf.c +safe_strncat.c +safe_ujtoj.c +select_connect.c +select_fdcat.c +self_convert_data.c +self_delim_get.c +self_memcmp.c +self_memcpy.c +self_strncat.c +set_mem.c +shift8_updown_in.c +shift8_updown_out.c +socket_accept.c +socket_accept46.c +socket_accept46rfd.c +socket_bind.c +socket_bind46.c +socket_connect.c +socket_connect46.c +socket_connect46select.c +socket_read.c +socket_reada.c +socket_readas.c +socket_readasth.c +socket_reads.c +socket_send.c +socket_send2.c +socket_sends.c +swap_armem.c +swap_mem.c +swap_rn.c +time_getr.c +time_minus.c +time_plas.c +ujtoj.c +unlinkdir.c +utime_getr.c + ) + + + + + diff --git a/sources/lib/libms/INSTALL.utfjp b/libms/INSTALL.utfjp similarity index 100% rename from sources/lib/libms/INSTALL.utfjp rename to libms/INSTALL.utfjp diff --git a/sources/lib/libms/README.utfjp b/libms/README.utfjp similarity index 99% rename from sources/lib/libms/README.utfjp rename to libms/README.utfjp index 92625f6..97e8979 100644 --- a/sources/lib/libms/README.utfjp +++ b/libms/README.utfjp @@ -2,10 +2,10 @@ * 以下関数群は動的なメモリーの割り当てを前提にした、c言語のための標準的文字列操作の関数です。 * 私が自分のプログラミングの為に書きました。 * どなたでもご利用になれますし、書き換えも構いません。 -* この関数は私 Masashi Shimakuraが20051123に書きました、現在でもメンテナンスを行ってます。 +* この関数は私 Masashi Shimakuraが20051123に書き始めました、現在でもメンテナンスを行ってます。 * 何かお気づきの点がありましたら以下にご連絡ください。 * インストールされる場合は同封のINSTALL.utfjpファイルを確認してください。 -* 具体的な書き方はlibmstestのソースであるtest.cを確認する方法もあります。 +* 具体的な書き方はlibms_testのソースであるlibms_test.cを確認する方法もあります。 * * mail: masashi@ms-n.com * 2014/02/20 書き換えました diff --git a/sources/lib/libms/alget_read.c b/libms/alget_read.c similarity index 96% rename from sources/lib/libms/alget_read.c rename to libms/alget_read.c index 995ea04..9403f8a 100644 --- a/sources/lib/libms/alget_read.c +++ b/libms/alget_read.c @@ -1,12 +1,11 @@ // alget_read.c -// $Id: alget_read.c,v 1.4 2007/11/01 06:11:01 sendan Exp $ -// masashi shimakura +// masashi shimakura 20140223 #include #include #include -#include"almemsys.h" +#include"libms.h" // char * alget_read(char *, int, int, int, int *, char, int, int); diff --git a/sources/lib/libms/alget_write.c b/libms/alget_write.c similarity index 95% rename from sources/lib/libms/alget_write.c rename to libms/alget_write.c index 057957f..ba2cbd9 100644 --- a/sources/lib/libms/alget_write.c +++ b/libms/alget_write.c @@ -1,12 +1,11 @@ // alget_write.c -// $Id: alget_write.c,v 1.2 2007/11/01 06:11:01 sendan Exp $ -// masashi shimakura +// masashi shimakura 20140223 #include #include #include -#include"almemsys.h" +#include"libms.h" // int alget_write(int, FILE *, int, char, int, int); diff --git a/libms/alversion.c b/libms/alversion.c new file mode 100644 index 0000000..f5e6534 --- /dev/null +++ b/libms/alversion.c @@ -0,0 +1,11 @@ +// alversion.c +// masashi shimakura 20140223 + +#include +#include "libms.h" + +int alversion(void) +{ +printf("%s\n", CL_VER); +return 0; +} diff --git a/sources/lib/libms/base64.c b/libms/base64.c similarity index 100% rename from sources/lib/libms/base64.c rename to libms/base64.c diff --git a/sources/lib/libms/bit.c b/libms/bit.c similarity index 100% rename from sources/lib/libms/bit.c rename to libms/bit.c diff --git a/sources/lib/libms/ch_char.c b/libms/ch_char.c similarity index 100% rename from sources/lib/libms/ch_char.c rename to libms/ch_char.c diff --git a/sources/lib/libms/ch_float.c b/libms/ch_float.c similarity index 100% rename from sources/lib/libms/ch_float.c rename to libms/ch_float.c diff --git a/sources/lib/libms/ch_int.c b/libms/ch_int.c similarity index 100% rename from sources/lib/libms/ch_int.c rename to libms/ch_int.c diff --git a/sources/lib/libms/ch_int2.c b/libms/ch_int2.c similarity index 100% rename from sources/lib/libms/ch_int2.c rename to libms/ch_int2.c diff --git a/sources/lib/libms/ch_int3.c b/libms/ch_int3.c similarity index 100% rename from sources/lib/libms/ch_int3.c rename to libms/ch_int3.c diff --git a/sources/lib/libms/ch_int4.c b/libms/ch_int4.c similarity index 100% rename from sources/lib/libms/ch_int4.c rename to libms/ch_int4.c diff --git a/sources/lib/libms/ch_int_v4.c b/libms/ch_int_v4.c similarity index 100% rename from sources/lib/libms/ch_int_v4.c rename to libms/ch_int_v4.c diff --git a/sources/lib/libms/ch_int_v6.c b/libms/ch_int_v6.c similarity index 100% rename from sources/lib/libms/ch_int_v6.c rename to libms/ch_int_v6.c diff --git a/sources/lib/libms/char_count.c b/libms/char_count.c similarity index 100% rename from sources/lib/libms/char_count.c rename to libms/char_count.c diff --git a/sources/lib/libms/char_get.c b/libms/char_get.c similarity index 100% rename from sources/lib/libms/char_get.c rename to libms/char_get.c diff --git a/sources/lib/libms/char_mon.c b/libms/char_mon.c similarity index 89% rename from sources/lib/libms/char_mon.c rename to libms/char_mon.c index 878678a..65ec6e2 100644 --- a/sources/lib/libms/char_mon.c +++ b/libms/char_mon.c @@ -1,6 +1,9 @@ +// char_mon.c +// masashi shimakura 20140223 + #include -#include "almemsys.h" +#include "libms.h" // 数字月を英語月頭3文字でかえす diff --git a/sources/lib/libms/char_point.c b/libms/char_point.c similarity index 100% rename from sources/lib/libms/char_point.c rename to libms/char_point.c diff --git a/sources/lib/libms/char_wday.c b/libms/char_wday.c similarity index 86% rename from sources/lib/libms/char_wday.c rename to libms/char_wday.c index 89b01aa..19c7a18 100644 --- a/sources/lib/libms/char_wday.c +++ b/libms/char_wday.c @@ -1,6 +1,9 @@ +// char_wday.c +// masashi shimakura 20140223 + #include -#include "almemsys.h" +#include "libms.h" // 数字の順番で英語曜日の頭3文字をかえす diff --git a/sources/lib/libms/chmem.c b/libms/chmem.c similarity index 100% rename from sources/lib/libms/chmem.c rename to libms/chmem.c diff --git a/sources/lib/libms/clean_mem.c b/libms/clean_mem.c similarity index 100% rename from sources/lib/libms/clean_mem.c rename to libms/clean_mem.c diff --git a/sources/lib/libms/convert.c b/libms/convert.c similarity index 90% rename from sources/lib/libms/convert.c rename to libms/convert.c index b637782..7f841cb 100644 --- a/sources/lib/libms/convert.c +++ b/libms/convert.c @@ -1,12 +1,12 @@ -/* -- selef_convert_data() -- */ -/* -- 20120910 */ +// convert.c +// masashi shimakura 20140223 #include #include #include #include -#include "almemsys.h" +#include "libms.h" int convert(const char *input_code, const char *output_code, const char *input_text, char *output_buf, size_t output_bufsize) diff --git a/sources/lib/libms/count_memcpy.c b/libms/count_memcpy.c similarity index 100% rename from sources/lib/libms/count_memcpy.c rename to libms/count_memcpy.c diff --git a/sources/lib/libms/count_memcpy2.c b/libms/count_memcpy2.c similarity index 86% rename from sources/lib/libms/count_memcpy2.c rename to libms/count_memcpy2.c index bdcecec..d459b9f 100644 --- a/sources/lib/libms/count_memcpy2.c +++ b/libms/count_memcpy2.c @@ -1,11 +1,10 @@ // count_memcpy2.c -// $Id: count_memcpy2.c,v 1.2 2007/11/01 06:12:39 sendan Exp $ -// masashi shimakura +// masashi shimakura 20140223 #include #include #include -#include "almemsys.h" +#include "libms.h" /* ----------- COUNT MEMCPY2 ------------- */ char * count_memcpy2(char * out, char * data, int start, int plus) diff --git a/sources/lib/libms/counts.c b/libms/counts.c similarity index 94% rename from sources/lib/libms/counts.c rename to libms/counts.c index 77eeec7..1dcd89d 100644 --- a/sources/lib/libms/counts.c +++ b/libms/counts.c @@ -1,8 +1,11 @@ +// counts.c +// masashi shimakura 20140223 + #include #include #include -#include "almemsys.h" +#include "libms.h" int counts(char * path_name, int min, int max) diff --git a/sources/lib/libms/ctime_getr.c b/libms/ctime_getr.c similarity index 87% rename from sources/lib/libms/ctime_getr.c rename to libms/ctime_getr.c index ce9debb..dca4d1e 100644 --- a/sources/lib/libms/ctime_getr.c +++ b/libms/ctime_getr.c @@ -1,8 +1,11 @@ +// ctime_getr.c +// masashi shimakura 20140223 + #include #include -#include "almemsys.h" +#include "libms.h" diff --git a/sources/lib/libms/day_minus.c b/libms/day_minus.c similarity index 94% rename from sources/lib/libms/day_minus.c rename to libms/day_minus.c index 17548cb..2ff9452 100644 --- a/sources/lib/libms/day_minus.c +++ b/libms/day_minus.c @@ -1,4 +1,7 @@ -#include "almemsys.h" +// day_minus.c +// masashi shimakura 20140223 + +#include "libms.h" // 現在の年月で、一日前の日をかえす。(1 - 1 = 31) int day_minus(int day_d) diff --git a/sources/lib/libms/day_plasminus.c b/libms/day_plasminus.c similarity index 100% rename from sources/lib/libms/day_plasminus.c rename to libms/day_plasminus.c diff --git a/sources/lib/libms/delim_count.c b/libms/delim_count.c similarity index 100% rename from sources/lib/libms/delim_count.c rename to libms/delim_count.c diff --git a/sources/lib/libms/delim_f.c b/libms/delim_f.c similarity index 93% rename from sources/lib/libms/delim_f.c rename to libms/delim_f.c index b4b5bde..7811978 100644 --- a/sources/lib/libms/delim_f.c +++ b/libms/delim_f.c @@ -1,10 +1,13 @@ +// delim_f.c +// masashi shimakura 20140223 + #include #include #include #include -#include "almemsys.h" +#include "libms.h" diff --git a/sources/lib/libms/delim_get.c b/libms/delim_get.c similarity index 89% rename from sources/lib/libms/delim_get.c rename to libms/delim_get.c index da806c2..7694669 100644 --- a/sources/lib/libms/delim_get.c +++ b/libms/delim_get.c @@ -1,13 +1,12 @@ // delim_get.c -// $Id: delim_get.c,v 1.1.1.1 2007/09/19 05:49:54 sendan Exp $ -// masashi shimakura +// masashi shimakura 20140223 #include #include #include #include -#include "almemsys.h" +#include "libms.h" char * delim_get(char * swap, char * data, char delim, int * ret, int target) diff --git a/sources/lib/libms/delim_r.c b/libms/delim_r.c similarity index 94% rename from sources/lib/libms/delim_r.c rename to libms/delim_r.c index 95f12bc..44a3373 100644 --- a/sources/lib/libms/delim_r.c +++ b/libms/delim_r.c @@ -1,10 +1,12 @@ +// delim_r.c +// masashi shimakura 20140223 #include #include #include #include -#include "almemsys.h" +#include "libms.h" diff --git a/sources/lib/libms/file_copy.c b/libms/file_copy.c similarity index 100% rename from sources/lib/libms/file_copy.c rename to libms/file_copy.c diff --git a/sources/lib/libms/get_unixtime.c b/libms/get_unixtime.c similarity index 100% rename from sources/lib/libms/get_unixtime.c rename to libms/get_unixtime.c diff --git a/sources/lib/libms/gettimeofday_se.c b/libms/gettimeofday_se.c similarity index 100% rename from sources/lib/libms/gettimeofday_se.c rename to libms/gettimeofday_se.c diff --git a/sources/lib/libms/initdaemon.c b/libms/initdaemon.c similarity index 100% rename from sources/lib/libms/initdaemon.c rename to libms/initdaemon.c diff --git a/sources/include/libms/libms.h b/libms/libms.h similarity index 98% rename from sources/include/libms/libms.h rename to libms/libms.h index 4340000..5f7cc22 100644 --- a/sources/include/libms/libms.h +++ b/libms/libms.h @@ -1,6 +1,5 @@ // libms.h -// $Id: libms.h,v 2.0 2014/02/20 masashi Exp $ -// masashi shimakura +// masashi shimakura 20140223 #ifndef _ALMEMSYS_H_ @@ -31,7 +30,7 @@ #endif - #define CL_VER "almemsys-1.0.8" + #define CL_VER "libms-0.0.1" #define HAVE_STDARGS #define VA_LOCAL_DECL va_list ap; diff --git a/sources/lib/libms/mem_count.c b/libms/mem_count.c similarity index 100% rename from sources/lib/libms/mem_count.c rename to libms/mem_count.c diff --git a/sources/lib/libms/mem_tcount.c b/libms/mem_tcount.c similarity index 100% rename from sources/lib/libms/mem_tcount.c rename to libms/mem_tcount.c diff --git a/sources/lib/libms/memcount_cpm.c b/libms/memcount_cpm.c similarity index 100% rename from sources/lib/libms/memcount_cpm.c rename to libms/memcount_cpm.c diff --git a/sources/lib/libms/message_id.c b/libms/message_id.c similarity index 86% rename from sources/lib/libms/message_id.c rename to libms/message_id.c index 815e188..00baf57 100644 --- a/sources/lib/libms/message_id.c +++ b/libms/message_id.c @@ -1,7 +1,10 @@ +// message_id.c +// masashi shimakura 20140223 + #include #include -#include "almemsys.h" +#include "libms.h" char * message_id(char * backdata, char * name, char * domain) { diff --git a/sources/lib/libms/mime_ujtoj.c b/libms/mime_ujtoj.c similarity index 98% rename from sources/lib/libms/mime_ujtoj.c rename to libms/mime_ujtoj.c index d14a2de..2fd07e9 100644 --- a/sources/lib/libms/mime_ujtoj.c +++ b/libms/mime_ujtoj.c @@ -1,7 +1,10 @@ +// mime_ujtoj.c +// masashi shimakura 20140223 + #include #include #include -#include"almemsys.h" +#include"libms.h" /* ujtoj komata mitsuyuki著 TCP_IP ネットワークプログラミング引用 */ diff --git a/sources/lib/libms/mlexit.c b/libms/mlexit.c similarity index 100% rename from sources/lib/libms/mlexit.c rename to libms/mlexit.c diff --git a/sources/lib/libms/month_last.c b/libms/month_last.c similarity index 100% rename from sources/lib/libms/month_last.c rename to libms/month_last.c diff --git a/sources/lib/libms/month_minus.c b/libms/month_minus.c similarity index 100% rename from sources/lib/libms/month_minus.c rename to libms/month_minus.c diff --git a/sources/lib/libms/null_free.c b/libms/null_free.c similarity index 100% rename from sources/lib/libms/null_free.c rename to libms/null_free.c diff --git a/sources/lib/libms/randdata.c b/libms/randdata.c similarity index 100% rename from sources/lib/libms/randdata.c rename to libms/randdata.c diff --git a/sources/lib/libms/rm_char.c b/libms/rm_char.c similarity index 88% rename from sources/lib/libms/rm_char.c rename to libms/rm_char.c index 6951f24..428b760 100644 --- a/sources/lib/libms/rm_char.c +++ b/libms/rm_char.c @@ -1,7 +1,10 @@ +// rm_char.c +// masashi shimakura 20140223 + #include #include #include -#include "almemsys.h" +#include "libms.h" // int rm_char(char * data, char ch, int max); diff --git a/sources/lib/libms/rm_crlf.c b/libms/rm_crlf.c similarity index 100% rename from sources/lib/libms/rm_crlf.c rename to libms/rm_crlf.c diff --git a/sources/lib/libms/safe_base64.c b/libms/safe_base64.c similarity index 86% rename from sources/lib/libms/safe_base64.c rename to libms/safe_base64.c index 9491424..9995f60 100644 --- a/sources/lib/libms/safe_base64.c +++ b/libms/safe_base64.c @@ -1,9 +1,12 @@ +// safe_base64.c +// masashi shimakura 20140223 + #include #include #include -#include"almemsys.h" +#include"libms.h" // char * safe_base64(char *, int, int); diff --git a/sources/lib/libms/safe_convert_data.c b/libms/safe_convert_data.c similarity index 88% rename from sources/lib/libms/safe_convert_data.c rename to libms/safe_convert_data.c index d57c690..9ffb4b8 100644 --- a/sources/lib/libms/safe_convert_data.c +++ b/libms/safe_convert_data.c @@ -1,5 +1,5 @@ -/* -- selef_convert_data() -- */ -/* -- 20120910 */ +/// selef_convert_data() +// masashi shimakura 20140223 #include #include @@ -7,7 +7,7 @@ #include #include -#include "almemsys.h" +#include "libms.h" char * safe_convert_data(const char * input_code, const char * output_code, char * data, int * ret) diff --git a/sources/lib/libms/safe_fdcat.c b/libms/safe_fdcat.c similarity index 94% rename from sources/lib/libms/safe_fdcat.c rename to libms/safe_fdcat.c index 4ca1c82..21d30b5 100644 --- a/sources/lib/libms/safe_fdcat.c +++ b/libms/safe_fdcat.c @@ -1,6 +1,5 @@ // safe_fdcat.c -// $Id: safe_fdcat.c,v 1.3 2007/11/01 05:54:46 sendan Exp $ -// masashi shimakura +// masashi shimakura 20140223 #include #include @@ -8,7 +7,7 @@ #include #include -#include "almemsys.h" +#include "libms.h" char * safe_fdcat(int sk, char * all_data, int * stat, int max_len, int interval) diff --git a/sources/lib/libms/safe_fdcpm.c b/libms/safe_fdcpm.c similarity index 95% rename from sources/lib/libms/safe_fdcpm.c rename to libms/safe_fdcpm.c index 5f224c8..75bc405 100644 --- a/sources/lib/libms/safe_fdcpm.c +++ b/libms/safe_fdcpm.c @@ -1,13 +1,12 @@ // safe_fdcpm.c -// $Id: safe_fdcpm.c,v 1.2 2007/10/17 10:57:56 sendan Exp $ -// masashi shimakura +// masashi shimakura 20140223 #include #include #include #include -#include "almemsys.h" +#include "libms.h" diff --git a/sources/lib/libms/safe_filefdcat.c b/libms/safe_filefdcat.c similarity index 95% rename from sources/lib/libms/safe_filefdcat.c rename to libms/safe_filefdcat.c index 6390ccb..1469777 100644 --- a/sources/lib/libms/safe_filefdcat.c +++ b/libms/safe_filefdcat.c @@ -1,6 +1,5 @@ // safe_filefdcat.c -// $Id: safe_filefdcat.c,v 1.2 2007/10/17 10:57:56 sendan Exp $ -// masashi shimakura +// masashi shimakura 20140223 #include @@ -8,7 +7,7 @@ #include #include -#include "almemsys.h" +#include "libms.h" diff --git a/sources/lib/libms/safe_fpcat.c b/libms/safe_fpcat.c similarity index 93% rename from sources/lib/libms/safe_fpcat.c rename to libms/safe_fpcat.c index d0acd22..4b03a31 100644 --- a/sources/lib/libms/safe_fpcat.c +++ b/libms/safe_fpcat.c @@ -1,6 +1,5 @@ // safe_fpcat.c -// $Id: safe_fpcat.c,v 1.1.1.1 2007/09/19 05:49:54 sendan Exp $ -// masashi shimakura +// masashi shimakura 20140223 #include @@ -8,7 +7,7 @@ #include #include -#include "almemsys.h" +#include "libms.h" diff --git a/sources/lib/libms/safe_memcpy.c b/libms/safe_memcpy.c similarity index 92% rename from sources/lib/libms/safe_memcpy.c rename to libms/safe_memcpy.c index 0efd34c..83a3c5d 100644 --- a/sources/lib/libms/safe_memcpy.c +++ b/libms/safe_memcpy.c @@ -1,13 +1,12 @@ // safe_memcpy.c -// $Id: safe_memcpy.c,v 1.2 2007/10/17 10:57:56 sendan Exp $ -// masashi shimakura +// masashi shimakura 20140223 #include #include #include #include -#include "almemsys.h" +#include "libms.h" diff --git a/sources/lib/libms/safe_pthread_mutex_lock.c b/libms/safe_pthread_mutex_lock.c similarity index 100% rename from sources/lib/libms/safe_pthread_mutex_lock.c rename to libms/safe_pthread_mutex_lock.c diff --git a/sources/lib/libms/safe_sprintf.c b/libms/safe_sprintf.c similarity index 89% rename from sources/lib/libms/safe_sprintf.c rename to libms/safe_sprintf.c index 3a5c234..b80733b 100644 --- a/sources/lib/libms/safe_sprintf.c +++ b/libms/safe_sprintf.c @@ -1,6 +1,5 @@ // safe_sprintf.c -// $Id: safe_sprintf.c,v 1.2 2007/11/01 06:08:31 sendan Exp $ -// masashi shimakura +// masashi shimakura 20140223 #include @@ -9,7 +8,7 @@ #include #include -#include "almemsys.h" +#include "libms.h" diff --git a/sources/lib/libms/safe_strncat.c b/libms/safe_strncat.c similarity index 92% rename from sources/lib/libms/safe_strncat.c rename to libms/safe_strncat.c index 784afc7..4a34f39 100644 --- a/sources/lib/libms/safe_strncat.c +++ b/libms/safe_strncat.c @@ -1,6 +1,5 @@ // safe_strncat.c -// $Id: safe_strncat.c,v 1.1.1.1 2007/09/19 05:49:54 sendan Exp $ -// masashi shimakura +// masashi shimakura 20140223 #include #include @@ -12,9 +11,7 @@ #include #include -#include "almemsys.h" - - +#include "libms.h" char * safe_strncat(char * buf, char * newdata, int max_len) diff --git a/sources/lib/libms/safe_ujtoj.c b/libms/safe_ujtoj.c similarity index 89% rename from sources/lib/libms/safe_ujtoj.c rename to libms/safe_ujtoj.c index 6fb0497..4a76717 100644 --- a/sources/lib/libms/safe_ujtoj.c +++ b/libms/safe_ujtoj.c @@ -1,9 +1,11 @@ +// safe_ujtoj.c +// masashi shimakura 20140223 #include #include #include -#include "almemsys.h" +#include "libms.h" diff --git a/sources/lib/libms/select_connect.c b/libms/select_connect.c similarity index 100% rename from sources/lib/libms/select_connect.c rename to libms/select_connect.c diff --git a/sources/lib/libms/select_fdcat.c b/libms/select_fdcat.c similarity index 98% rename from sources/lib/libms/select_fdcat.c rename to libms/select_fdcat.c index cc95987..5bef67e 100644 --- a/sources/lib/libms/select_fdcat.c +++ b/libms/select_fdcat.c @@ -1,3 +1,5 @@ +// select_fdcat.c +// masashi shimakura 20140223 #include #include @@ -6,7 +8,7 @@ #include #include -#include "almemsys.h" +#include "libms.h" //char * select_fdcat(int sk, char * getdata, int * ret, int max, int interval); diff --git a/sources/lib/libms/self_convert_data.c b/libms/self_convert_data.c similarity index 80% rename from sources/lib/libms/self_convert_data.c rename to libms/self_convert_data.c index f0e79e8..3ad387e 100644 --- a/sources/lib/libms/self_convert_data.c +++ b/libms/self_convert_data.c @@ -1,12 +1,12 @@ -/* -- selef_convert_data() -- */ -/* -- 20120910 */ +// selef_convert_data() +// masashi shimakura 20130223 #include #include #include #include -#include "almemsys.h" +#include "libms.h" int self_convert_data(const char * input_code, const char * output_code, char * outbuf, size_t buf_size) diff --git a/sources/lib/libms/self_delim_get.c b/libms/self_delim_get.c similarity index 83% rename from sources/lib/libms/self_delim_get.c rename to libms/self_delim_get.c index 46bdab7..e14c6ee 100644 --- a/sources/lib/libms/self_delim_get.c +++ b/libms/self_delim_get.c @@ -1,12 +1,12 @@ -// 固定長のデリミターカット -// dataはlen分の長さが保証されていること +// self_delim_get.c +// masashi shimakura 20140223 #include #include #include #include -#include "almemsys.h" +#include "libms.h" int self_delim_get(char * swap, char * data, char delim, int target, int len) diff --git a/sources/lib/libms/self_memcmp.c b/libms/self_memcmp.c similarity index 100% rename from sources/lib/libms/self_memcmp.c rename to libms/self_memcmp.c diff --git a/sources/lib/libms/self_memcpy.c b/libms/self_memcpy.c similarity index 100% rename from sources/lib/libms/self_memcpy.c rename to libms/self_memcpy.c diff --git a/sources/lib/libms/self_strncat.c b/libms/self_strncat.c similarity index 100% rename from sources/lib/libms/self_strncat.c rename to libms/self_strncat.c diff --git a/sources/lib/libms/set_mem.c b/libms/set_mem.c similarity index 100% rename from sources/lib/libms/set_mem.c rename to libms/set_mem.c diff --git a/sources/lib/libms/shift8_updown_in.c b/libms/shift8_updown_in.c similarity index 100% rename from sources/lib/libms/shift8_updown_in.c rename to libms/shift8_updown_in.c diff --git a/sources/lib/libms/shift8_updown_out.c b/libms/shift8_updown_out.c similarity index 100% rename from sources/lib/libms/shift8_updown_out.c rename to libms/shift8_updown_out.c diff --git a/sources/lib/libms/socket_accept.c b/libms/socket_accept.c similarity index 100% rename from sources/lib/libms/socket_accept.c rename to libms/socket_accept.c diff --git a/sources/lib/libms/socket_accept46.c b/libms/socket_accept46.c similarity index 96% rename from sources/lib/libms/socket_accept46.c rename to libms/socket_accept46.c index f5d4831..2432e85 100644 --- a/sources/lib/libms/socket_accept46.c +++ b/libms/socket_accept46.c @@ -1,3 +1,5 @@ +// socket_accept46.c +// masashi shimakura 20140223 #include #include @@ -10,7 +12,7 @@ #include #include -#include"almemsys.h" +#include"libms.h" // proto type // int socket_accept46(struct sockaddr_storage * from, fd_set rfd0, int * s, int smax, int sockmax); diff --git a/sources/lib/libms/socket_accept46rfd.c b/libms/socket_accept46rfd.c similarity index 100% rename from sources/lib/libms/socket_accept46rfd.c rename to libms/socket_accept46rfd.c diff --git a/sources/lib/libms/socket_bind.c b/libms/socket_bind.c similarity index 100% rename from sources/lib/libms/socket_bind.c rename to libms/socket_bind.c diff --git a/sources/lib/libms/socket_bind46.c b/libms/socket_bind46.c similarity index 100% rename from sources/lib/libms/socket_bind46.c rename to libms/socket_bind46.c diff --git a/sources/lib/libms/socket_connect.c b/libms/socket_connect.c similarity index 100% rename from sources/lib/libms/socket_connect.c rename to libms/socket_connect.c diff --git a/sources/lib/libms/socket_connect46.c b/libms/socket_connect46.c similarity index 97% rename from sources/lib/libms/socket_connect46.c rename to libms/socket_connect46.c index 72754d9..2582bfc 100644 --- a/sources/lib/libms/socket_connect46.c +++ b/libms/socket_connect46.c @@ -1,3 +1,6 @@ +// socket_connect46.c +// masashi shimakura 20140223 + #include #include diff --git a/sources/lib/libms/socket_connect46select.c b/libms/socket_connect46select.c similarity index 96% rename from sources/lib/libms/socket_connect46select.c rename to libms/socket_connect46select.c index 7fcf8d7..dc4ce18 100644 --- a/sources/lib/libms/socket_connect46select.c +++ b/libms/socket_connect46select.c @@ -1,3 +1,5 @@ +// socket_connect46select.c +// masashi shimakura 20140223 #include #include @@ -14,7 +16,7 @@ #include #include -#include"almemsys.h" +#include"libms.h" // int socket_connect46(struct addrinfo * hints, char * ip, char * port, int * sk); diff --git a/sources/lib/libms/socket_read.c b/libms/socket_read.c similarity index 98% rename from sources/lib/libms/socket_read.c rename to libms/socket_read.c index 332052f..ef296f9 100644 --- a/sources/lib/libms/socket_read.c +++ b/libms/socket_read.c @@ -6,6 +6,7 @@ #include #include #include +#include int socket_read(int sk, char * readdata, int getlen, int interval){ diff --git a/sources/lib/libms/socket_reada.c b/libms/socket_reada.c similarity index 92% rename from sources/lib/libms/socket_reada.c rename to libms/socket_reada.c index aeab1c0..a107d50 100644 --- a/sources/lib/libms/socket_reada.c +++ b/libms/socket_reada.c @@ -1,3 +1,5 @@ +// socket_reada.c +// masashi shimakura 20140223 #include #include @@ -5,7 +7,7 @@ #include #include -#include "almemsys.h" +#include "libms.h" int socket_reada(int sk, char * readdata, int max){ int ret, stat, count; diff --git a/sources/lib/libms/socket_readas.c b/libms/socket_readas.c similarity index 97% rename from sources/lib/libms/socket_readas.c rename to libms/socket_readas.c index 85db4f7..3d82bfc 100644 --- a/sources/lib/libms/socket_readas.c +++ b/libms/socket_readas.c @@ -1,3 +1,5 @@ +// socket_readas.c +// masashi shimakura 20140223 #include #include @@ -5,7 +7,7 @@ #include #include -#include "almemsys.h" +#include "libms.h" // #define SOCKET_READBUG diff --git a/sources/lib/libms/socket_readasth.c b/libms/socket_readasth.c similarity index 98% rename from sources/lib/libms/socket_readasth.c rename to libms/socket_readasth.c index da0198e..d940b73 100644 --- a/sources/lib/libms/socket_readasth.c +++ b/libms/socket_readasth.c @@ -1,3 +1,5 @@ +// socket_readasth.c +// masashi shimakura 20140223 #include #include @@ -9,7 +11,7 @@ #include -#include "almemsys.h" +#include "libms.h" // #define SOCKET_READBUG @@ -86,7 +88,7 @@ int ret, stat; char cha[64 + 3]; // read() 用thread構造体の宣言 -// th_str は、almemsys.h 内で定義 +// th_str は、libms.h 内で定義 struct th_str * th_struct; struct th_str th_s; int tret; @@ -272,7 +274,6 @@ while(1){ } } // while() -// printf("almemsys(): socket_readasth(): count = %d\n", th_struct->th_count); * size = th_struct->th_count; diff --git a/sources/lib/libms/socket_reads.c b/libms/socket_reads.c similarity index 98% rename from sources/lib/libms/socket_reads.c rename to libms/socket_reads.c index 6b4643a..7d26697 100644 --- a/sources/lib/libms/socket_reads.c +++ b/libms/socket_reads.c @@ -6,6 +6,7 @@ #include #include #include +#include int socket_reads(int sk, char * readdata, int getlen, int interval){ diff --git a/sources/lib/libms/socket_send.c b/libms/socket_send.c similarity index 97% rename from sources/lib/libms/socket_send.c rename to libms/socket_send.c index 8c75c09..ce93a98 100644 --- a/sources/lib/libms/socket_send.c +++ b/libms/socket_send.c @@ -1,3 +1,5 @@ +// socket_send.c +// masashi shimakura 20140223 #include #include @@ -6,7 +8,7 @@ #include #include -#include"almemsys.h" +#include"libms.h" // #define SOCKET_SENDBUG diff --git a/sources/lib/libms/socket_send2.c b/libms/socket_send2.c similarity index 97% rename from sources/lib/libms/socket_send2.c rename to libms/socket_send2.c index d3e4e2a..8e6a9eb 100644 --- a/sources/lib/libms/socket_send2.c +++ b/libms/socket_send2.c @@ -1,3 +1,5 @@ +// socket_send2.c +// masashi shimakura 20140223 #include #include @@ -6,7 +8,7 @@ #include #include -#include"almemsys.h" +#include"libms.h" // #define SOCKET_SENDBUG diff --git a/sources/lib/libms/socket_sends.c b/libms/socket_sends.c similarity index 100% rename from sources/lib/libms/socket_sends.c rename to libms/socket_sends.c diff --git a/sources/lib/libms/swap_armem.c b/libms/swap_armem.c similarity index 100% rename from sources/lib/libms/swap_armem.c rename to libms/swap_armem.c diff --git a/sources/lib/libms/swap_mem.c b/libms/swap_mem.c similarity index 100% rename from sources/lib/libms/swap_mem.c rename to libms/swap_mem.c diff --git a/sources/lib/libms/swap_rn.c b/libms/swap_rn.c similarity index 94% rename from sources/lib/libms/swap_rn.c rename to libms/swap_rn.c index f27890d..35d4839 100644 --- a/sources/lib/libms/swap_rn.c +++ b/libms/swap_rn.c @@ -1,10 +1,11 @@ - +// swap_rn.c +// masashi shimakura 20140223 #include #include #include -#include "almemsys.h" +#include "libms.h" diff --git a/sources/lib/libms/time_getr.c b/libms/time_getr.c similarity index 84% rename from sources/lib/libms/time_getr.c rename to libms/time_getr.c index e34e56d..988adf5 100644 --- a/sources/lib/libms/time_getr.c +++ b/libms/time_getr.c @@ -1,7 +1,10 @@ +// time_getr.c +// masashi shimakura 20140223 + #include #include -#include "almemsys.h" +#include "libms.h" char * time_getr(char * buf) diff --git a/sources/lib/libms/time_minus.c b/libms/time_minus.c similarity index 100% rename from sources/lib/libms/time_minus.c rename to libms/time_minus.c diff --git a/sources/lib/libms/time_plas.c b/libms/time_plas.c similarity index 100% rename from sources/lib/libms/time_plas.c rename to libms/time_plas.c diff --git a/sources/lib/libms/ujtoj.c b/libms/ujtoj.c similarity index 100% rename from sources/lib/libms/ujtoj.c rename to libms/ujtoj.c diff --git a/sources/lib/libms/unlinkdir.c b/libms/unlinkdir.c similarity index 95% rename from sources/lib/libms/unlinkdir.c rename to libms/unlinkdir.c index 5d93167..49bd368 100644 --- a/sources/lib/libms/unlinkdir.c +++ b/libms/unlinkdir.c @@ -1,13 +1,12 @@ // unlinkdir.c -// $Id: $ -// masashi shimakura +// masashi shimakura 20140223 #include #include #include #include #include -#include"almemsys.h" +#include"libms.h" diff --git a/sources/lib/libms/utime_getr.c b/libms/utime_getr.c similarity index 88% rename from sources/lib/libms/utime_getr.c rename to libms/utime_getr.c index cb912cd..c9253fb 100644 --- a/sources/lib/libms/utime_getr.c +++ b/libms/utime_getr.c @@ -1,7 +1,10 @@ +// utime_getr.c +// masashi shimakura 20140223 + #include #include -#include "almemsys.h" +#include "libms.h" /* UNIX時間から時間日付等を返す (thread safe) */ diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt deleted file mode 100644 index 2a8d1ac..0000000 --- a/sources/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required (VERSION 2.6) - -project (libtest) - -set(CMAKE_CXX_FLAGS "-g -Wall") -set(CMAKE_C_FLAGS_DEBUG "-g -pg") - -ADD_SUBDIRECTORY(libuu) - -include_directories(libuu) -link_directories(libuu) - -add_definitions(-DDEBUG) - -ADD_EXECUTABLE(libtest libtest.c) - -target_link_libraries(libtest uutest_lib) - - diff --git a/sources/lib/CMakeLists.txt b/sources/lib/CMakeLists.txt deleted file mode 100644 index e1f7fd5..0000000 --- a/sources/lib/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -cmake_minimum_required (VERSION 2.6) - -project (libuutest) - -# add_library (uutest_lib SHARED libuutest.c) -add_library (uutest_lib STATIC libuutest.c) - diff --git a/sources/lib/libms/alversion.c b/sources/lib/libms/alversion.c deleted file mode 100644 index 94b5f7c..0000000 --- a/sources/lib/libms/alversion.c +++ /dev/null @@ -1,12 +0,0 @@ -// alversion.c -// $Id: alversion.c,v 1.1.1.1 2007/09/19 05:49:54 sendan Exp $ -// masashi shimakura - -#include -#include "almemsys.h" - -int alversion(void) -{ -printf("%s\n", CL_VER); -return 0; -} diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt new file mode 100644 index 0000000..495a14c --- /dev/null +++ b/test/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required (VERSION 2.6) + +project (libms_test C) + +set(CMAKE_C_FLAGS "-g -Wall") +set(CMAKE_C_FLAGS_DEBUG "-g -pg") + +include_directories(../libms) +## link_directories(../libms) + +add_definitions(-DDEBUG) + +ADD_EXECUTABLE(libms_test libms_test.c) + +target_link_libraries(libms_test libms_lib) + + diff --git a/sources/lib/libms/libms_test.c b/test/libms_test.c similarity index 98% rename from sources/lib/libms/libms_test.c rename to test/libms_test.c index 2b1fee3..0480e35 100644 --- a/sources/lib/libms/libms_test.c +++ b/test/libms_test.c @@ -1,11 +1,10 @@ // libms_test.c -// $Id: libms_test.c,v 2.0 2014/02/20 masashi Exp $ -// masashi shimakura +// masashi shimakura 20140223 #include #include #include -#include"almemsys.h" +#include"../libms/libms.h" int main(void) { -- 2.11.0