diff -Naur sj3-2.0.1.20.orig/demo/Makefile sj3-2.0.1.20/demo/Makefile --- sj3-2.0.1.20.orig/demo/Makefile 1970-01-01 09:00:00.000000000 +0900 +++ sj3-2.0.1.20/demo/Makefile 2006-09-12 20:10:22.000000000 +0900 @@ -0,0 +1,81 @@ +# +# @(#)Makefile +# GNU make 用 +# +# CLI ベースの小さなツール類 +# (C) Copyright 1998 by Personal Media Corporation +# +# make の方法 +# ・make +# リリース用の正式版を作成 +# ・make mode=debug +# デバッグ用に作成 +# ・make clean +# make で作成した全てのファイルを削除 +# ・make install +# 規定の場所にインストール +# + +MACHINE = pcat + +# ソースの依存関係ファイル (自動生成) +DEPS = Dependencies +DEPENDENCIES_OUTPUT := $(DEPS) + +# 標準ルール +include $(BD)/unix/etc/makerules + +#----------------------------------------------------------------------------- +TARGET = sample + +# ソースファイルのサーチパス +S = ./ +VPATH = $S ../sj3rkcv +HEADER += $(S) ../include ../sj3h ../sj3lib +LIBDIR += ../sj3lib + +# ソースファイル +SRC = sample.c rk_conv.c sj3_rkcv.c wc16_str.c + +OBJ = $(addsuffix .o, $(basename $(SRC))) +WC_SRC = $(filter %.C, $(SRC)) + +# 追加ライブラリ +LOADLIBES = -lsj3lib + +# コンパイルオプション +ifneq ($(mode), debug) +# CFLAGS += -Wall +endif + +CFLAGS += -DORG + +#----------------------------------------------------------------------------- +.PHONY: all install clean + +ALL = $(TARGET) $(addsuffix .map, $(TARGET)) + +all: $(ALL) + +$(TARGET): $(OBJ) + $(LINK.o) $(LDOBJS) $^ $(LOADLIBES) $(LDLIBS) $(OUTPUT_OPTION) + +clean: + $(RM) $(OBJ) $(WC_SRC:%.C=%.c) $(ALL) $(DEPS) + +install: $(addprefix $(EXE_INSTALLDIR)/, $(ALL)) + +$(TARGET:%=$(EXE_INSTALLDIR)/%): $(EXE_INSTALLDIR)/%: % + $(EXE_INSTALL_STRIP) + +# ソースの依存関係 +$(WC_SRC:%.C=%.c): + +$(OBJ): + +ifdef DEPENDENCIES_OUTPUT + $(DEPS): ; touch $(DEPS) +else + $(DEPS): $(SRC) ; $(MAKEDEPS) $@ $? +endif +include $(DEPS) diff -Naur sj3-2.0.1.20.orig/demo/sample.c sj3-2.0.1.20/demo/sample.c --- sj3-2.0.1.20.orig/demo/sample.c 1997-01-23 20:26:29.000000000 +0900 +++ sj3-2.0.1.20/demo/sample.c 2006-09-12 04:40:41.000000000 +0900 @@ -59,7 +59,7 @@ usage() { - fprintf(stderr, "Usage: %s [-v] [-H hostname]\n", pname); + fprintf(stderr, "Usage: %s [-v] [-H hostname] [-u username]\n", pname); exit(1); } @@ -90,7 +90,7 @@ exit(1); } vflag = 0; - hname = NULL; + hname = uname = NULL; print_head(); @@ -99,7 +99,7 @@ pname = argv[0]; - while ((c = getopt(argc, argv, "vk:H:")) != EOF) { + while ((c = getopt(argc, argv, "vk:H:u:")) != EOF) { switch(c) { case 'v': @@ -109,6 +109,9 @@ hname = optarg; break; + case 'u': + uname = optarg; + break; case 'k': fprintf(stderr, "optarg = %s\n", optarg); count = atoi(optarg); @@ -120,7 +123,7 @@ } } - uname = getlogin(); + if (uname == NULL) uname = getlogin(); if (uname == NULL || *uname == '\0') { setpwent(); if ((pwd = getpwuid(getuid())) != NULL) { diff -Naur sj3-2.0.1.20.orig/dict/dict/Imakefile sj3-2.0.1.20/dict/dict/Imakefile --- sj3-2.0.1.20.orig/dict/dict/Imakefile 1997-01-23 20:20:51.000000000 +0900 +++ sj3-2.0.1.20/dict/dict/Imakefile 2006-09-09 18:59:30.000000000 +0900 @@ -48,7 +48,7 @@ XCOMM INSTFLAGS = -o $(SJ3OWNER) -g $(SJ3GROUP) -m 444 -all: $(OBJS) +all:: $(OBJS) $(OBJS): $(SRCS) $(TOOL_DIR)/$(TOOL_NAME) $(SRCS) $(OBJS) > $(OUTPUT) diff -Naur sj3-2.0.1.20.orig/dict/dict/Makefile sj3-2.0.1.20/dict/dict/Makefile --- sj3-2.0.1.20.orig/dict/dict/Makefile 1970-01-01 09:00:00.000000000 +0900 +++ sj3-2.0.1.20/dict/dict/Makefile 2006-09-09 19:24:49.000000000 +0900 @@ -0,0 +1,52 @@ +# +# @(#)Makefile +# GNU make $BMQ(B +# +# CLI $B%Y!<%9$N>.$5$J%D!<%kN`(B +# (C) Copyright 1998 by Personal Media Corporation +# +# make $B$NJ}K!(B +# $B!&(Bmake +# $B%j%j!<%9MQ$N@5<0HG$r:n@.(B +# $B!&(Bmake mode=debug +# $B%G%P%C%0MQ$K:n@.(B +# $B!&(Bmake clean +# make $B$G:n@.$7$?A4$F$N%U%!%$%k$r:o=|(B +# $B!&(Bmake install +# $B5,Dj$N>l=j$K%$%s%9%H!<%k(B +# + +MACHINE = pcat + +# $B%=!<%9$N0MB84X78%U%!%$%k(B ($B<+F0@8@.(B) +DEPS = Dependencies +DEPENDENCIES_OUTPUT := $(DEPS) + +# $BI8=`%k!<%k(B +include $(BD)/unix/etc/makerules + +#----------------------------------------------------------------------------- +# $B%=!<%9%U%!%$%k$N%5!<%A%Q%9(B +S = ./ + +# $B%=!<%9%U%!%$%k(B +SRC = visual.dic +OBJ = sj3main.dic +OUTPUT = Moutput + +#----------------------------------------------------------------------------- +.PHONY: all install clean + +ALL = $(OBJ) + +all: $(ALL) + +$(OBJ): $(SRC) + echo $(EXE_INSTALLDIR) + sj3mkdic $(SRC) $(OBJ) > $(OUTPUT) + +clean: + $(RM) $(OBJ) $(OUTPUT) + +install: +# XXX diff -Naur sj3-2.0.1.20.orig/dict/tool/Makefile sj3-2.0.1.20/dict/tool/Makefile --- sj3-2.0.1.20.orig/dict/tool/Makefile 1970-01-01 09:00:00.000000000 +0900 +++ sj3-2.0.1.20/dict/tool/Makefile 2006-09-09 19:13:16.000000000 +0900 @@ -0,0 +1,80 @@ +# +# @(#)Makefile +# GNU make 用 +# +# CLI ベースの小さなツール類 +# (C) Copyright 1998 by Personal Media Corporation +# +# make の方法 +# ・make +# リリース用の正式版を作成 +# ・make mode=debug +# デバッグ用に作成 +# ・make clean +# make で作成した全てのファイルを削除 +# ・make install +# 規定の場所にインストール +# + +MACHINE = pcat + +# ソースの依存関係ファイル (自動生成) +DEPS = Dependencies +DEPENDENCIES_OUTPUT := $(DEPS) + +# 標準ルール +include $(BD)/unix/etc/makerules + +#----------------------------------------------------------------------------- +TARGET = sj3mkdic + +# ソースファイルのサーチパス +S = ./ +VPATH = $S +HEADER += $(S) ../include ../../include + +# ソースファイル +SRC = char.c cnvhinsi.c file.c global.c hindo.c knjcvt.c \ + makedict.c makelist.c makeseg.c memory.c offset.c \ + readline.c string.c + +OBJ = $(addsuffix .o, $(basename $(SRC))) +WC_SRC = $(filter %.C, $(SRC)) + +# 追加ライブラリ +#LOADLIBES = -lapp + +# コンパイルオプション +ifneq ($(mode), debug) +# CFLAGS += -Wall +endif + +#----------------------------------------------------------------------------- +.PHONY: all install clean + +ALL = $(TARGET) $(addsuffix .map, $(TARGET)) + +all: $(ALL) + +$(TARGET): $(OBJ) + $(LINK.o) $(LDOBJS) $^ $(LOADLIBES) $(LDLIBS) $(OUTPUT_OPTION) + +clean: + $(RM) $(OBJ) $(WC_SRC:%.C=%.c) $(ALL) $(DEPS) + +install: $(addprefix $(EXE_INSTALLDIR)/, $(ALL)) + +$(TARGET:%=$(EXE_INSTALLDIR)/%): $(EXE_INSTALLDIR)/%: % + $(EXE_INSTALL_STRIP) + +# ソースの依存関係 +$(WC_SRC:%.C=%.c): + +$(OBJ): + +ifdef DEPENDENCIES_OUTPUT + $(DEPS): ; touch $(DEPS) +else + $(DEPS): $(SRC) ; $(MAKEDEPS) $@ $? +endif +include $(DEPS) diff -Naur sj3-2.0.1.20.orig/include/Paths.h sj3-2.0.1.20/include/Paths.h --- sj3-2.0.1.20.orig/include/Paths.h 1970-01-01 09:00:00.000000000 +0900 +++ sj3-2.0.1.20/include/Paths.h 2006-09-09 19:34:23.000000000 +0900 @@ -0,0 +1,49 @@ +/* + * Copyright (c) 1997 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. + * + */ + +/* + * $SonyRCSfile: Paths.h.in,v $ + * $SonyRevision: 1.1 $ + * $SonyDate: 1997/01/23 11:20:55 $ + */ + +#define ErrorOutFile "/dev/console" + +#define SocketName "/tmp/sj3sock" +#define LockFile "/tmp/SJ3SERV.EXIST" + +#define MainDictionary "sj3main.dic" +#define UserDictionary "private.dic" +#define StudyFile "study.dat" +#define RunCmdFile "/usr/local/lib/sj3/serverrc" +#define DictRootDir "/usr/local/lib/sj3/dict" + +#define DEFRKFILE "/usr/local/lib/sj3/sjrk" +#define DEFRCFILE "/usr/local/lib/sj3/sjrc" +#define DEFKEYFILE "/usr/local/lib/sj3/cvtkey." diff -Naur sj3-2.0.1.20.orig/kanakan/Makefile sj3-2.0.1.20/kanakan/Makefile --- sj3-2.0.1.20.orig/kanakan/Makefile 1970-01-01 09:00:00.000000000 +0900 +++ sj3-2.0.1.20/kanakan/Makefile 2006-09-09 19:42:51.000000000 +0900 @@ -0,0 +1,88 @@ +# +# @(#)Makefile +# GNU make 用 +# +# CLI ベースの小さなツール類 +# (C) Copyright 1998 by Personal Media Corporation +# +# make の方法 +# ・make +# リリース用の正式版を作成 +# ・make mode=debug +# デバッグ用に作成 +# ・make clean +# make で作成した全てのファイルを削除 +# ・make install +# 規定の場所にインストール +# + +MACHINE = pcat + +# ソースの依存関係ファイル (自動生成) +DEPS = Dependencies +DEPENDENCIES_OUTPUT := $(DEPS) + +# 標準ルール +include $(BD)/unix/etc/makerules + +#----------------------------------------------------------------------------- +TARGET = libkanakan.a + +# ソースファイルのサーチパス +S = ./ +VPATH = $S +HEADER += $(S) ../include + +# ソースファイル +SRC = adddic.c addelcmn.c alloc.c charsize.c chrtbl.c cl2knj.c \ + clstudy.c cmpstr.c conjunc.c connect.c cvtclknj.c cvtdict.c \ + cvtkanji.c deldic.c depend.c dict.c functbl.c fuzoku.c \ + fzkyomi.c getkanji.c getrank.c global.c hzstrlen.c init.c \ + istrcmp.c memcpy.c memory.c memset.c mk2claus.c mkbunset.c \ + mkjiritu.c mkkouho.c mknumber.c mvmemd.c mvmemi.c peepdic.c \ + ph2knj.c ph_khtbl.c priority.c prtytbl.c s2ctbl.c selclrec.c \ + selsuuji.c setconj.c setjrec.c setkouho.c setubi.c sj2code.c \ + skiphblk.c skipkstr.c srchdict.c srchhead.c srchidx.c srchnum.c \ + sstrcmp.c sstrlen.c sstrncmp.c stbtbl.c stttbl.c study.c \ + suujitbl.c terminat.c termtbl.c wakachi.c + +OBJ = $(addsuffix .o, $(basename $(SRC))) +WC_SRC = $(filter %.C, $(SRC)) + +# コンパイルオプション +ifneq ($(mode), debug) +# CFLAGS += -Wall +endif + +#----------------------------------------------------------------------------- +.PHONY: all install clean + +ALL = $(TARGET) +AR = $(GNUi386)/bin/ar clq + +all: $(ALL) + +$(TARGET): $(OBJ) + $(RM) $@ + $(AR) $@ $(OBJ) + $(RANLIB) $@ + +clean: + $(RM) $(OBJ) $(WC_SRC:%.C=%.c) $(ALL) $(DEPS) + +install: $(addprefix $(EXE_INSTALLDIR)/, $(ALL)) + +$(TARGET:%=$(EXE_INSTALLDIR)/%): $(EXE_INSTALLDIR)/%: % + $(EXE_INSTALL_STRIP) + +# ソースの依存関係 +$(WC_SRC:%.C=%.c): + +$(OBJ): + +ifdef DEPENDENCIES_OUTPUT + $(DEPS): ; touch $(DEPS) +else + $(DEPS): $(SRC) ; $(MAKEDEPS) $@ $? +endif +include $(DEPS) diff -Naur sj3-2.0.1.20.orig/kanakan/clq sj3-2.0.1.20/kanakan/clq --- sj3-2.0.1.20.orig/kanakan/clq 1970-01-01 09:00:00.000000000 +0900 +++ sj3-2.0.1.20/kanakan/clq 2006-09-09 19:42:37.000000000 +0900 @@ -0,0 +1 @@ +! diff -Naur sj3-2.0.1.20.orig/server/Makefile sj3-2.0.1.20/server/Makefile --- sj3-2.0.1.20.orig/server/Makefile 1970-01-01 09:00:00.000000000 +0900 +++ sj3-2.0.1.20/server/Makefile 2006-09-11 20:32:00.000000000 +0900 @@ -0,0 +1,82 @@ +# +# @(#)Makefile +# GNU make 用 +# +# CLI ベースの小さなツール類 +# (C) Copyright 1998 by Personal Media Corporation +# +# make の方法 +# ・make +# リリース用の正式版を作成 +# ・make mode=debug +# デバッグ用に作成 +# ・make clean +# make で作成した全てのファイルを削除 +# ・make install +# 規定の場所にインストール +# + +MACHINE = pcat + +# ソースの依存関係ファイル (自動生成) +DEPS = Dependencies +DEPENDENCIES_OUTPUT := $(DEPS) + +# 標準ルール +include $(BD)/unix/etc/makerules + +#----------------------------------------------------------------------------- +TARGET = sj3serv + +# ソースファイルのサーチパス +S = ./ ../sj3lib +VPATH = $S +HEADER += $(S) ../include +LIBDIR += ../kanakan + +# ソースファイル +SRC = comuni.c error.c execute.c main_brightv.c setup.c \ + time_stamp.c version.c string.c + +OBJ = $(addsuffix .o, $(basename $(SRC))) +WC_SRC = $(filter %.C, $(SRC)) + +# 追加ライブラリ +LOADLIBES = -lkanakan + +# コンパイルオプション +ifneq ($(mode), debug) +# CFLAGS += -Wall +endif + +CFLAGS += -D__BRIGHTV__ + +#----------------------------------------------------------------------------- +.PHONY: all install clean + +ALL = $(TARGET) $(addsuffix .map, $(TARGET)) + +all: $(ALL) + +$(TARGET): $(OBJ) + $(LINK.o) $(LDOBJS) $^ $(LOADLIBES) $(LDLIBS) $(OUTPUT_OPTION) + +clean: + $(RM) $(OBJ) $(WC_SRC:%.C=%.c) $(ALL) $(DEPS) + +install: $(addprefix $(EXE_INSTALLDIR)/, $(ALL)) + +$(TARGET:%=$(EXE_INSTALLDIR)/%): $(EXE_INSTALLDIR)/%: % + $(EXE_INSTALL_STRIP) + +# ソースの依存関係 +$(WC_SRC:%.C=%.c): + +$(OBJ): + +ifdef DEPENDENCIES_OUTPUT + $(DEPS): ; touch $(DEPS) +else + $(DEPS): $(SRC) ; $(MAKEDEPS) $@ $? +endif +include $(DEPS) diff -Naur sj3-2.0.1.20.orig/server/comuni.c sj3-2.0.1.20/server/comuni.c --- sj3-2.0.1.20.orig/server/comuni.c 1998-01-14 14:52:47.000000000 +0900 +++ sj3-2.0.1.20/server/comuni.c 2006-09-11 20:25:05.000000000 +0900 @@ -110,6 +110,12 @@ static int getpos = 0; +#if defined(__BRIGHTV__) +int shutdown(int s, int how) +{ + return 0; /* do nothing */ +} +#endif socket_init() { diff -Naur sj3-2.0.1.20.orig/sj3/Makefile sj3-2.0.1.20/sj3/Makefile --- sj3-2.0.1.20.orig/sj3/Makefile 1970-01-01 09:00:00.000000000 +0900 +++ sj3-2.0.1.20/sj3/Makefile 2006-09-11 20:03:36.000000000 +0900 @@ -0,0 +1,85 @@ +# +# @(#)Makefile +# GNU make 用 +# +# CLI ベースの小さなツール類 +# (C) Copyright 1998 by Personal Media Corporation +# +# make の方法 +# ・make +# リリース用の正式版を作成 +# ・make mode=debug +# デバッグ用に作成 +# ・make clean +# make で作成した全てのファイルを削除 +# ・make install +# 規定の場所にインストール +# + +MACHINE = pcat + +# ソースの依存関係ファイル (自動生成) +DEPS = Dependencies +DEPENDENCIES_OUTPUT := $(DEPS) + +# 標準ルール +include $(BD)/unix/etc/makerules + +#----------------------------------------------------------------------------- +TARGET = sj3serv + +# ソースファイルのサーチパス +S = ./ ../sj3rkcv +VPATH = $S +HEADER += $(S) ../include ../sj3h ../sj3lib +LIBDIR += ../sj3lib + +# ソースファイル +SRC = nmttyslot.c +SRC += conv.c display.c funckey.c eucmessage.c sj3.c sj3ver.c \ + sjgetchar.c term.c +SRC += version.c stat_conv.c henkan.c romaji.c code.c etc.c \ + toroku.c edit.c douon.c sjrc.c kigou.c common.c \ + screen.c libif.c +SRC += rk_conv.c sj3_rkcv.c wc16_str.c + +OBJ = $(addsuffix .o, $(basename $(SRC))) +WC_SRC = $(filter %.C, $(SRC)) + +# 追加ライブラリ +LOADLIBES = -lsj3lib + +# コンパイルオプション +ifneq ($(mode), debug) +# CFLAGS += -Wall +endif + +#----------------------------------------------------------------------------- +.PHONY: all install clean + +ALL = $(TARGET) $(addsuffix .map, $(TARGET)) + +all: $(ALL) + +$(TARGET): $(OBJ) + $(LINK.o) $(LDOBJS) $^ $(LOADLIBES) $(LDLIBS) $(OUTPUT_OPTION) + +clean: + $(RM) $(OBJ) $(WC_SRC:%.C=%.c) $(ALL) $(DEPS) + +install: $(addprefix $(EXE_INSTALLDIR)/, $(ALL)) + +$(TARGET:%=$(EXE_INSTALLDIR)/%): $(EXE_INSTALLDIR)/%: % + $(EXE_INSTALL_STRIP) + +# ソースの依存関係 +$(WC_SRC:%.C=%.c): + +$(OBJ): + +ifdef DEPENDENCIES_OUTPUT + $(DEPS): ; touch $(DEPS) +else + $(DEPS): $(SRC) ; $(MAKEDEPS) $@ $? +endif +include $(DEPS) diff -Naur sj3-2.0.1.20.orig/sj3dic/Makefile sj3-2.0.1.20/sj3dic/Makefile --- sj3-2.0.1.20.orig/sj3dic/Makefile 1970-01-01 09:00:00.000000000 +0900 +++ sj3-2.0.1.20/sj3dic/Makefile 2006-09-11 20:02:34.000000000 +0900 @@ -0,0 +1,80 @@ +# +# @(#)Makefile +# GNU make 用 +# +# CLI ベースの小さなツール類 +# (C) Copyright 1998 by Personal Media Corporation +# +# make の方法 +# ・make +# リリース用の正式版を作成 +# ・make mode=debug +# デバッグ用に作成 +# ・make clean +# make で作成した全てのファイルを削除 +# ・make install +# 規定の場所にインストール +# + +MACHINE = pcat + +# ソースの依存関係ファイル (自動生成) +DEPS = Dependencies +DEPENDENCIES_OUTPUT := $(DEPS) + +# 標準ルール +include $(BD)/unix/etc/makerules + +#----------------------------------------------------------------------------- +TARGET = sj3dic + +# ソースファイルのサーチパス +S = ./ +VPATH = $S +HEADER += $(S) ../include ../sj3lib +LIBDIR += ../sj3lib + +# ソースファイル +SRC = codecnv.c dictdisp.c dictmake.c hinsi.c sj3dic.c \ + sj3err.c sjrc.c + +OBJ = $(addsuffix .o, $(basename $(SRC))) +WC_SRC = $(filter %.C, $(SRC)) + +# 追加ライブラリ +LOADLIBES = -lsj3lib + +# コンパイルオプション +ifneq ($(mode), debug) +# CFLAGS += -Wall +endif + +#----------------------------------------------------------------------------- +.PHONY: all install clean + +ALL = $(TARGET) $(addsuffix .map, $(TARGET)) + +all: $(ALL) + +$(TARGET): $(OBJ) + $(LINK.o) $(LDOBJS) $^ $(LOADLIBES) $(LDLIBS) $(OUTPUT_OPTION) + +clean: + $(RM) $(OBJ) $(WC_SRC:%.C=%.c) $(ALL) $(DEPS) + +install: $(addprefix $(EXE_INSTALLDIR)/, $(ALL)) + +$(TARGET:%=$(EXE_INSTALLDIR)/%): $(EXE_INSTALLDIR)/%: % + $(EXE_INSTALL_STRIP) + +# ソースの依存関係 +$(WC_SRC:%.C=%.c): + +$(OBJ): + +ifdef DEPENDENCIES_OUTPUT + $(DEPS): ; touch $(DEPS) +else + $(DEPS): $(SRC) ; $(MAKEDEPS) $@ $? +endif +include $(DEPS) diff -Naur sj3-2.0.1.20.orig/sj3lib/Makefile sj3-2.0.1.20/sj3lib/Makefile --- sj3-2.0.1.20.orig/sj3lib/Makefile 1970-01-01 09:00:00.000000000 +0900 +++ sj3-2.0.1.20/sj3lib/Makefile 2006-09-11 20:10:21.000000000 +0900 @@ -0,0 +1,80 @@ +# +# @(#)Makefile +# GNU make 用 +# +# CLI ベースの小さなツール類 +# (C) Copyright 1998 by Personal Media Corporation +# +# make の方法 +# ・make +# リリース用の正式版を作成 +# ・make mode=debug +# デバッグ用に作成 +# ・make clean +# make で作成した全てのファイルを削除 +# ・make install +# 規定の場所にインストール +# + +MACHINE = pcat + +# ソースの依存関係ファイル (自動生成) +DEPS = Dependencies +DEPENDENCIES_OUTPUT := $(DEPS) + +# 標準ルール +include $(BD)/unix/etc/makerules + +#----------------------------------------------------------------------------- +TARGET = libsj3lib.a + +# ソースファイルのサーチパス +S = ./ +VPATH = $S +HEADER += $(S) ../include ../sj3h + +# ソースファイル +SRC = level1.c sj.c string.c + +OBJ = $(addsuffix .o, $(basename $(SRC))) +WC_SRC = $(filter %.C, $(SRC)) + +# コンパイルオプション +ifneq ($(mode), debug) +# CFLAGS += -Wall +endif + +CFLAGS += -D__BRIGHTV__ + +#----------------------------------------------------------------------------- +.PHONY: all install clean + +ALL = $(TARGET) +AR = $(GNUi386)/bin/ar clq + +all: $(ALL) + +$(TARGET): $(OBJ) + $(RM) $@ + $(AR) $@ $(OBJ) + $(RANLIB) $@ + +clean: + $(RM) $(OBJ) $(WC_SRC:%.C=%.c) $(ALL) $(DEPS) + +install: $(addprefix $(EXE_INSTALLDIR)/, $(ALL)) + +$(TARGET:%=$(EXE_INSTALLDIR)/%): $(EXE_INSTALLDIR)/%: % + $(EXE_INSTALL_STRIP) + +# ソースの依存関係 +$(WC_SRC:%.C=%.c): + +$(OBJ): + +ifdef DEPENDENCIES_OUTPUT + $(DEPS): ; touch $(DEPS) +else + $(DEPS): $(SRC) ; $(MAKEDEPS) $@ $? +endif +include $(DEPS) diff -Naur sj3-2.0.1.20.orig/sj3lib/level1.c sj3-2.0.1.20/sj3lib/level1.c --- sj3-2.0.1.20.orig/sj3lib/level1.c 1995-04-17 19:36:23.000000000 +0900 +++ sj3-2.0.1.20/sj3lib/level1.c 2006-09-11 20:11:35.000000000 +0900 @@ -113,6 +113,10 @@ if ((j = write(server_fd, p, i)) <= 0) { t_sndrel(server_fd); close(server_fd); +#elif defined(__BRIGHTV__) + if ((j = write(server_fd, p, i)) <= 0) { + /* shutdown(server_fd, 2); */ + close(server_fd); #else if ((j = write(server_fd, p, i)) <= 0) { shutdown(server_fd, 2); @@ -210,6 +214,9 @@ if (getlen <=0) { #ifdef TLI t_close(server_fd); +#elif defined(__BRIGHTV__) + /* shutdown(server_fd, 2); */ + close(server_fd); #else shutdown(server_fd, 2); close(server_fd); @@ -303,7 +310,7 @@ } len = strlen(sunix.sun_path)+sizeof(sunix.sun_family); -#if defined(__NetBSD__) || defined(__FreeBSD__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__BRIGHTV__) len += sizeof(sunix.sun_len); #endif if (connect(fd, (struct sockaddr *)&sunix, len) diff -Naur sj3-2.0.1.20.orig/sj3stat/Makefile sj3-2.0.1.20/sj3stat/Makefile --- sj3-2.0.1.20.orig/sj3stat/Makefile 1970-01-01 09:00:00.000000000 +0900 +++ sj3-2.0.1.20/sj3stat/Makefile 2006-09-09 23:01:28.000000000 +0900 @@ -0,0 +1,79 @@ +# +# @(#)Makefile +# GNU make 用 +# +# CLI ベースの小さなツール類 +# (C) Copyright 1998 by Personal Media Corporation +# +# make の方法 +# ・make +# リリース用の正式版を作成 +# ・make mode=debug +# デバッグ用に作成 +# ・make clean +# make で作成した全てのファイルを削除 +# ・make install +# 規定の場所にインストール +# + +MACHINE = pcat + +# ソースの依存関係ファイル (自動生成) +DEPS = Dependencies +DEPENDENCIES_OUTPUT := $(DEPS) + +# 標準ルール +include $(BD)/unix/etc/makerules + +#----------------------------------------------------------------------------- +TARGET = sj3stat + +# ソースファイルのサーチパス +S = ./ +VPATH = $S +HEADER += $(S) ../include ../sj3lib +LIBDIR += ../sj3lib + +# ソースファイル +SRC = sj3stat.c + +OBJ = $(addsuffix .o, $(basename $(SRC))) +WC_SRC = $(filter %.C, $(SRC)) + +# 追加ライブラリ +LOADLIBES = -lsj3lib + +# コンパイルオプション +ifneq ($(mode), debug) +# CFLAGS += -Wall +endif + +#----------------------------------------------------------------------------- +.PHONY: all install clean + +ALL = $(TARGET) $(addsuffix .map, $(TARGET)) + +all: $(ALL) + +$(TARGET): $(OBJ) + $(LINK.o) $(LDOBJS) $^ $(LOADLIBES) $(LDLIBS) $(OUTPUT_OPTION) + +clean: + $(RM) $(OBJ) $(WC_SRC:%.C=%.c) $(ALL) $(DEPS) + +install: $(addprefix $(EXE_INSTALLDIR)/, $(ALL)) + +$(TARGET:%=$(EXE_INSTALLDIR)/%): $(EXE_INSTALLDIR)/%: % + $(EXE_INSTALL_STRIP) + +# ソースの依存関係 +$(WC_SRC:%.C=%.c): + +$(OBJ): + +ifdef DEPENDENCIES_OUTPUT + $(DEPS): ; touch $(DEPS) +else + $(DEPS): $(SRC) ; $(MAKEDEPS) $@ $? +endif +include $(DEPS)