diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/ChangeLog.dos eb-4.0beta2.dos0.07/ChangeLog.dos *** eb-4.0beta2/ChangeLog.dos Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/ChangeLog.dos Thu Oct 30 01:16:49 2003 *************** *** 0 **** --- 1,35 ---- + 2003-10-30 Takashi Nemoto + + * export booklist related functions for windows dll + + 2003-10-04 Takashi Nemoto + + * add packaging code for Mac OS X + * modify packaging code for Zaurus Linux + + 2003-09-21 Takashi Nemoto + + * apply bug fix patch [ndtpd 01850] + + 2003-09-04 Takashi Nemoto + + * eb-4.0beta2 base + + 2003-09-03 Takashi Nemoto + + * eb-4.0beta1 base + + 2003-07-05 Takashi Nemoto + + * zaurus.cnt : change version code + + 2003-07-04 Takashi Nemoto + + * zaurus.sh, zaurus.cnt : new file + + 2003-07-03 Takashi Nemoto + + * eb/book.c : Add misleaded book + -------------------------------------- + DOS Version 0.7 + empty log message diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/Makefile.am eb-4.0beta2.dos0.07/Makefile.am *** eb-4.0beta2/Makefile.am Sat Aug 30 12:03:16 2003 --- eb-4.0beta2.dos0.07/Makefile.am Sat Oct 4 03:47:13 2003 *************** *** 12,22 **** SAMPLES_SUBDIR = endif ! SUBDIRS = $(ZLIB_SUBDIR) eb libebutils ebappendix ebfont ebinfo \ ebrefile ebstopcode ebzip doc doc-ja po-eb po-ebutils m4 $(SAMPLES_SUBDIR) EXTRA_DIST = ChangeLog.0 ChangeLog.1 INSTALL-ja README-ja move-if-change \ ! eb.conf.in gttest.mo gttest.po misc/ebfixlog misc/ebdump CLEANFILES = eb.conf appendixdir = $(pkgdatadir)/appendix --- 12,24 ---- SAMPLES_SUBDIR = endif ! SUBDIRS = $(ZLIB_SUBDIR) eb libebutils ebappendix ebfont ebinfo dos \ ebrefile ebstopcode ebzip doc doc-ja po-eb po-ebutils m4 $(SAMPLES_SUBDIR) EXTRA_DIST = ChangeLog.0 ChangeLog.1 INSTALL-ja README-ja move-if-change \ ! eb.conf.in gttest.mo gttest.po misc/ebfixlog misc/ebdump \ ! ChangeLog.dos zaurus.cnt zaurus.sh eb.spec eb.spec.in eb.spec.in.in \ ! mac.sh CLEANFILES = eb.conf appendixdir = $(pkgdatadir)/appendix diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/configure.ac eb-4.0beta2.dos0.07/configure.ac *** eb-4.0beta2/configure.ac Wed Sep 3 20:29:49 2003 --- eb-4.0beta2.dos0.07/configure.ac Thu Sep 4 02:23:16 2003 *************** *** 1,7 **** dnl * dnl * Process this file with autoconf to produce a configure script. dnl * ! AC_INIT(eb, 4.0beta2) AC_CONFIG_SRCDIR(eb/eb.c) AC_PREREQ(2.54) AM_INIT_AUTOMAKE --- 1,7 ---- dnl * dnl * Process this file with autoconf to produce a configure script. dnl * ! AC_INIT(eb, 4.0beta2.dos0.07) AC_CONFIG_SRCDIR(eb/eb.c) AC_PREREQ(2.54) AM_INIT_AUTOMAKE *************** *** 341,351 **** --- 341,364 ---- AC_SUBST(EBCONF_EBLIBS) dnl * + dnl * for snapshot + dnl * + AC_ARG_ENABLE(snapshot, + [ --enable-snapshot distribute as snapshot], + SNAPDATE=`date +'%Y%m%d'` + AC_SUBST(SNAPDATE) + sed -e '/^#s/d' -e 's/^#S//' eb.spec.in.in > eb.spec.in + , + sed -e '/^#S/d' -e 's/^#s//' eb.spec.in.in > eb.spec.in + ) + + dnl * dnl * Output Files. dnl * AC_CONFIG_HEADER(config.h) AC_CONFIG_FILES([Makefile eb/Makefile libebutils/Makefile ebappendix/Makefile ebfont/Makefile ebinfo/Makefile ebrefile/Makefile ebstopcode/Makefile ebzip/Makefile doc/Makefile doc-ja/Makefile po-eb/Makefile + dos/Makefile dos/config.h eb/build-post.h eb/defs.h eb.spec po-ebutils/Makefile m4/Makefile samples/Makefile]) AC_OUTPUT diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/depcomp eb-4.0beta2.dos0.07/depcomp *** eb-4.0beta2/depcomp Sun Jun 15 20:36:06 2003 --- eb-4.0beta2.dos0.07/depcomp Thu Oct 30 02:00:22 2003 *************** *** 206,241 **** rm -f "$tmpdepfile" ;; - icc) - # Must come before tru64. - - # Intel's C compiler understands `-MD -MF file'. However - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" - rm -f "$tmpdepfile" - ;; - tru64) # The Tru64 compiler uses -MD to generate dependencies as a side # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. --- 206,211 ---- *************** *** 295,301 **** shift fi ! # Remove `-o $object'. IFS=" " for arg do --- 265,273 ---- shift fi ! # Remove `-o $object'. We will use -o /dev/null later, ! # however we can't do the remplacement now because ! # `-o $object' might simply not be used IFS=" " for arg do *************** *** 315,325 **** done test -z "$dashmflag" && dashmflag=-M ! # Require at least two characters before searching for `:' ! # in the target name. This is to cope with DOS-style filenames: ! # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. ! "$@" $dashmflag | ! sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" tr ' ' ' --- 287,293 ---- done test -z "$dashmflag" && dashmflag=-M ! "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" tr ' ' ' *************** *** 338,350 **** makedepend) "$@" || exit $? - # Remove any Libtool call - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi # X makedepend shift cleared=no --- 306,311 ---- *************** *** 357,365 **** case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; ! # Strip any option that makedepend may not understand. Remove ! # the object too, otherwise makedepend will parse it as a source file. ! -*|$object) ;; *) set fnord "$@" "$arg"; shift ;; --- 318,324 ---- case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; ! -*) ;; *) set fnord "$@" "$arg"; shift ;; diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc/version-ebfont.texi eb-4.0beta2.dos0.07/doc/version-ebfont.texi *** eb-4.0beta2/doc/version-ebfont.texi Wed Sep 3 20:32:48 2003 --- eb-4.0beta2.dos0.07/doc/version-ebfont.texi Wed Sep 3 23:30:40 2003 *************** *** 1,4 **** @set UPDATED 30 August 2003 @set UPDATED-MONTH August 2003 ! @set EDITION 4.0beta2 ! @set VERSION 4.0beta2 --- 1,4 ---- @set UPDATED 30 August 2003 @set UPDATED-MONTH August 2003 ! @set EDITION 4.0beta2.dos0.07 ! @set VERSION 4.0beta2.dos0.07 diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc/version-ebinfo.texi eb-4.0beta2.dos0.07/doc/version-ebinfo.texi *** eb-4.0beta2/doc/version-ebinfo.texi Wed Sep 3 20:32:48 2003 --- eb-4.0beta2.dos0.07/doc/version-ebinfo.texi Wed Sep 3 23:30:39 2003 *************** *** 1,4 **** @set UPDATED 30 August 2003 @set UPDATED-MONTH August 2003 ! @set EDITION 4.0beta2 ! @set VERSION 4.0beta2 --- 1,4 ---- @set UPDATED 30 August 2003 @set UPDATED-MONTH August 2003 ! @set EDITION 4.0beta2.dos0.07 ! @set VERSION 4.0beta2.dos0.07 diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc/version-ebrefile.texi eb-4.0beta2.dos0.07/doc/version-ebrefile.texi *** eb-4.0beta2/doc/version-ebrefile.texi Wed Sep 3 20:32:48 2003 --- eb-4.0beta2.dos0.07/doc/version-ebrefile.texi Wed Sep 3 23:30:39 2003 *************** *** 1,4 **** @set UPDATED 30 August 2003 @set UPDATED-MONTH August 2003 ! @set EDITION 4.0beta2 ! @set VERSION 4.0beta2 --- 1,4 ---- @set UPDATED 30 August 2003 @set UPDATED-MONTH August 2003 ! @set EDITION 4.0beta2.dos0.07 ! @set VERSION 4.0beta2.dos0.07 diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc/version-ebstopcode.texi eb-4.0beta2.dos0.07/doc/version-ebstopcode.texi *** eb-4.0beta2/doc/version-ebstopcode.texi Wed Sep 3 20:32:48 2003 --- eb-4.0beta2.dos0.07/doc/version-ebstopcode.texi Wed Sep 3 23:30:39 2003 *************** *** 1,4 **** @set UPDATED 30 August 2003 @set UPDATED-MONTH August 2003 ! @set EDITION 4.0beta2 ! @set VERSION 4.0beta2 --- 1,4 ---- @set UPDATED 30 August 2003 @set UPDATED-MONTH August 2003 ! @set EDITION 4.0beta2.dos0.07 ! @set VERSION 4.0beta2.dos0.07 diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc/version-ebzip.texi eb-4.0beta2.dos0.07/doc/version-ebzip.texi *** eb-4.0beta2/doc/version-ebzip.texi Wed Sep 3 20:32:48 2003 --- eb-4.0beta2.dos0.07/doc/version-ebzip.texi Wed Sep 3 23:30:40 2003 *************** *** 1,4 **** @set UPDATED 30 August 2003 @set UPDATED-MONTH August 2003 ! @set EDITION 4.0beta2 ! @set VERSION 4.0beta2 --- 1,4 ---- @set UPDATED 30 August 2003 @set UPDATED-MONTH August 2003 ! @set EDITION 4.0beta2.dos0.07 ! @set VERSION 4.0beta2.dos0.07 diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc-ja/mdate-sh eb-4.0beta2.dos0.07/doc-ja/mdate-sh *** eb-4.0beta2/doc-ja/mdate-sh Sun Jun 15 20:36:08 2003 --- eb-4.0beta2.dos0.07/doc-ja/mdate-sh Thu Oct 30 02:00:18 2003 *************** *** 94,97 **** esac # The result. ! echo "$year 年 $nummonth 月 $day 日" --- 94,97 ---- esac # The result. ! echo $day $month $year diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc-ja/version-eb.texi eb-4.0beta2.dos0.07/doc-ja/version-eb.texi *** eb-4.0beta2/doc-ja/version-eb.texi Wed Sep 3 20:32:54 2003 --- eb-4.0beta2.dos0.07/doc-ja/version-eb.texi Wed Sep 3 23:30:40 2003 *************** *** 1,4 **** ! @set UPDATED 2003 年 8 ! @set UPDATED-MONTH 年 8 ! @set EDITION 4.0beta2 ! @set VERSION 4.0beta2 --- 1,4 ---- ! @set UPDATED 30 August 2003 ! @set UPDATED-MONTH August 2003 ! @set EDITION 4.0beta2.dos0.07 ! @set VERSION 4.0beta2.dos0.07 diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc-ja/version-ebappendix.texi eb-4.0beta2.dos0.07/doc-ja/version-ebappendix.texi *** eb-4.0beta2/doc-ja/version-ebappendix.texi Wed Sep 3 20:32:54 2003 --- eb-4.0beta2.dos0.07/doc-ja/version-ebappendix.texi Wed Sep 3 23:30:40 2003 *************** *** 1,4 **** ! @set UPDATED 2003 年 8 ! @set UPDATED-MONTH 年 8 ! @set EDITION 4.0beta2 ! @set VERSION 4.0beta2 --- 1,4 ---- ! @set UPDATED 24 August 2003 ! @set UPDATED-MONTH August 2003 ! @set EDITION 4.0beta2.dos0.07 ! @set VERSION 4.0beta2.dos0.07 diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc-ja/version-ebfont.texi eb-4.0beta2.dos0.07/doc-ja/version-ebfont.texi *** eb-4.0beta2/doc-ja/version-ebfont.texi Wed Sep 3 20:32:54 2003 --- eb-4.0beta2.dos0.07/doc-ja/version-ebfont.texi Wed Sep 3 23:30:40 2003 *************** *** 1,4 **** ! @set UPDATED 2003 年 8 ! @set UPDATED-MONTH 年 8 ! @set EDITION 4.0beta2 ! @set VERSION 4.0beta2 --- 1,4 ---- ! @set UPDATED 30 August 2003 ! @set UPDATED-MONTH August 2003 ! @set EDITION 4.0beta2.dos0.07 ! @set VERSION 4.0beta2.dos0.07 diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc-ja/version-ebinfo.texi eb-4.0beta2.dos0.07/doc-ja/version-ebinfo.texi *** eb-4.0beta2/doc-ja/version-ebinfo.texi Wed Sep 3 20:32:54 2003 --- eb-4.0beta2.dos0.07/doc-ja/version-ebinfo.texi Wed Sep 3 23:30:40 2003 *************** *** 1,4 **** ! @set UPDATED 2003 年 8 ! @set UPDATED-MONTH 年 8 ! @set EDITION 4.0beta2 ! @set VERSION 4.0beta2 --- 1,4 ---- ! @set UPDATED 30 August 2003 ! @set UPDATED-MONTH August 2003 ! @set EDITION 4.0beta2.dos0.07 ! @set VERSION 4.0beta2.dos0.07 diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc-ja/version-ebrefile.texi eb-4.0beta2.dos0.07/doc-ja/version-ebrefile.texi *** eb-4.0beta2/doc-ja/version-ebrefile.texi Wed Sep 3 20:32:54 2003 --- eb-4.0beta2.dos0.07/doc-ja/version-ebrefile.texi Wed Sep 3 23:30:40 2003 *************** *** 1,4 **** ! @set UPDATED 2003 年 8 ! @set UPDATED-MONTH 年 8 ! @set EDITION 4.0beta2 ! @set VERSION 4.0beta2 --- 1,4 ---- ! @set UPDATED 30 August 2003 ! @set UPDATED-MONTH August 2003 ! @set EDITION 4.0beta2.dos0.07 ! @set VERSION 4.0beta2.dos0.07 diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc-ja/version-ebstopcode.texi eb-4.0beta2.dos0.07/doc-ja/version-ebstopcode.texi *** eb-4.0beta2/doc-ja/version-ebstopcode.texi Wed Sep 3 20:32:54 2003 --- eb-4.0beta2.dos0.07/doc-ja/version-ebstopcode.texi Wed Sep 3 23:30:40 2003 *************** *** 1,4 **** ! @set UPDATED 2003 年 8 ! @set UPDATED-MONTH 年 8 ! @set EDITION 4.0beta2 ! @set VERSION 4.0beta2 --- 1,4 ---- ! @set UPDATED 30 August 2003 ! @set UPDATED-MONTH August 2003 ! @set EDITION 4.0beta2.dos0.07 ! @set VERSION 4.0beta2.dos0.07 diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc-ja/version-ebzip.texi eb-4.0beta2.dos0.07/doc-ja/version-ebzip.texi *** eb-4.0beta2/doc-ja/version-ebzip.texi Wed Sep 3 20:32:54 2003 --- eb-4.0beta2.dos0.07/doc-ja/version-ebzip.texi Wed Sep 3 23:30:40 2003 *************** *** 1,4 **** ! @set UPDATED 2003 年 8 ! @set UPDATED-MONTH 年 8 ! @set EDITION 4.0beta2 ! @set VERSION 4.0beta2 --- 1,4 ---- ! @set UPDATED 30 August 2003 ! @set UPDATED-MONTH August 2003 ! @set EDITION 4.0beta2.dos0.07 ! @set VERSION 4.0beta2.dos0.07 diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/Makefile.am eb-4.0beta2.dos0.07/dos/Makefile.am *** eb-4.0beta2/dos/Makefile.am Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/dos/Makefile.am Wed Sep 3 22:33:01 2003 *************** *** 0 **** --- 1,78 ---- + EXTRA_DIST = codeconv.h codeconv.c ebutils.h libeb.mk ebcmds.mk \ + tgettext.c libintl.h windll.c build.bat config.h.in gen_mo.pl \ + dll.lnk Readme.ja Readme.en ebapp.c + + all: setup + + setup: eb/defs.h ebutils.h build-post.h widefont.c widealt.c + mkdir -p dos + mkdir -p os2 + mkdir -p win + mkdir -p ebu + mkdir -p doc-ja + mkdir -p doc + nkf -s -Lw ../doc-ja/eb-ja.info > doc-ja/eb.txt + nkf -s -Lw ../doc-ja/ebzip-ja.info > doc-ja/ebzip.txt + nkf -s -Lw ../doc-ja/ebinfo-ja.info > doc-ja/ebinfo.txt + nkf -s -Lw ../doc-ja/ebrefile-ja.info > doc-ja/ebrefile.txt + nkf -s -Lw ../doc-ja/ebfont-ja.info > doc-ja/ebfont.txt + nkf -s -Lw ../README-ja > doc-ja/readme.txt + # nkf -s -Lw ../doc/eb.info > doc/eb.txt + nkf -s -Lw ../doc/ebzip.info > doc/ebzip.txt + nkf -s -Lw ../doc/ebinfo.info > doc/ebinfo.txt + nkf -s -Lw ../doc/ebrefile.info > doc/ebrefile.txt + nkf -s -Lw ../doc/ebfont.info > doc/ebfont.txt + nkf -s -Lw ../README > doc/readme.txt + perl gen_mo.pl eb ja eb.ja + perl gen_mo.pl ebutils ja eb_cmds.ja + cd ..; rm -f libebu; ln -s libebutils libebu; cd dos + cd ..; rm -f appendix; ln -s ebappendix appendix; cd dos + cd ../appendix; rm -f appendix.pl ; ln -s ebappendix appendix.pl ;\ + cd ../dos + + eb/defs.h: stamp-defs-h + stamp-defs-h: ../eb/defs.h.in Makefile + mkdir -p eb + rm -f defs.h.tmp + sed -e 's;\@EB_VERSION_MAJOR\@;$(EB_VERSION_MAJOR);' \ + -e 's;\@EB_VERSION_MINOR\@;$(EB_VERSION_MINOR);' \ + ../eb/defs.h.in > defs.h.tmp + $(top_srcdir)/move-if-change defs.h.tmp eb/defs.h + @echo timestamp > stamp-defs-h + + ebutils.h: stamp-ebutils-h + stamp-ebutils-h: ../libebutils/ebutils.h.in Makefile + rm -f ebutils.h.tmp + sed -e 's;\"\@localedir\@\";getenv("LOCALEDIR");' \ + ../libebutils/ebutils.h.in > ebutils.h.tmp + $(top_srcdir)/move-if-change ebutils.h.tmp ebutils.h + @echo timestamp > stamp-ebutils-h + build-post.h: stamp-build-post-h + stamp-build-post-h: ../eb/build-post.h.in Makefile + rm -f build-post.h.tmp + sed -e 's;\"\@localedir\@\";getenv("LOCALEDIR");' \ + ../eb/build-post.h.in > build-post.h.tmp + $(top_srcdir)/move-if-change build-post.h.tmp build-post.h + @echo timestamp > stamp-build-post-h + + widealt.c: stamp-widealt-h + stamp-widealt-h: ../eb/narwalt.c Makefile + rm -f widealt.c.tmp + sed -e s/narrow/wide/g -e s/Narrow/Wide/g -e s/NARROW/WIDE/g \ + ../eb/narwalt.c > widealt.c.tmp + $(top_srcdir)/move-if-change widealt.c.tmp widealt.c + @echo timestamp > stamp-widealt-h + + widefont.c: stamp-widefont-h + stamp-widefont-h: ../eb/narwfont.c Makefile + rm -f widefont.c.tmp + sed -e s/narrow/wide/g -e s/Narrow/Wide/g -e s/NARROW/WIDE/g \ + ../eb/narwfont.c > widefont.c.tmp + $(top_srcdir)/move-if-change widefont.c.tmp widefont.c + @echo timestamp > stamp-widefont-h + + clean: + rm -f libeb.lib *.err *.o *.map *.obj *.exe *~ *.bak ebja.h ebutilja.h wide*.c + rm -f eb*.txt *.LZH + rm -rf os2_32 dos_32 win_32 libebsdk eb + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/Readme.en eb-4.0beta2.dos0.07/dos/Readme.en *** eb-4.0beta2/dos/Readme.en Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/dos/Readme.en Wed Sep 3 22:33:01 2003 *************** *** 0 **** --- 1,11 ---- + eb-3.2.2 + many onofficial patches + You can use, copy and modify under GPL. + Please read "COPYING" file for more detail. + + Environment variable "LANG" should be defined as "en_US" + if you can't understand japanese. + Altanativly, remove the "eb.ja" and "eb_cmds.ja" files + if you don't need messages written in japanese. + + The "ebappendix" is renamed as "appendix.pl" because of + the restriction of DOS file name syntax. diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/Readme.ja eb-4.0beta2.dos0.07/dos/Readme.ja *** eb-4.0beta2/dos/Readme.ja Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/dos/Readme.ja Wed Sep 3 22:33:01 2003 *************** *** 0 **** --- 1,12 ---- + eb-3.2.2 + dos $BMQ%Q%C%A(B + $B%Q%C%A$$$C$Q$$(B + $B;HMQ>r7o!":FG[I[>r7o$O%*%j%8%J%k$K=>$$(B GPL $B$G$9!#(B + $B>\$7$/$O(B copying $B%U%!%$%k$r8+$F2<$5$$!#(B + + eb.ja, eb_cmds.ja $B%U%!%$%k$O$N%3!<%I$rMxMQ$9$k$K$O!"(B + $B4D6-JQ?t(B LANG $B$K(B "ja_JP.EUC-JP" $B$N$h$&$K;XDj$7$F2<$5$$!#(B + + $B$J$*(B ebappendix $B%3%^%s%I$O(B DOS $B$N%U%!%$%kL>$N@)8B$K(B + $B$h$j(B appendix.pl $B$H$$$&L>A0$G<}O?$5$l$F$$$^$9!#(B + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/build.bat eb-4.0beta2.dos0.07/dos/build.bat *** eb-4.0beta2/dos/build.bat Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/dos/build.bat Thu Oct 30 01:09:40 2003 *************** *** 0 **** --- 1,85 ---- + @echo off + rem This batch file is made for command shell on Win NT series. + rem Usage : + rem build.bat [cmd] [lib] [arc] + rem build.bat all + rem build.bat clean + + set sys=dos os2 win + :set sys=win + + mkdir eb + mkdir ebu + for %%i in (%sys%) do mkdir tmp-%%i + for %%i in (%sys%) do mkdir %%i + + if '%1' == 'clean' goto clean + + copy ..\*.h ebu + copy ..\zlib\*.h ebu + copy ..\eb\*.h eb + del ..\eb\build-post.h + copy ..\libebutils\*.h ebu + copy codeconv.h eb + + if '%1' == 'all' goto lib1 + if not '%1' == 'lib' goto cmd + shift + :lib1 + + for %%i in (%sys%) do ( + cd tmp-%%i + wmake -f ..\libeb.mk sys=%%i all + cd .. + ) + + :cmd + if '%1' == 'all' goto cmd1 + if not '%1' == 'cmd' goto arc + shift + :cmd1 + + for %%i in (%sys%) do ( + cd tmp-%%i + wmake -f ..\ebcmds.mk sys=%%i + cd .. + ) + + :arc + if '%1' == 'all' goto arc2 + if not '%1' == 'arc' goto exit + shift + :arc2 + + del *.lzh + copy ..\copying doc + copy Readme.ja doc + copy Readme.en doc + for %%i in (%sys%) do ( + lha a /r2x1 eb-%%i.lzh %%i + ) + REN EB-DOS.LZH EB-D32.LZH + REN EB-OS2.LZH EB-O32.LZH + REN EB-WIN.LZH EB-W32.LZH + + lha a /r2x1 eb-sdk.lzh eb\appendix.h eb\binary.h eb\defs.h eb\eb.h eb\error.h eb\font.h eb\text.h eb\zio.h lib\eb*.lib + lha a /r2x1 eb-doc.lzh doc + lha a /r2x1 eb-docja.lzh doc-ja + + goto exit + + + :clean + cd tmp-dos + wmake -f ..\libeb.mk sys=dos clean + cd ..\tmp-win + wmake -f ..\libeb.mk sys=win clean + cd ..\tmp-os2 + wmake -f ..\libeb.mk sys=win clean + cd .. + + :exit + ECHO Done. + set sys= + + :exit2 diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/codeconv.c eb-4.0beta2.dos0.07/dos/codeconv.c *** eb-4.0beta2/dos/codeconv.c Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/dos/codeconv.c Wed Sep 3 22:33:01 2003 *************** *** 0 **** --- 1,864 ---- + /* + * codeconv.c + * Copyright(c) 2001 Takashi NEMOTO + * + * 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 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Written by Takashi Nemoto (tnemoto@mvi.biglobe.ne.jp). + * Modified by Kazuhiko + * Modified by Satomi + * + */ + + /* #define DEBUG_CODECONV */ + + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + + #include "codeconv.h" + + #if defined(USE_CODECONV) && defined(__WATCOMC__) && defined(__WINDOWS_386__) + /* dummy code to link floating point library */ + static void dummy(void) { + printf("%4.1f",0.1); + } + #endif + + #ifdef HAVE_SYS_TYPES_H + # include + #endif + + #include + + #ifdef HAVE_STDLIB_H + # include + #endif + + #ifdef HAVE_LOCALE_H + # include + #endif + + #ifdef HAVE_ICONV_H + # include + #endif + + #ifdef HAVE_ERRNO_H + # include + #endif + + #ifdef HAVE_STRING_H + # include + #endif + + #ifdef HAVE_LANGINFO_H + #include + #endif + + #ifdef HAVE_MALLOC_H + #include + #endif + + #ifndef HAVE_MEMCPY + #define memcpy(d, s, n) bcopy((s), (d), (n)) + #ifdef __STDC__ + void *memchr(const void *, int, size_t); + int memcmp(const void *, const void *, size_t); + void *memmove(void *, const void *, size_t); + void *memset(void *, int, size_t); + #else /* not __STDC__ */ + char *memchr(); + int memcmp(); + char *memmove(); + char *memset(); + #endif /* not __STDC__ */ + #endif + + #ifdef HAVE_ICONV + static iconv_t cur_to_euc = (iconv_t)-1; + static iconv_t euc_to_cur = (iconv_t)-1; + static const char *eucjp_code_name = NULL; + #endif + + /* Return code <0: error, -2: Output Buffer Overflow */ + size_t current_to_euc PROTO((char **current, size_t *in_len, + char **euc, size_t *out_len)); + static size_t euc_to_current PROTO((char **euc, size_t *in_len, + char **current, size_t *out_len)); + + + enum CONV_MODE {IO_AUTO, IO_ICONV, IO_SJIS, IO_EUC} conv_mode; + + static enum CONV_MODE detect_conv_mode PROTO((const char *encoding)); + + + + + #define TMP_SIZE 10240 + + static int xputs_raw PROTO((const char *str, int len, FILE *fp)); + static int xputs2 PROTO((const char *str, int len, FILE *fp)); + + static const char *euc_jp_names[] = { + "eucJP", "EUC-JP", "eucjp", "euc-jp", "EUCJP", "ujis", "UJIS", + "euc", "EUC", NULL + }; + + static const char *shift_jis_names[] = { + "SHIFT-JIS", "SHIFT_JIS", "SJIS", "CSSHIFTJIS", "SHIFTJIS", NULL + }; + + #ifdef HAVE_ICONV + static const char *iso_2022_jp_names[] = { + "ISO-2022-JP-3", "ISO-2022-JP-2", "ISO-2022-JP", + "CSISO2022JP", "CSISO2022JP2", "CSISO2022JP3", + "ISO-2022", "ISO2022", "ISO2022JP", "ISO2022-JP", "JIS", NULL + }; + + static const char *japanese_names[] = { + "ja", "japanese", NULL + }; + #endif + + static int match_str(str,str_list) + const char *str; + const char **str_list; + { + const char **ptr; + for(ptr=str_list;*ptr!=NULL;ptr++) { + if (strcasecmp(str,*ptr)==0) return 1; + } + return 0; + } + + /* + + ,A%3!<%IJQ494X?t=i4|2= IO_EUC / IO_SJIS + 1b. ,A$@$a$J$i iconv ,A$GJQ49$G$-$k encoding ,A$+$rH=Dj => IO_ICONV + ,A0J2It(.,A0J9_) ,A$+$i$N encoding ,A$, ja/japanese ,A$N>l9g + iconv ,A$,M-$k>l9g => EUC_JP ,A$N iconv ,AL>$O!) + iconv ,A$,L5$$>l9g => 4. ,A$G EUC_JP ,A$+$J!) + locale ,A$, C ,A$H$+ en_US ,A$@$C$?$i!) => ,AEvLL FALLBACK ,A$9$k!# + gettext ,ABP1~Ey$N>l9g$OMW$7!# + + */ + + #ifdef HAVE_ICONV + + static int + setup_eucjp_code_name() + { + const char **enc; + iconv_t ic; + if (eucjp_code_name == NULL) { + for (enc = euc_jp_names; *enc != NULL; enc++) { + ic = iconv_open(*enc, *enc); + if (ic != (iconv_t)-1) { + eucjp_code_name = *enc; + iconv_close(ic); + break; + } + } + if (eucjp_code_name == NULL) { + /* EUC-JP ,A@_Dj$K<:GT - ,A[#Kf$J "ja" "japanese" ,A$b;n$9 */ + for (enc = japanese_names; *enc != NULL; enc++) { + ic = iconv_open(*enc,*enc); + if (ic != (iconv_t)-1) { + eucjp_code_name = *enc; + iconv_close(ic); + break; + } + } + } + } + return eucjp_code_name != NULL; + } + + /* Current locale ,A$N codeset ,A$GF|K\8l$,07$($k$+!) + ,A<:GT$J$i 0, ,A@.8y$J$i 1 ,A$rJV$9 */ + + static int + iconv_test(ctoe, etoc) + iconv_t ctoe, etoc; + { + /* ,AJ8;zNs ",A current code ,A$NJQ49%F%9%H */ + if (iconv(etoc,&test1,&ilen,&test2,&olen) == ((size_t)-1)) + return 0; + if (iconv(etoc,NULL,&ilen,&test2,&olen) == ((size_t)-1)) + return 0; + + /* current code ,A$+$i ,A85$KLa$k$+ */ + test2=test2_0; + ilen=TEST_LENGTH-olen; + olen=TEST_LENGTH; + if (iconv(ctoe,&test2,&ilen,&test3,&olen) == ((size_t)-1)) + return 0; + if (iconv(ctoe,NULL,&ilen,&test3,&olen) == ((size_t)-1)) + return 0; + + if (strncmp(test1_0,test3_0,strlen(test1_0)) != 0) + return 0; + + return 1; + } + + static int + iconv_setup(current_code_name) + const char *current_code_name; + { + iconv_t ctoe,etoc; + static int disable_iconv = 0; + + if (disable_iconv) + return 0; + if (eucjp_code_name == NULL) { + if (! setup_eucjp_code_name()) { + disable_iconv = 1; + return 0; + } + } + + if (current_code_name == NULL || eucjp_code_name == NULL) + return 0; + + ctoe = iconv_open(eucjp_code_name, current_code_name); + etoc = iconv_open(current_code_name, eucjp_code_name); + + + if (iconv_test(ctoe, etoc)) { + /* ,A$&$^$/$$$C$?$i ,A@_Dj$9$k */ + if (cur_to_euc != (iconv_t) -1) + iconv_close(cur_to_euc); + if (euc_to_cur != (iconv_t) -1) + iconv_close(euc_to_cur); + cur_to_euc=ctoe; + euc_to_cur=etoc; + return 1; + } else { + if (ctoe != (iconv_t)-1) + iconv_close(ctoe); + if (etoc != (iconv_t)-1) + iconv_close(etoc); + return 0; + } + } + #endif + + enum CONV_MODE detect_conv_mode(encoding) + const char *encoding; + { + if (encoding == NULL) return IO_AUTO; + if (match_str(encoding,euc_jp_names)) return IO_EUC; + if (match_str(encoding,shift_jis_names)) return IO_SJIS; + #ifdef HAVE_ICONV + if (match_str(encoding,iso_2022_jp_names)) { + const char **enc; + for(enc = iso_2022_jp_names;*enc != NULL; enc++){ + if (iconv_setup(*enc)) + return IO_ICONV; + } + } else if (iconv_setup(encoding)) { + return IO_ICONV; + } + #endif + return IO_AUTO; + } + + int + locale_init(encoding) + const char *encoding; + { + static int initialized = 0; + #ifdef HAVE_SETLOCALE + static char *locale_name = NULL; + #ifdef HAVE_NL_LANGINFO + static char *current_code_name = NULL; + #endif + #endif + enum CONV_MODE cm_temp; + + #ifdef HAVE_SETLOCALE + locale_name = setlocale(LC_CTYPE, ""); + #endif + + /* 1. encoding ,A$K$h$k;XDj + ,A!' ,AM-8z$J encoding ,A$,;XDj$5$l$l$P0JA0$NCM$r>e=q$- */ + cm_temp = detect_conv_mode(encoding); + if (cm_temp != IO_AUTO) { + conv_mode = cm_temp; + goto init_finish; + } + + /* ,A$9$G$K ,A=i4|2=:Q$_$G$"$l$P ,A$=$N$^$^5"$k */ + if (initialized != 0 && + (conv_mode != IO_ICONV + #ifdef HAVE_ICONV + || (cur_to_euc != (iconv_t)-1 && euc_to_cur != (iconv_t)-1) + #endif + )) + return CODECONV_OK; + initialized = 0; + conv_mode = IO_AUTO; + + #ifdef HAVE_SETLOCALE + /* 2. current_locale ,A$+$i ,A7hDj$r;n$_$k */ + #if defined(HAVE_NL_LANGINFO) && defined(CODESET) + /* 2a/2b. nl_langinfo(CODESET) ,A$+$i$NIt$N3NG' */ + if (locale_name != NULL) { + char *try2; + locale_name = strdup(locale_name); + if (locale_name == NULL) + return CODECONV_ERROR; + try2 = strtok(locale_name, ".@"); + if (try2 != NULL) + try2 = strtok(NULL, ".@"); + if (try2 != NULL) { + conv_mode = detect_conv_mode(try2); + if (conv_mode != IO_AUTO) goto init_finish; + } + } + #endif /* HAVE_SETLOCALE */ + + /* 3a/3b. ,A$=$l$G$b$@$a$J$i FALLBACK ,A$9$k */ + #ifdef FALLBACK_ENCODING + conv_mode = detect_conv_mode(FALLBACK_ENCODING); + #endif + + /* 4. ,A$"$-$i$a$F EUC_JP */ + if (conv_mode == IO_AUTO) conv_mode = IO_EUC; + + init_finish: + initialized = 1; + return CODECONV_OK; + } + + static int + xputs_raw(str, len, fp) + const char *str; + int len; + FILE *fp; + { + int outlen = 0; + int len1 = len; + int wlen; + + while (outlen < len) { + wlen = fwrite(str, 1, len1, fp); + if (wlen == 0) + break; + outlen += wlen; + len1 -= wlen; + str += wlen; + } + #ifdef __WATCOMC__ /* Bug ? */ + fflush(fp); + #endif + return outlen; + } + + static int + xputs2(str, len, fp) + const char *str; + int len; + FILE *fp; + { + char *buf1p, *buf1p0; + char *buf2p, *buf2p0; + size_t len1, len2; + size_t outlen; + int ret_code; + size_t status; + + /* The maximum size of output is 4 times larger than input. */ + outlen = len * 4; + + len1 = len; + len2 = outlen; + #ifdef HAVE_ALLOCA + buf1p = buf1p0 = alloca(len1); + #else + buf1p = buf1p0 = malloc(len1); + #endif + if (buf1p == NULL) + return EOF; + #ifdef HAVE_ALLOCA + buf2p = buf2p0 = alloca(len2); + #else + buf2p = buf2p0 = malloc(len2); + #endif + if (buf2p == NULL) { + free(buf1p0); + return EOF; + } + memcpy(buf1p, str, len); + status=euc_to_current(&buf1p, &len1, &buf2p, &len2); + if (status == -2) { /* ,A0l2s$@$1 ,A%a%b%jNN0h$r3HBg */ + buf1p = buf1p0; + len1 = len; + outlen *= 3; + len2 = outlen; + #ifdef HAVE_ALLOCA + buf2p = buf2p0 = alloca(outlen); + #else + free(buf2p0); + buf2p = buf2p0 = malloc(outlen); + #endif + if (buf2p == NULL){ + free(buf1p0); + return EOF; + } + status=euc_to_current(&buf1p, &len1, &buf2p, &len2); + } + if (status == CODECONV_ERROR || status == CODECONV_BUFFER_OVERFLOW) { + /* Conversion Error ,A$"$-$i$a$F ,A$=$N$^$^=PNO */ + #ifndef HAVE_ALLOCA + free(buf1p0); + free(buf2p0); + #endif + return xputs_raw(str, len, fp); + } + #ifndef HAVE_ALLOCA + free(buf1p0); + #endif + ret_code = xputs_raw(buf2p0, outlen - len2, fp); + #ifndef HAVE_ALLOCA + free(buf2p0); + #endif + return ret_code; + } + + int + xfputs(str, fp) + const char *str; + FILE* fp; + { + return xputs2(str, strlen(str), fp); + } + + int + xputs(str) + const char *str; + { + int len; + len=xfputs(str, stdout); + if (len<0) return EOF; + putchar('\n'); + return len+1; + } + + int + xvfprintf(fp, fmt, ap) + FILE *fp; + const char *fmt; + va_list ap; + { + char buf1[TMP_SIZE]; + int len; + #ifdef HAVE_VSNPRINTF + len = vsnprintf(buf1, TMP_SIZE - 1, fmt, ap); + buf1[TMP_SIZE - 1]=0; + #else + len = vsprintf(buf1, fmt, ap); + #endif + return xputs2(buf1, len, fp); + } + + /* USE_STDARG_H is defined in codeconv.h */ + #ifdef USE_STDARG_H + int + xfprintf(FILE *fp, const char *fmt, ...) + #else + int + xfprintf(fp, fmt, va_alist) + FILE *fp; + const char *fmt; + va_dcl + #endif + { + int len; + va_list ap; + #ifdef USE_STDARG_H + va_start(ap, fmt); + #else + va_start(ap); + #endif + len = xvfprintf(fp, fmt, ap); + va_end(ap); + return len; + } + + int + #ifdef USE_STDARG_H + xprintf(const char *fmt, ...) + #else + xprintf(fmt, va_alist) + const char *fmt; + va_dcl + #endif + { + int len; + va_list ap; + #ifdef USE_STDARG_H + va_start(ap, fmt); + #else + va_start(ap); + #endif + len = xvfprintf(stdout, fmt, ap); + va_end(ap); + return len; + } + + char * + xfgets(str, size, fp) + char *str; + int size; + FILE *fp; + { + char *ibuf, *ibuf0; + size_t ilen; + size_t status; + char *str0; + int size0; + + str0 = str; + size0 = size; + + /* The maximum size of input is 4 times larger than size. */ + ilen = size * 4; + #ifdef HAVE_ALLOCA + ibuf0 = ibuf = alloca(ilen+1); + #else + ibuf0 = ibuf = malloc(ilen+1); + #endif + if (ibuf == NULL) + return NULL; + + if (fgets(ibuf, ilen, fp) == NULL) { + #ifndef HAVE_ALLOCA + free(ibuf); + #endif + return NULL; + } + ibuf[ilen]=0; + ilen=strlen(ibuf); + + status = current_to_euc(&ibuf,&ilen,&str,(size_t *)&size); + str0[size0-size]=0; + #ifndef HAVE_ALLOCA + free(ibuf0); + #endif + if (status != CODECONV_ERROR) return str0; + return NULL; + } + + /* ================================================================== */ + + char* + jis_to_euc(euc, jis, len) + char *euc; + const char *jis; + int len; + { + const char *jis_end; + char *q; + jis_end = jis + len; + /* Remove white space at tail of string */ + while (jis_end >= jis + 2 && + ((jis_end[-1] == '\0' && jis_end[-2] == '\0') || + (jis_end[-1] == 0x21 && jis_end[-2] == 0x21))) + jis_end -= 2; + q = euc; + while (jis < jis_end) + *q++ = (*jis++ | 0x80); + *q = '\0'; + return (char *)euc; + } + + char* + euc_to_jis(jis, euc, len) + char *jis; + const char *euc; + int len; + { + const char *euc_end; + char *q; + euc_end = euc + len; + /* Remove white space at tail of string */ + while (euc_end >= euc + 2 && + ((euc_end[-1] == '\0' && euc_end[-2] == '\0') || + (euc_end[-1] == 0x21 && euc_end[-2] == 0x21))) + euc_end -= 2; + q = jis; + while (euc < euc_end) + *q++ = (*euc++ & 0x7f); + *q = '\0'; + return (char *)jis; + } + + size_t current_to_euc (in_buf,in_len,out_buf,out_len) + char **in_buf, **out_buf; + size_t *in_len,*out_len; + { + static int output_left = -1; + int c1, c2; + size_t count = 0; + + #ifdef HAVE_ICONV + if (conv_mode == IO_ICONV) { + size_t ret; + if (cur_to_euc == (iconv_t) -1) + return CODECONV_ERROR; + ret = iconv(cur_to_euc,in_buf,in_len,out_buf,out_len); + if (ret != ((size_t)-1)) + ret = iconv(cur_to_euc, NULL, in_len, out_buf, out_len); + #if defined (HAVE_ERRNO_H) && defined (E2BIG) + if (ret == ((size_t)-1)) { + if (errno == E2BIG) + return CODECONV_BUFFER_OVERFLOW; + return CODECONV_ERROR; + } + #endif /* HAVE_ERRNO_H / E2BIG */ + return ret; + } + #endif /* HAVE_ICONV */ + + if (output_left >= 0) { + if (*out_len > 0) { + *((*in_buf)++) = output_left; + (*out_len)--; + count++; + output_left = -1; + } else { + /* Output Buffer Overflow */ + return CODECONV_BUFFER_OVERFLOW; + } + } + if (conv_mode == IO_SJIS) { + while(*in_len>0) { + if (*out_len<=0) break; + c1 = *((*in_buf)++) & 0xff; + (*in_len)--; + if (c1 < 0x80) { /* ASCII ,AJ8;z */ + (*out_len)--; + count++; + *((*out_buf)++)=c1; + continue; + } else if ((c1 < 0x81 || c1 > 0x9f) && (c1 < 0xe0 || c1 > 0xef)) { + /* ,AH>3Q%+%J */ + if (0xa1 <= c1 && c1 <= 0xdf) { + c2 = c1 - 0x80; + c1 = 0x8e; + } else { + return -1; + } + } else { + c2 = *((*in_buf)++) & 0xff; + (*in_len)--; + if (c1 > 0x9f) + c1 -= 0x40; + c1 += c1; + if (c2 <= 0x9e) { + c1 -= 0xe1; + if (c2 >= 0x80) + c2 -= 1; + c2 -= 0x1f; + } else { + c1 -= 0xe0; + c2 -= 0x7e; + } + c2 |= 0x80; + } + *((*out_buf)++) = c1 | 0x80; + (*out_len)--; + count++; + if (*out_len <= 0) { + output_left = c2; + return CODECONV_BUFFER_OVERFLOW; + } + *((*out_buf)++) = c2; + (*out_len)--; + count++; + } + if (*in_len == 0) return count; + if (*out_len == 0) return CODECONV_BUFFER_OVERFLOW; + return CODECONV_ERROR; + } else { /* IO_EUC */ + if (*out_len < *in_len) { + memcpy(*out_buf,*in_buf,*out_len); + count = *out_len; + (*out_buf) += *out_len; + (*in_buf) += *out_len; + (*in_len) -= *out_len; + *out_len = 0; + return CODECONV_BUFFER_OVERFLOW; + } else { + memcpy(*out_buf,*in_buf,*in_len); + count = *in_len; + (*out_buf)+=*in_len; + (*in_buf)+=*in_len; + (*out_len)-=*in_len; + *in_len=0; + return count; + } + } + return CODECONV_ERROR; /* Never */ + } + + size_t euc_to_current (in_buf,in_len,out_buf,out_len) + char **in_buf, **out_buf; + size_t *in_len,*out_len; + { + static int output_left = -1; + int c1, c2; + size_t count = 0; + + #ifdef HAVE_ICONV + if (conv_mode == IO_ICONV) { + size_t ret; + if (euc_to_cur == (iconv_t) -1) + return CODECONV_ERROR; + ret = iconv(euc_to_cur,in_buf,in_len,out_buf,out_len); + if (ret != ((size_t)-1)) + ret = iconv(euc_to_cur,NULL,in_len,out_buf,out_len); + #if defined (HAVE_ERRNO_H) && defined (E2BIG) + if (ret == ((size_t)-1)) { + if (errno == E2BIG) + return CODECONV_BUFFER_OVERFLOW; + return CODECONV_ERROR; + } + #endif /* HAVE_ERRNO_H / E2BIG */ + return ret; + } + #endif /* HAVE_ICONV */ + + if (output_left >= 0) { + if (*out_len > 0) { + *((*in_buf)++) = output_left; + (*out_len)--; + count++; + output_left = -1; + } else { + /* Output Buffer Overflow */ + return CODECONV_BUFFER_OVERFLOW; + } + } + if (conv_mode == IO_SJIS) { + while(*in_len>0) { + if (*out_len<=0) break; + c1 = *((*in_buf)++) & 0xff; + (*in_len)--; + if ((c1 & 0x80) == 0) { + *((*out_buf)++) = c1; + (*out_len)--; + count++; + continue; + } + if (0x8e == c1) { + *((*out_buf)++) = *((*in_buf)++) | 0x80; + (*in_len)--; + (*out_len)--; + count++; + continue; + } + c1 &= 0x7f; + c2 = *((*in_buf)++) & 0x7f; + (*in_len)--; + if (c1 & 0x01) { + c2 += 0x1f; + if (c2 > 0x7e) + c2++; + } else { + c2 += 0x7e; + } + c1 = (c1 + 0xe1) >> 1; + if (c1 > 0x9f) + c1 += 0x40; + *((*out_buf)++) = c1; + (*out_len)--; + count++; + if (*out_len <= 0) { + output_left = c2; + return CODECONV_BUFFER_OVERFLOW; + } + *((*out_buf)++) = c2; + (*out_len)--; + count++; + } + if (*in_len == 0) return count; + if (*out_len == 0) return CODECONV_BUFFER_OVERFLOW; + return CODECONV_ERROR; + } else { /* IO_EUC */ + if (*out_len < *in_len) { + memcpy(*out_buf,*in_buf,*out_len); + count = *out_len; + (*out_buf)+=*out_len; + (*in_buf)+=*out_len; + (*in_len)-=*out_len; + *out_len=0; + return CODECONV_BUFFER_OVERFLOW; + } else { + memcpy(*out_buf,*in_buf,*in_len); + count = *in_len; + (*out_buf)+=*in_len; + (*in_buf)+=*in_len; + (*out_len)-=*in_len; + *in_len=0; + return count; + } + } + return CODECONV_ERROR; /* Never */ + } + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/codeconv.h eb-4.0beta2.dos0.07/dos/codeconv.h *** eb-4.0beta2/dos/codeconv.h Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/dos/codeconv.h Wed Sep 3 22:33:01 2003 *************** *** 0 **** --- 1,60 ---- + /* + * codeconv.h - header file for code conversion + * + * 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 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Written by Takashi Nemoto (tnemoto@mvi.biglobe.ne.jp). + * Modified by Kazuhiko + * Modified by Satomi + */ + + #ifndef __CODECONV_H__ + #define __CODECONV_H__ + + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + + #ifdef STDC_HEADERS + #include + #endif + + #if defined(__STDC__) || defined(WIN32) + #include + #define USE_STDARG_H + #endif + + #define CODECONV_BUFFER_OVERFLOW ((size_t)-2) + #define CODECONV_ERROR ((size_t)-1) + #define CODECONV_OK 0 + + #ifndef PROTO + #if defined(__STDC__) + #define PROTO(p) p + #else + #define PROTO(p) () + #endif + #endif /* PROTO */ + + extern int locale_init PROTO((const char *encoding)); + extern int xvfprintf PROTO((FILE *fp, const char *fmt, va_list ap)); + extern int xfprintf PROTO((FILE *fp, const char *fmt, ...)); + extern int xprintf PROTO((const char *fmt, ...)); + extern int xfputs PROTO((const char *str, FILE *fp)); + extern int xputs PROTO((const char *str)); + extern char *xfgets PROTO((char *str, int size, FILE *fp)); + + extern char *euc_to_jis PROTO((char *jis, const char *euc, int len)); + extern char *jis_to_euc PROTO((char *euc, const char *jis, int len)); + extern size_t current_to_euc PROTO((char **current, size_t *in_len, + char **euc, size_t *out_len)); + + #endif diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/config.h.in eb-4.0beta2.dos0.07/dos/config.h.in *** eb-4.0beta2/dos/config.h.in Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/dos/config.h.in Thu Oct 30 01:09:21 2003 *************** *** 0 **** --- 1,244 ---- + /* Configuration file for DOS-32bit, OS/2-32bit, Windows-32bit environment */ + #ifndef __CONFIG_H__ + #define __CONFIG_H__ + + /* Define if using `alloca.c'. */ + /* #undef C_ALLOCA */ + /* Define if EB Library is built with pthread support. */ + /* #undef EBCONF_ENABLE_PTHREAD */ + + /* Define if NLS is requested */ + #define ENABLE_NLS + + /* Define if pthread support is enabled. */ + /* #undef ENABLE_PTHREAD */ + + /* Define if command names have the suffix `.exe' */ + #define EXEEXT_EXE + + /* Define if you have `alloca', as a function or macro. */ + #define HAVE_ALLOCA 1 + + /* Define if you have and it should be used (not on Ultrix). */ + /* #undef HAVE_ALLOCA_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_ARGZ_H */ + + /* Define if you have the header file. */ + #define HAVE_DIRECT_H + + /* Define if you have the header file, and it defines `DIR'. */ + /* #undef HAVE_DIRENT_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_DLFCN_H */ + + /* Define if you don't have `vprintf' but do have `_doprnt.' */ + /* #undef HAVE_DOPRNT */ + + /* Define if you have the header file. */ + #define HAVE_FCNTL_H 1 + + /* Define if you have the `getcwd' function. */ + #define HAVE_GETCWD 1 + + /* Define if you have the `getpagesize' function. */ + /* #undef HAVE_GETPAGESIZE */ + + /* Define if you have the header file. */ + /* #undef HAVE_INTTYPES_H */ + + /* Define if you have the `LC_MESSAGES' locale category */ + /* #undef HAVE_LC_MESSAGES */ + + /* Define if you have the header file. */ + #define HAVE_LIMITS_H 1 + + /* Define if you have the header file. */ + #define HAVE_LOCALE_H + + /* Define if you have the header file. */ + #define HAVE_MALLOC_H 1 + + /* Define if you have the `memcpy' function. */ + #define HAVE_MEMCPY 1 + + /* Define if you have the `memmove' function. */ + #define HAVE_MEMMOVE 1 + + /* Define if you have the header file. */ + #define HAVE_MEMORY_H 1 + + /* Define if you have the `memset' function. */ + #define HAVE_MEMSET 1 + + /* Define if you have a working `mmap' system call. */ + /* #undef HAVE_MMAP */ + + /* Define if you have the `munmap' function. */ + /* #undef HAVE_MUNMAP */ + + /* Define if you have the header file, and it defines `DIR'. */ + /* #undef HAVE_NDIR_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_NL_TYPES_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_PTHREAD_H */ + + /* Define if you have the `putenv' function. */ + #define HAVE_PUTENV 1 + + /* Define if you have the `setenv' function. */ + #define HAVE_SETENV 1 + + /* Define if you have the `setlocale' function. */ + #define HAVE_SETLOCALE 1 + + /* Define if you have the header file. */ + /* #undef HAVE_STDINT_H */ + + /* Define if you have the header file. */ + #define HAVE_STDLIB_H 1 + + /* Define if you have the `strcasecmp' function. */ + #define HAVE_STRCASECMP + #define strcasecmp stricmp + #define strncasecmp strnicmp + + /* Define if you have the `strchr' function. */ + #define HAVE_STRCHR 1 + + /* Define if you have the `strdup' function. */ + #define HAVE_STRDUP 1 + + /* Define if you have the `strerror' function. */ + #define HAVE_STRERROR 1 + + /* Define if you have the header file. */ + /* #undef HAVE_STRINGS_H */ + + /* Define if you have the header file. */ + #define HAVE_STRING_H 1 + + /* Define if `struct utimbuf' is declared -- usually in . */ + #define HAVE_STRUCT_UTIMBUF 1 + + /* Define if you have the `syslog' function. */ + /* #undef HAVE_SYSLOG */ + + /* Define if you have the header file. */ + /* #undef HAVE_SYSLOG_H */ + + /* Define if you have the header file, and it defines `DIR'. */ + /* #undef HAVE_SYS_DIR_H */ + + /* Define if you have the header file, and it defines `DIR'. */ + /* #undef HAVE_SYS_NDIR_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_SYS_PARAM_H */ + + /* Define if you have the header file. */ + #define HAVE_SYS_STAT_H 1 + + /* Define if you have the header file. */ + #define HAVE_SYS_TYPES_H 1 + + /* Define if you have the header file. */ + #define HAVE_SYS_UTIME_H 1 + + /* Define if you have the header file. */ + #define HAVE_UNISTD_H 1 + + /* Define if you have the `utime' function. */ + #define HAVE_UTIME 1 + + /* Define if you have the header file. */ + /* #undef HAVE_UTIME_H */ + + /* Define if you have the `vprintf' function. */ + #define HAVE_VPRINTF 1 + + /* Define if you have the `vsyslog' function. */ + /* #undef HAVE_VSYSLOG */ + + /* Define if you have the `_getdcwd' function. */ + /* #undef HAVE__GETDCWD */ + + /* Define if you have the `__argz_count' function. */ + /* #undef HAVE___ARGZ_COUNT */ + + /* Define if you have the `__argz_next' function. */ + /* #undef HAVE___ARGZ_NEXT */ + + /* Define if you have the `__argz_stringify' function. */ + /* #undef HAVE___ARGZ_STRINGIFY */ + + /* Mailing address */ + #define MAILING_ADDRESS "m-kasahr@sra.co.jp" + + /* Name of package */ + #define PACKAGE "eb" + + /* Define as the return type of signal handlers (`int' or `void'). */ + #define RETSIGTYPE void + + /* Define if the signal function returns void. */ + #define RETSIGTYPE_VOID 1 + + /* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ + /* #undef STACK_DIRECTION */ + + /* Define if the `S_IS*' macros in do not work properly. */ + /* #undef STAT_MACROS_BROKEN */ + + /* Define if you have the ANSI C header files. */ + #define STDC_HEADERS 1 + + /* Define if you can safely include both and . */ + /* #undef TIME_WITH_SYS_TIME */ + + /* Version number of package */ + #define VERSION "@VERSION@" + + /* Define to empty if `const' does not conform to ANSI C. */ + /* #undef const */ + + /* Define as `__inline' if that's what the C compiler calls it, or to nothing + if it is not supported. */ + /* #undef inline */ + + /* Define to `int' if does not define. */ + #define mode_t int + + /* Define to `long' if does not define. */ + /* #undef off_t */ + + /* Define to `unsigned' if does not define. */ + /* #undef size_t */ + + /* Define to `int' if does not define. */ + #define ssize_t int + + #define REPLACE_GETOPT + #define DOS_FILE_PATH + #define getdcwd _getdcwd + #define USE_CODECONV + #define USE_TINY_GETTEXT + #define FALLBACK_ENCODING "SHIFT-JIS" + #define TEXT_DOMAIN_NAME"eb_cmds" + + #if 0 && defined(__WATCOMC__) && defined(__NT__) + #define ENABLE_EBNET + #endif + + #endif + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/dll.lnk eb-4.0beta2.dos0.07/dos/dll.lnk *** eb-4.0beta2/dos/dll.lnk Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/dos/dll.lnk Thu Oct 30 01:14:45 2003 *************** *** 0 **** --- 1,321 ---- + # + # appendix.h + # + + # appendix.c + export eb_initialize_appendix + export eb_finalize_appendix + export eb_bind_appendix + export eb_is_appendix_bound + export eb_appendix_path + + # appsub.c + export eb_load_all_appendix_subbooks + export eb_appendix_subbook_list + export eb_appendix_subbook + export eb_appendix_subbook_directory + export eb_appendix_subbook_directory2 + export eb_set_appendix_subbook + export eb_unset_appendix_subbook + + # narwalt.c + export eb_have_narrow_alt + export eb_narrow_alt_start + export eb_narrow_alt_end + export eb_narrow_alt_character_text + export eb_forward_narrow_alt_character + export eb_backward_narrow_alt_character + + # stopcode.c + export eb_have_stop_code + export eb_stop_code + + # widealt.c + export eb_have_wide_alt + export eb_wide_alt_start + export eb_wide_alt_end + export eb_wide_alt_character_text + export eb_forward_wide_alt_character + export eb_backward_wide_alt_character + + # book.c + export eb_initialize_book + export eb_bind + export eb_finalize_book + export eb_is_bound + export eb_path + export eb_disc_type + export eb_character_code + + # copyright.h + export eb_have_copyright + export eb_copyright + + # eb.c + export eb_initialize_library + export eb_finalize_library + + # endword.c + export eb_have_endword_search + export eb_search_endword + + # exactword.c + export eb_have_exactword_search + export eb_search_exactword + + # graphic.c + #export eb_have_graphic_search + + # keyword.c + export eb_have_keyword_search + export eb_search_keyword + + # lock.c + export eb_pthread_enabled + + # log.c + export eb_set_log_function + export eb_enable_log + export eb_disable_log + export eb_log + export eb_log_stderr + + # menu.c + export eb_have_menu + export eb_menu + + # multi.c + export eb_have_multi_search + export eb_multi_search_list + export eb_multi_entry_count + export eb_multi_entry_list + export eb_multi_entry_label + export eb_multi_entry_have_candidates + export eb_multi_entry_candidates + export eb_search_multi + export eb_multi_title + + # text.c + export eb_have_text + export eb_text + + # search.c + export eb_hit_list + + # subbook.c + export eb_load_all_subbooks + export eb_subbook_list + export eb_subbook + export eb_subbook_title + export eb_subbook_title2 + export eb_subbook_directory + export eb_subbook_directory2 + export eb_set_subbook + export eb_unset_subbook + + # word.c + export eb_have_word_search + export eb_search_word + + ##################### + # font.h + ##################### + # bitmap.c + export eb_narrow_font_xbm_size + export eb_narrow_font_xpm_size + export eb_narrow_font_gif_size + export eb_narrow_font_bmp_size + export eb_wide_font_xbm_size + export eb_wide_font_xpm_size + export eb_wide_font_gif_size + export eb_wide_font_bmp_size + export eb_bitmap_to_xbm + export eb_bitmap_to_xpm + export eb_bitmap_to_gif + export eb_bitmap_to_bmp + + # font.c + export eb_font + export eb_set_font + export eb_unset_font + export eb_font_list + export eb_have_font + export eb_font_height + export eb_font_height2 + + # narwfont.c + export eb_have_narrow_font + export eb_narrow_font_width + export eb_narrow_font_width2 + export eb_narrow_font_size + export eb_narrow_font_size2 + export eb_narrow_font_start + export eb_narrow_font_end + export eb_narrow_font_character_bitmap + export eb_forward_narrow_font_character + export eb_backward_narrow_font_character + + # widefont.c + export eb_have_wide_font + export eb_wide_font_width + export eb_wide_font_width2 + export eb_wide_font_size + export eb_wide_font_size2 + export eb_wide_font_start + export eb_wide_font_end + export eb_wide_font_character_bitmap + export eb_forward_wide_font_character + export eb_backward_wide_font_character + + # + # codeconv.h + # + export locale_init + export xvfprintf + export xfprintf + export xprintf + export xfputs + export xputs + export xfgets + + export euc_to_jis + export jis_to_euc + + # + # Tiny gettext + # + export bindtextdomain + export textdomain + export dgettext + export gettext + + # + # error.c + # + export eb_error_string + export eb_error_message + + # + # ebutils.c + # + export output_try_help + export output_version + export parse_subbook_name_argument + export find_subbook + export canonicalize_path + + # + # samefile.c + # + export is_same_file + + # + # yesno.c + # + export query_y_or_n + + # + # + # + + # + # getopt.c + # + + export eb_canonicalize_path_name + export eb_canonicalize_file_name + export eb_fix_directory_name + export eb_fix_directory_name2 + export eb_fix_path_name_suffix + export eb_find_file_name + export eb_find_file_name2 + export eb_find_file_name3 + export eb_compose_path_name + export eb_compose_path_name2 + export eb_compose_path_name3 + export eb_path_name_zio_code + export get_umask + export make_missing_directory + + # + # zlib + # + export deflate + export deflateEnd + export deflateInit_ + export adler32 + + # + # zio + # + export zio_initialize_library + export zio_finalize_library + export zio_initialize + export zio_finalize + export zio_set_sebxa_mode + export zio_open + export zio_close + export zio_file + export zio_mode + export zio_lseek + export zio_read + + + # + # text.h + # + # /* hook.c */ + export eb_initialize_hookset + export eb_finalize_hookset + export eb_set_hook + export eb_set_hooks + export eb_hook_euc_to_ascii + # export eb_hook_stop_code + export eb_hook_narrow_character_text + export eb_hook_wide_character_text + export eb_hook_newline + export eb_hook_empty + + #/* readtext.c */ + export eb_seek_text + export eb_tell_text + export eb_read_text + export eb_read_heading + export eb_read_rawtext + export eb_is_text_stopped + export eb_write_text_byte1 + export eb_write_text_byte2 + export eb_write_text_string + export eb_write_text + export eb_current_candidate + export eb_forward_text + export eb_backward_text + + # + # binary.h + # + # /* binary.c */ + export eb_set_binary_mono_graphic + export eb_set_binary_gray_graphic + # export eb_set_binary_bitmap + export eb_set_binary_wave + export eb_set_binary_color_graphic + export eb_set_binary_mpeg + export eb_read_binary + export eb_unset_binary + + # /* filename.c */ + export eb_compose_movie_file_name + export eb_decompose_movie_file_name + + # /* booklist.c */ + export eb_initialize_booklist + export eb_get_booklist + export eb_booklist_book_count + export eb_booklist_book_name + export eb_booklist_book_title + export eb_finalize_booklist + + + export set_invoked_name + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/ebapp.c eb-4.0beta2.dos0.07/dos/ebapp.c *** eb-4.0beta2/dos/ebapp.c Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/dos/ebapp.c Wed Sep 3 22:33:01 2003 *************** *** 0 **** --- 1,112 ---- + #include + #include + + #include "build-pre.h" + #include "eb.h" + #include "error.h" + #include "build-post.h" + + #include "getopt.h" + #include "codeconv.h" + + static char *Version = "0.00001"; + static char *CmdName = "yaapp"; + static char *MailingAddress = "tnemoto@mvi.biglobe.ne.jp"; + static char *HelpMsg = + "Usage: %s [option...] [input-directory]\n" + "Options:\n" + " -b BOOK-TYPE --book-type BOOK-TYPE\n" + " make an appendix as BOOK-TYPE; eb or epwing\n" + " (default: depend on `catalog(s).app')\n" + " -c CASE --case CASE\n" + " output files which have filenames with CASE\n" + " letters; upper or lower\n" + " (default: depend on `catalog(s).app')\n" + " -d --debug --verbose debug mode\n" + " -h --help output this help, then exit\n" + " -n --no-catalog don't output a catalog file\n" + " -o DIRECTORY --output-directory DIRECTORY\n" + " output files to DIRECTORY\n" + " (default: .)\n" + " -s SUFFIX --suffix SUFFIX\n" + " output files which have filenames with SUFFIX;\n" + " none, dot, version or both\n" + " (default: none)\n" + " -t --test only check for input files\n" + " -v --version output version number, then exit\n" + "\n" + "Argument:\n" + " input-directory input files at this directory\n" + " (default: .)\n" + "\n" + "Report bugs to %s.\n"; + + + static const char *short_options = "b:c:dhno:s:tv"; + static struct option long_options[] = { + {"book-type", required_argument, NULL, 'b'}, + {"case", required_argument, NULL, 'c'}, + {"debug", no_argument, NULL, 'd'}, + {"verbose", no_argument, NULL, 'd'}, + {"help", no_argument, NULL, 'h'}, + {"no-catalog", no_argument, NULL, 'n'}, + {"output-directory", required_argument, NULL, 'o'}, + {"suffix", required_argument, NULL, 's'}, + {"test", no_argument, NULL, 't'}, + {"version", no_argument, NULL, 'v'}, + {NULL, 0, NULL, 0} + }; + + enum {TYPE_EB, TYPE_EPWING}; + enum {LOWER_CASE, UPPER_CASE, AUTOMATIC_CASE }; + enum {DEBUG_OFF, DEBUG_ON}; + enum {SUFFIX_NONE, SUFFIX_DOT, SUFFIX_VERSION, SUFFIX_BOTH}; + enum {CHECK_NOT_ONLY, CHECK_ONLY}; + + int Disc = TYPE_EPWING; + int Upcase = AUTOMATIC_CASE; + int Debug = DEBUG_OFF; + int Book_type = TYPE_EPWING; + int Suffix_type = SUFFIX_NONE; + int Check_only = CHECK_NOT_ONLY; + + int MaxSubbooks = 50; + int MaxLen_Alt = 31; + int MaxLen_Subname = 8; + + void try_help(char *cmd) { + fprintf(stderr,_("Try '%s --help' for more information\n"), cmd); + exit(1); + }; + + int main(int argc, char **argv) { + char indir[EB_MAX_PATH_LENGTH+1]; + char outdir[EB_MAX_PATH_LENGTH+1]; + char catpath[EB_MAX_PATH_LENGTH+1]; + + int ch; + for(;;) { + ch = getopt_long(argc, argv, short_options, long_options, NULL); + if (ch<0) break; + switch (ch) { + case 'v': + fprintf(stderr,"Yet Another APPpendix generator %s version %s\n", + CmdName, Version); + exit(0); + case 'h': + fprintf(stderr, HelpMsg, argv[0], MailingAddress); + exit(0); + case 'b': + if (optarg != NULL) { + if (strcasecmp(optarg,"eb") == 0) { + Disc = TYPE_EB; + } else if (strcasecmp(optarg,"epwing") == 0) { + Disc = TYPE_EPWING; + } + } else { + fprintf(stderr,_("Unknown disc type '%s'.\n"),optarg); + try_help(argv[0]); + } + } + } + } diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/ebcmds.mk eb-4.0beta2.dos0.07/dos/ebcmds.mk *** eb-4.0beta2/dos/ebcmds.mk Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/dos/ebcmds.mk Wed Sep 3 22:33:01 2003 *************** *** 0 **** --- 1,92 ---- + # Valid System Name : sys=os2, win, dos + + CC = wcl386 + + !ifeq sys os2 + CF_SYSDEP = -5s -bt=os2 -mf + LF_SYSDEP = SYS os2v2 + + !else ifeq sys win + CF_SYSDEP = -5s -bt=nt -mf -fpc + LF_SYSDEP = SYS nt + + !else ifeq sys dos + CF_SYSDEP = -5s -bt=dos -mf + CFDLL_SYSDEP = $(CF_SYSDEP) + + !else + !error Target System is invalid. "$(sys)" + !endif + + CF_COMMON = -i=$(%WATCOM)\h;..;..\eb;..\ebu -w4 -e25 -od -ficonfig.h + LF_COMMON = d all op m op maxe=25 + + + CFLAGS=$(CF_COMMON) $(CF_SYSDEP) + LDFLAGS=$(LF_COMMON) $(LF_SYSDEP) + WCL = $(CFLAGS) + WCL386 = $(WCL) + LD = wlink + + LIB = ..\lib\eb$(SYS).lib + + all : ..\$(SYS)\ebinfo.exe ..\$(SYS)\ebrefile.exe ..\$(SYS)\ebfont.exe ..\$(SYS)\ebzip.exe ..\$(SYS)\appendix.pl ..\$(SYS)\eb_cmds.ja .symbolic + @echo Finish !! + + ..\$(SYS)\eb_cmds.ja : ..\eb_cmds.ja + -copy ..\eb_cmds.ja ..\$(SYS) + + .EXTENSIONS : .txt + .c: ..;..\..;..\..\zlib;..\..\eb;..\..\libebu;..\..\ebinfo;..\..\ebrefile;..\..\ebzip;..\..\ebfont + .c.obj: .AUTODEPEND + $(CC) $(CFLAGS) -c $[@ + + ebutils.obj : ebutils.h + + ..\$(SYS)\ebinfo.exe : ebinfo.obj $(LIB) + $(LD) $(LDFLAGS) Name $@ File $[@ Library $(LIB) + + ..\$(SYS)\ebrefile.exe : ebrefile.obj $(LIB) + $(LD) $(LDFLAGS) Name $@ File $[@ Library $(LIB) + + ..\$(SYS)\ebzip.exe : ebzip.obj copyfile.obj ebzip1.obj sebxa.obj unzipbook.obj unzipfile.obj zipbook.obj zipfile.obj zipinfobook.obj zipinfofile.obj $(LIB) + $(LD) $(LDFLAGS) Name $@ File ebzip.obj,copyfile.obj,ebzip1.obj,sebxa.obj,unzipbook.obj,unzipfile.obj,zipbook.obj,zipfile.obj,zipinfobook.obj,zipinfofile.obj Library $(LIB) + + ..\$(SYS)\ebfont.exe : ebfont.obj $(LIB) + $(LD) $(LDFLAGS) Name $@ File $[@ Library $(LIB) + + ebutils.h : ..\libebutils\ebutils.h.in + copy ..\libebutils\ebutils.h.in eb\ebutils.h + + ..\$(SYS)\bookinfo.exe : bookinfo.obj $(LIB) + $(LD) $(LDFLAGS) Name $@ File $[@ Library $(LIB) + + ..\$(SYS)\appendix.pl : ..\..\appendix\appendix.pl + copy ..\..\appendix\appendix.pl ..\$(SYS)\appendix.pl + + cleanbin : .SYMBOLIC + -del *.obj + -del *.exe + -del *.dll + -del *.lib + + clean : .SYMBOLIC + -del *.obj + -del *.txt + + pkg : cleanbin all .SYMBOLIC + -mkdir ..\$(sys) + -mkdir ..\lib + -del ..\$(sys)\*.txt + -del ..\$(sys)\*.exe + + wstrip ebzip.exe + wstrip ebinfo.exe + wstrip ebrefile.exe + wstrip ebfont.exe + + copy *.exe ..\$(sys) + copy *.txt ..\$(sys) + copy libeb$(SYS).lib ..\lib\libeb$(sys).lib + copy libeb$(SYS).dll ..\$(sys) + copy ..\COPYING ..\$(sys) diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/ebutils.h eb-4.0beta2.dos0.07/dos/ebutils.h *** eb-4.0beta2/dos/ebutils.h Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/dos/ebutils.h Wed Sep 3 22:33:01 2003 *************** *** 0 **** --- 1,51 ---- + /* -*- C -*- + * Copyright (c) 2000, 01 + * Motoyuki Kasahara + * + * 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 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + + #ifndef EBUTILS_H + #define EBUTILS_H + + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + + #include "eb/eb.h" + + /* + * Text domain name for message catalog. + */ + #ifndef TEXT_DOMAIN_NAME + #define TEXT_DOMAIN_NAME "ebutils" + #endif + + /* + * Path to the locale directory. + */ + #ifdef LOCALEDIR + #undef LOCALEDIR + #endif + #define LOCALEDIR getenv("LOCALEDIR") + + /* + * Function declarations. + */ + void output_try_help EB_P((const char *)); + void output_version EB_P((const char *, const char *)); + int parse_subbook_name_argument EB_P((const char *, const char *, + char [][EB_MAX_DIRECTORY_NAME_LENGTH + 1], int *)); + EB_Subbook_Code find_subbook EB_P((EB_Book *, const char *, + EB_Subbook_Code *)); + void canonicalize_path EB_P((char *)); + + #endif /* not EBUTILS_H */ diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/gen_mo.pl eb-4.0beta2.dos0.07/dos/gen_mo.pl *** eb-4.0beta2/dos/gen_mo.pl Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/dos/gen_mo.pl Wed Sep 3 22:33:01 2003 *************** *** 0 **** --- 1,93 ---- + #!/usr/bin/perl + # + # tiny msgfmt compatible text converter + # + # Copyright (c) 2002 + # Takashi Nemoto + # + # 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 2, or (at your option) + # any later version. + # + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + + $domain_name = shift(@ARGV); + $lang_name = shift(@ARGV); + $infile="../po-".$domain_name."/".$lang_name.".po"; + $outfile = shift(@ARGV); + + open(INFILE,$infile) || die; + open(OUTFILE,">".$outfile) || die; + binmode(OUTFILE); + + $mode = 0; + + while() { + chop; + if ($_ eq "") { + if ($mode == 2) { + $msgstr =~ s/\\n/\n/g; + $msgstr =~ s/\\t/\t/g; + $msgid =~ s/\\n/\n/g; + $msgid =~ s/\\t/\t/g; + $msglist{$msgid}=$msgstr; + } + $mode = 0; + } else { + if ($_ =~ /msgid/) { + $msgid = ''; + $mode = 1; + } elsif ($_ =~ /msgstr/) { + $msgstr = ''; + $mode = 2; + } + s/^[^\"]*\"//; + s/\"[^\"]*$//; + if ($mode == 1) { + $msgid .= $_; + } elsif ($mode == 2) { + $msgstr .= $_; + } + } + } + + if ($mode == 2) { + $msgstr =~ s/\\n/\n/g; + $msgstr =~ s/\\t/\t/g; + $msgid =~ s/\\n/\n/g; + $msgid =~ s/\\t/\t/g; + $msglist{$msgid}=$msgstr; + }; + + $nMsg=scalar keys %msglist; + print OUTFILE "\x95\x04\x12\xde"; + print OUTFILE pack("N",0); + print OUTFILE pack("N",$nMsg); + print OUTFILE pack("N",28); + print OUTFILE pack("N",$nMsg*4+28); + print OUTFILE pack("N",0); + print OUTFILE pack("N",0); + + $start=$nMsg*4*2+28; + foreach $word (sort keys(%msglist)){ + print OUTFILE pack("N", $start); + $start += length($word) + 1; + } + foreach $word (sort keys(%msglist)){ + print OUTFILE pack("N", $start); + $start += length($msglist{$word}) + 1; + } + + foreach $word (sort keys(%msglist)){ + print OUTFILE $word,"\0"; + } + foreach $word (sort keys(%msglist)){ + print OUTFILE $msglist{$word},"\0"; + } + close(OUTFILE); + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/libeb.mk eb-4.0beta2.dos0.07/dos/libeb.mk *** eb-4.0beta2/dos/libeb.mk Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/dos/libeb.mk Thu Oct 30 01:10:54 2003 *************** *** 0 **** --- 1,143 ---- + # Valid System Name : sys=os2, win, dos + + CC = wcc386 + + !ifeq sys os2 + # CF_SYSDEP = -5s -bt=os2 -mf -br -bd + CF_SYSDEP = -5s -bt=os2 -mf + CF_SYSDEP2 = + # LF_SYSDEP = sys os2v2 dll initinstance terminstance option manyautodata + LF_SYSDEP = sys os2v2 + + !else ifeq sys win + CF_SYSDEP = -5s -bt=nt -mf + CF_SYSDEP2 = + LF_SYSDEP = sys nt dll initinstance terminstance + + !else ifeq sys dos + CF_SYSDEP = -5s -bt=dos -mf + CF_SYSDEP2 = + LF_SYSDEP = SYS dos4g Option Stack=655360 + + !else + !error Target System is invalid. "$(sys)" + !endif + + CF_COMMON = -i=$(%WATCOM)\h;..;..\eb;..\ebu -w4 -e25 -od -ficonfig.h + LF_COMMON = d all op m op maxe=25 + + + CFLAGS=$(CF_COMMON) $(CF_SYSDEP) -DEB_BUILD_LIBRARY + LDFLAGS=$(LF_COMMON) $(LF_SYSDEP) + WCL = $(CFLAGS) + WCL386 = $(WCL) + LD = wlink + + LIBEB_O1 = appendix.obj appsub.obj bcd.obj binary.obj bitmap.obj book.obj + LIBEB_O2 = copyright.obj eb.obj endword.obj error.obj exactword.obj + LIBEB_O3 = filename.obj font.obj hook.obj jacode.obj keyword.obj lock.obj + LIBEB_O4 = log.obj match.obj menu.obj multi.obj narwalt.obj narwfont.obj + LIBEB_O5 = widealt.obj widefont.obj readtext.obj search.obj setword.obj + LIBEB_O6 = stopcode.obj subbook.obj text.obj word.obj zio.obj + LIBEB_O7 = codeconv.obj windll.obj tgettext.obj booklist.obj + NOTDLL_OBJS = getopt.obj + + LIBEB_1 = +appendix.obj +appsub.obj +bcd.obj +binary.obj +bitmap.obj +book.obj + LIBEB_2 = +copyright.obj +eb.obj +endword.obj +error.obj +exactword.obj + LIBEB_3 = +filename.obj +font.obj +hook.obj +jacode.obj +keyword.obj +lock.obj + LIBEB_4 = +log.obj +match.obj +menu.obj +multi.obj +narwalt.obj +narwfont.obj + LIBEB_5 = +widealt.obj +widefont.obj +readtext.obj +search.obj +setword.obj + LIBEB_6 = +stopcode.obj +subbook.obj +text.obj +word.obj +zio.obj + LIBEB_7 = +codeconv.obj +windll.obj +tgettext.obj +booklist.obj + NOTDLL_OBJS_P = +getopt.obj + + !ifeq sys win=== + LIBEB_O8 = ebnet.obj + LIBEB_8 = +ebnet.obj + !endif + + LIBEB_OBJS = $(LIBEB_O1) $(LIBEB_O2) $(LIBEB_O3) $(LIBEB_O4) $(LIBEB_O5) & + $(LIBEB_O6) $(LIBEB_O7) $(LIBEB_O8) + + ZLIB_OBJS = inflate.obj adler32.obj infblock.obj inftrees.obj infutil.obj & + infcodes.obj zutil.obj inffast.obj deflate.obj trees.obj + ZLIB1P = +inflate.obj +adler32.obj +infblock.obj +inftrees.obj +infutil.obj + ZLIB2P = +infcodes.obj +zutil.obj +inffast.obj +deflate.obj +trees.obj + + LIBEBUTILS_OBJS = ebutils.obj getumask.obj & + makedir.obj samefile.obj yesno.obj + LIBEBUTILS_P = +ebutils.obj +getumask.obj & + +makedir.obj +samefile.obj +yesno.obj + + MISC_OBJS = + MISCP = + + # DOCS = ebutils.txt squeeze.txt bookinfo.txt catdump.txt README.txt ..\COPYING + + !ifneq sys win + LIB_A = ..\lib\eb$(SYS).lib + DLL = + LIB = + !else + LIB_A = ..\lib\eb$(SYS)_a.lib + DLL = ..\$(SYS)\eb$(SYS).dll + LIB = ..\lib\eb$(SYS).lib + !endif + LIBS = $(LIB) $(DLL) $(LIB_A) + + + all : $(LIBS) ..\eb.ja .symbolic + copy ..\eb.ja ..\$(SYS) + @echo Finish !! + + .EXTENSIONS : .txt + .c: ..;..\..;..\..\zlib;..\..\eb;..\..\libebu;..\..\ebinfo;..\..\ebrefile;..\..\ebzip;..\..\ebfont + .c.obj: .AUTODEPEND + $(CC) $(CFLAGS) $[@ + + ebutils.obj : ..\..\libebu\ebutils.c ..\ebu\ebutils.h + ..\ebu\ebutils.h : ..\..\libebutils\ebutils.h.in + copy ..\..\libebutils\ebutils.h.in ..\ebu\ebutils.h + + #.DEFAULT: .AUTODEPEND + # $(CC) $(CFLAGS) -c $[@ + + lib.wlb : $(__MAKEFILES__) + echo $(ZLIB1P) > lib.wlb + echo $(ZLIB2P) >> lib.wlb + echo $(LIBEB_1) >> lib.wlb + echo $(LIBEB_2) >> lib.wlb + echo $(LIBEB_3) >> lib.wlb + echo $(LIBEB_4) >> lib.wlb + echo $(LIBEB_5) >> lib.wlb + echo $(LIBEB_6) >> lib.wlb + echo $(LIBEB_7) >> lib.wlb + !ifeq sys win=== + echo $(LIBEB_8) >> lib.wlb + !endif + echo $(LIBEBUTILS_P) >> lib.wlb + + tmp.lib : $(ZLIB_OBJS) $(LIBEB_OBJS) $(LIBEBUTILS_OBJS) & + $(__MAKEFILES__) lib.wlb + wlib -n tmp.lib @lib.wlb + + $(LIB_A) : tmp.lib $(NOTDLL_OBJS) + -mkdir ..\$(sys) + -mkdir ..\lib + wlib -n $(LIB_A) +tmp.lib $(NOTDLL_OBJS_P) + + !ifeq sys win + $(LIB) : $(DLL) $(NOTDLL_OBJS) + -mkdir ..\$(sys) + -mkdir ..\lib + wlib -n $(LIB) +$(DLL) $(NOTDLL_OBJS_P) + + $(DLL) : tmp.lib windll.obj $(__MAKEFILES__) ..\dll.lnk + $(LD) $(LF_SYSDEP) Name $(DLL) @..\dll.lnk file tmp.lib + !endif + + clean : .SYMBOLIC + -del *.obj + + pkg : all .SYMBOLIC + copy ..\COPYING $(sys) diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/libintl.h eb-4.0beta2.dos0.07/dos/libintl.h *** eb-4.0beta2/dos/libintl.h Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/dos/libintl.h Wed Sep 3 22:33:01 2003 *************** *** 0 **** --- 1,19 ---- + #ifndef __tgettext_h__ + #define __tgettext_h__ + + typedef struct { + const char *msgid; + const char *msgstr; + } gettext_msg_t ; + + extern char *bindtextdomain(const char *domainname, const char *dummydirname); + extern char *textdomain(const char *domainname); + extern const char *dgettext(const char *domain_name,const char *str); + extern const char *gettext(const char *str); + + extern void set_invoked_name(char*); + extern char *ARG0; + + #endif + + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/tgettext.c eb-4.0beta2.dos0.07/dos/tgettext.c *** eb-4.0beta2/dos/tgettext.c Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/dos/tgettext.c Wed Sep 3 22:33:01 2003 *************** *** 0 **** --- 1,190 ---- + /* Tiny gettext for DOS (return code : EUC-JP) + # + # Copyright (c) 2002 + # Takashi Nemoto + # + # 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 2, or (at your option) + # any later version. + # + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + */ + + #include "config.h" + #include "libintl.h" + #include + #include + #include + #include + #include + #include "ebutils.h" + + #define MAX_DOMAIN 10 + + static const gettext_msg_t *current_msglist = NULL; + static int current_msglist_length = 0; + static char *current_domain = NULL; + + static const char *raw_msgfile[MAX_DOMAIN]; + static gettext_msg_t *msglist_list[MAX_DOMAIN]; + static int msglist_length_list[MAX_DOMAIN]; + static const char *msglist_domains[MAX_DOMAIN]; + static int msglist_list_length; + + char *ARG0; + + void set_invoked_name(argv0) + char* argv0; + { + ARG0 = argv0; + } + + static unsigned long getdword(const char *buf) { + unsigned char *ubuf; + ubuf=(unsigned char *)buf; + return 0x1000000L*ubuf[0]+0x10000L*ubuf[1]+0x100L*ubuf[2]+ubuf[3]; + } + + int bindtextdomain_sub(const char *domainname, const char *rawfile, int len) { + int nWord,i; + if (msglist_list_length >= MAX_DOMAIN) + return 0; + if (len<28) return 0; + if (getdword(rawfile)!=0x950412de) return 0; + nWord=getdword(rawfile+8); + if (nWord>10000) return 0; /* May be error */ + if (nWord*4*2+28 >=len) return 0; + msglist_list[msglist_list_length]=calloc(nWord,sizeof(gettext_msg_t)); + msglist_length_list[msglist_list_length] = nWord; + msglist_domains[msglist_list_length] = strdup(domainname); + raw_msgfile[msglist_list_length]=rawfile; + + for(i=0;ilen || dp>len) return 0; + msglist_list[msglist_list_length][i].msgid=rawfile+op; + msglist_list[msglist_list_length][i].msgstr=rawfile+dp; + } + + msglist_list_length++; + return 1; + } + + char *bindtextdomain(const char *domainname, const char *dirname) { + char *lang,lang1[4],*dir_name,domain_name[9],*buf,*buf2; + FILE *fp; + int file_len,read_len; + lang = getenv("LANG"); + if (lang == NULL || stricmp(lang,"jp")==0 || strnicmp(lang,"ja",2)==0) + lang = "ja"; + strncpy(lang1,lang,3); + lang1[3]=0; + if (dirname==NULL) { + char *p0,*p,*pp; + dir_name=strdup(ARG0); + p=pp=NULL; + p0=dir_name; + do { + pp=p; + p=_mbschr(p0,'\\'); + p0=p+1; + } while (p!=NULL); + if (pp!=NULL) *pp=0; + } else + dir_name=strdup(dirname); + strncpy(domain_name,domainname,8); + domain_name[8]=0; + if (dir_name==NULL) return NULL; + buf=alloca(strlen(dir_name)+15); + sprintf(buf,"%s\\%s.%s",dir_name,domain_name,lang1); + fp=fopen(buf,"rb"); + if (fp==NULL) goto fail; + + fseek(fp,0,SEEK_END); + file_len=ftell(fp); + fseek(fp,0,SEEK_SET); + buf2=malloc(file_len); + if (buf2==NULL) goto fail2; + read_len=0; + while(read_len < file_len) { + int r; + r=fread(buf2+read_len,1,file_len-read_len,fp); + if (r<0) goto fail2; + read_len+=r; + } + if (bindtextdomain_sub(domainname,buf2,file_len)==0) goto fail2; + fclose(fp); + return NULL; + + fail2: + fclose(fp); + fail: + free(dir_name); + return NULL; + } + + char *textdomain(const char *domainname) { + int i; + if (current_domain != NULL && strcmp(domainname,current_domain)==0) + return NULL; + for(i=0; i< msglist_list_length;i++){ + if (strcmp(msglist_domains[i], domainname) == 0) { + if (current_domain != NULL) free(current_domain); + current_domain = strdup(domainname); + current_msglist = msglist_list[i]; + current_msglist_length = msglist_length_list[i]; + return NULL; + } + } + current_domain = NULL; + current_msglist = NULL; + current_msglist_length = 0; + return NULL; + } + + static const char *gettext_sub(const char *str, + const gettext_msg_t *msglist, + int msglist_length){ + int begin, end, point, diff; + if (msglist == NULL) return str; + begin = 0; + end = msglist_length-1; + while(begin<=end) { + point = (begin+end)/2; + diff = strcmp(msglist[point].msgid,str); + if (diff == 0) + return msglist[point].msgstr; + else if (diff < 0) { + begin = point+1; + } else { + end = point-1; + } + } + return str; + } + + const char *gettext(const char *str){ + return gettext_sub(str, current_msglist, current_msglist_length); + } + + const char *dgettext(const char *domainname, const char *str){ + int i; + if (current_domain != NULL && strcmp(domainname,current_domain)==0) + return gettext_sub(str, current_msglist, current_msglist_length); + for(i=0; i< msglist_list_length;i++){ + if (strcmp(msglist_domains[i], domainname) == 0) { + return gettext_sub(str, msglist_list[i], msglist_length_list[i]); + } + } + return str; + } + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/windll.c eb-4.0beta2.dos0.07/dos/windll.c *** eb-4.0beta2/dos/windll.c Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/dos/windll.c Wed Sep 3 22:33:01 2003 *************** *** 0 **** --- 1,6 ---- + #ifdef __NT__ + #include + int DllMain() { + return 1; + } + #endif diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/eb/appendix.c eb-4.0beta2.dos0.07/eb/appendix.c *** eb-4.0beta2/eb/appendix.c Sun Jun 15 20:37:42 2003 --- eb-4.0beta2.dos0.07/eb/appendix.c Wed Sep 3 22:33:01 2003 *************** *** 13,18 **** --- 13,22 ---- * GNU General Public License for more details. */ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + #include "build-pre.h" #include "eb.h" #include "error.h" diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/eb/build-post.h eb-4.0beta2.dos0.07/eb/build-post.h *** eb-4.0beta2/eb/build-post.h Wed Sep 3 20:32:01 2003 --- eb-4.0beta2.dos0.07/eb/build-post.h Thu Oct 30 02:00:44 2003 *************** *** 26,32 **** /* * Locale directory. */ ! #define LOCALEDIR "/usr/private/share/locale" /* * Data size of a book entry in a catalog file. --- 26,32 ---- /* * Locale directory. */ ! #define LOCALEDIR "$(datadir)/locale" /* * Data size of a book entry in a catalog file. diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/eb/build-pre.h eb-4.0beta2.dos0.07/eb/build-pre.h *** eb-4.0beta2/eb/build-pre.h Sun Jun 15 20:37:34 2003 --- eb-4.0beta2.dos0.07/eb/build-pre.h Thu Oct 30 00:17:19 2003 *************** *** 61,66 **** --- 61,69 ---- #if HAVE_DIRENT_H #include #define NAMLEN(dirent) strlen((dirent)->d_name) + #elif defined(HAVE_DIRECT_H) + #include + #define NAMLEN(dirent) strlen((dirent)->d_name) #else /* not HAVE_DIRENT_H */ #define dirent direct #define NAMLEN(dirent) (dirent)->d_namlen *************** *** 172,177 **** --- 175,181 ---- /* * Character type tests and conversions. */ + #ifndef isdigit #define isdigit(c) ('0' <= (c) && (c) <= '9') #define isupper(c) ('A' <= (c) && (c) <= 'Z') #define islower(c) ('a' <= (c) && (c) <= 'z') *************** *** 181,186 **** --- 185,191 ---- (isdigit(c) || ('A' <= (c) && (c) <= 'F') || ('a' <= (c) && (c) <= 'f')) #define toupper(c) (('a' <= (c) && (c) <= 'z') ? (c) - 0x20 : (c)) #define tolower(c) (('A' <= (c) && (c) <= 'Z') ? (c) + 0x20 : (c)) + #endif /* * For (void *). diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/eb/defs.h.in eb-4.0beta2.dos0.07/eb/defs.h.in *** eb-4.0beta2/eb/defs.h.in Wed Sep 3 20:27:05 2003 --- eb-4.0beta2.dos0.07/eb/defs.h.in Wed Sep 3 22:33:01 2003 *************** *** 1020,1023 **** --- 1020,1027 ---- } #endif + #ifndef __WATCOMC__ + #define set_invoked_name(x) + #endif + #endif /* not EB_DEFS_H */ diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/eb/dummyin6.h eb-4.0beta2.dos0.07/eb/dummyin6.h *** eb-4.0beta2/eb/dummyin6.h Fri Jun 20 21:58:02 2003 --- eb-4.0beta2.dos0.07/eb/dummyin6.h Thu Oct 30 00:21:07 2003 *************** *** 34,42 **** --- 34,46 ---- #endif #include + #ifdef __NT__ + #include + #else #include #include #include + #endif #ifndef AF_INET6 #define AF_INET6 (AF_INET + 1) diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/eb/ebnet.c eb-4.0beta2.dos0.07/eb/ebnet.c *** eb-4.0beta2/eb/ebnet.c Fri Aug 15 08:34:45 2003 --- eb-4.0beta2.dos0.07/eb/ebnet.c Thu Oct 30 00:20:39 2003 *************** *** 17,25 **** #include "config.h" #endif ! #include "build-pre.h" ! #include #ifdef TIME_WITH_SYS_TIME #include --- 17,29 ---- #include "config.h" #endif ! #ifdef __NT__ ! #include ! #else #include + #endif + + #include "build-pre.h" #ifdef TIME_WITH_SYS_TIME #include *************** *** 38,44 **** #include "build-post.h" #include "dummyin6.h" ! #if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO) #include "getaddrinfo.h" #endif --- 42,49 ---- #include "build-post.h" #include "dummyin6.h" ! #if !defined(__NT__) && \ ! (!defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)) #include "getaddrinfo.h" #endif diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/eb/filename.c eb-4.0beta2.dos0.07/eb/filename.c *** eb-4.0beta2/eb/filename.c Fri Aug 15 22:25:45 2003 --- eb-4.0beta2.dos0.07/eb/filename.c Wed Sep 3 22:33:01 2003 *************** *** 523,533 **** sprintf(composed_path_name, "%s/%s", path_name, file_name); } #else ! if (isalpha(*path_name) && strcmp(path_name + 1, ":\\") == 0) { sprintf(composed_path_name, "%s%s", path_name, file_name); ! } else { ! sprintf(composed_path_name, "%s\\%s", path_name, file_name); ! } #endif } --- 523,532 ---- sprintf(composed_path_name, "%s/%s", path_name, file_name); } #else ! const char *last_backslash = strchr(path_name, '\\'); ! if (last_backslash && '\0' == *(last_backslash + 1)) sprintf(composed_path_name, "%s%s", path_name, file_name); ! else sprintf(composed_path_name, "%s\\%s", path_name, file_name); #endif } diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/eb/match.c eb-4.0beta2.dos0.07/eb/match.c *** eb-4.0beta2/eb/match.c Wed Sep 3 20:34:47 2003 --- eb-4.0beta2.dos0.07/eb/match.c Sun Sep 21 22:03:09 2003 *************** *** 351,357 **** for (;;) { if (length <= i) { ! result = *word; break; } if (*word_p == '\0') { --- 351,357 ---- for (;;) { if (length <= i) { ! result = *word_p; break; } if (*word_p == '\0') { diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/eb-diff eb-4.0beta2.dos0.07/eb-diff *** eb-4.0beta2/eb-diff Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/eb-diff Thu Oct 30 02:00:48 2003 *************** *** 0 **** --- 1,3091 ---- + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/ChangeLog.dos eb-4.0beta2.dos0.07/ChangeLog.dos + *** eb-4.0beta2/ChangeLog.dos Thu Jan 1 09:00:00 1970 + --- eb-4.0beta2.dos0.07/ChangeLog.dos Thu Oct 30 01:16:49 2003 + *************** + *** 0 **** + --- 1,35 ---- + + 2003-10-30 Takashi Nemoto + + + + * export booklist related functions for windows dll + + + + 2003-10-04 Takashi Nemoto + + + + * add packaging code for Mac OS X + + * modify packaging code for Zaurus Linux + + + + 2003-09-21 Takashi Nemoto + + + + * apply bug fix patch [ndtpd 01850] + + + + 2003-09-04 Takashi Nemoto + + + + * eb-4.0beta2 base + + + + 2003-09-03 Takashi Nemoto + + + + * eb-4.0beta1 base + + + + 2003-07-05 Takashi Nemoto + + + + * zaurus.cnt : change version code + + + + 2003-07-04 Takashi Nemoto + + + + * zaurus.sh, zaurus.cnt : new file + + + + 2003-07-03 Takashi Nemoto + + + + * eb/book.c : Add misleaded book + + -------------------------------------- + + DOS Version 0.7 + + empty log message + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/Makefile.am eb-4.0beta2.dos0.07/Makefile.am + *** eb-4.0beta2/Makefile.am Sat Aug 30 12:03:16 2003 + --- eb-4.0beta2.dos0.07/Makefile.am Sat Oct 4 03:47:13 2003 + *************** + *** 12,22 **** + SAMPLES_SUBDIR = + endif + + ! SUBDIRS = $(ZLIB_SUBDIR) eb libebutils ebappendix ebfont ebinfo \ + ebrefile ebstopcode ebzip doc doc-ja po-eb po-ebutils m4 $(SAMPLES_SUBDIR) + + EXTRA_DIST = ChangeLog.0 ChangeLog.1 INSTALL-ja README-ja move-if-change \ + ! eb.conf.in gttest.mo gttest.po misc/ebfixlog misc/ebdump + CLEANFILES = eb.conf + + appendixdir = $(pkgdatadir)/appendix + --- 12,24 ---- + SAMPLES_SUBDIR = + endif + + ! SUBDIRS = $(ZLIB_SUBDIR) eb libebutils ebappendix ebfont ebinfo dos \ + ebrefile ebstopcode ebzip doc doc-ja po-eb po-ebutils m4 $(SAMPLES_SUBDIR) + + EXTRA_DIST = ChangeLog.0 ChangeLog.1 INSTALL-ja README-ja move-if-change \ + ! eb.conf.in gttest.mo gttest.po misc/ebfixlog misc/ebdump \ + ! ChangeLog.dos zaurus.cnt zaurus.sh eb.spec eb.spec.in eb.spec.in.in \ + ! mac.sh + CLEANFILES = eb.conf + + appendixdir = $(pkgdatadir)/appendix + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/configure.ac eb-4.0beta2.dos0.07/configure.ac + *** eb-4.0beta2/configure.ac Wed Sep 3 20:29:49 2003 + --- eb-4.0beta2.dos0.07/configure.ac Thu Sep 4 02:23:16 2003 + *************** + *** 1,7 **** + dnl * + dnl * Process this file with autoconf to produce a configure script. + dnl * + ! AC_INIT(eb, 4.0beta2) + AC_CONFIG_SRCDIR(eb/eb.c) + AC_PREREQ(2.54) + AM_INIT_AUTOMAKE + --- 1,7 ---- + dnl * + dnl * Process this file with autoconf to produce a configure script. + dnl * + ! AC_INIT(eb, 4.0beta2.dos0.07) + AC_CONFIG_SRCDIR(eb/eb.c) + AC_PREREQ(2.54) + AM_INIT_AUTOMAKE + *************** + *** 341,351 **** + --- 341,364 ---- + AC_SUBST(EBCONF_EBLIBS) + + dnl * + + dnl * for snapshot + + dnl * + + AC_ARG_ENABLE(snapshot, + + [ --enable-snapshot distribute as snapshot], + + SNAPDATE=`date +'%Y%m%d'` + + AC_SUBST(SNAPDATE) + + sed -e '/^#s/d' -e 's/^#S//' eb.spec.in.in > eb.spec.in + + , + + sed -e '/^#S/d' -e 's/^#s//' eb.spec.in.in > eb.spec.in + + ) + + + + dnl * + dnl * Output Files. + dnl * + AC_CONFIG_HEADER(config.h) + AC_CONFIG_FILES([Makefile eb/Makefile libebutils/Makefile ebappendix/Makefile + ebfont/Makefile ebinfo/Makefile ebrefile/Makefile ebstopcode/Makefile + ebzip/Makefile doc/Makefile doc-ja/Makefile po-eb/Makefile + + dos/Makefile dos/config.h eb/build-post.h eb/defs.h eb.spec + po-ebutils/Makefile m4/Makefile samples/Makefile]) + AC_OUTPUT + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/depcomp eb-4.0beta2.dos0.07/depcomp + *** eb-4.0beta2/depcomp Sun Jun 15 20:36:06 2003 + --- eb-4.0beta2.dos0.07/depcomp Thu Oct 30 02:00:22 2003 + *************** + *** 206,241 **** + rm -f "$tmpdepfile" + ;; + + - icc) + - # Must come before tru64. + - + - # Intel's C compiler understands `-MD -MF file'. However + - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + - # will fill foo.d with something like + - # foo.o: sub/foo.c + - # foo.o: sub/foo.h + - # which is wrong. We want: + - # sub/foo.o: sub/foo.c + - # sub/foo.o: sub/foo.h + - # sub/foo.c: + - # sub/foo.h: + - + - "$@" -MD -MF "$tmpdepfile" + - stat=$? + - if test $stat -eq 0; then : + - else + - rm -f "$tmpdepfile" + - exit $stat + - fi + - rm -f "$depfile" + - # Each line is of the form `foo.o: dependent.h'. + - # Do two passes, one to just change these to + - # `$object: dependent.h' and one to simply `dependent.h:'. + - sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + - sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" + - rm -f "$tmpdepfile" + - ;; + - + tru64) + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + --- 206,211 ---- + *************** + *** 295,301 **** + shift + fi + + ! # Remove `-o $object'. + IFS=" " + for arg + do + --- 265,273 ---- + shift + fi + + ! # Remove `-o $object'. We will use -o /dev/null later, + ! # however we can't do the remplacement now because + ! # `-o $object' might simply not be used + IFS=" " + for arg + do + *************** + *** 315,325 **** + done + + test -z "$dashmflag" && dashmflag=-M + ! # Require at least two characters before searching for `:' + ! # in the target name. This is to cope with DOS-style filenames: + ! # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + ! "$@" $dashmflag | + ! sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + tr ' ' ' + --- 287,293 ---- + done + + test -z "$dashmflag" && dashmflag=-M + ! "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + tr ' ' ' + *************** + *** 338,350 **** + + makedepend) + "$@" || exit $? + - # Remove any Libtool call + - if test "$libtool" = yes; then + - while test $1 != '--mode=compile'; do + - shift + - done + - shift + - fi + # X makedepend + shift + cleared=no + --- 306,311 ---- + *************** + *** 357,365 **** + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift ;; + ! # Strip any option that makedepend may not understand. Remove + ! # the object too, otherwise makedepend will parse it as a source file. + ! -*|$object) + ;; + *) + set fnord "$@" "$arg"; shift ;; + --- 318,324 ---- + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift ;; + ! -*) + ;; + *) + set fnord "$@" "$arg"; shift ;; + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc/version-ebfont.texi eb-4.0beta2.dos0.07/doc/version-ebfont.texi + *** eb-4.0beta2/doc/version-ebfont.texi Wed Sep 3 20:32:48 2003 + --- eb-4.0beta2.dos0.07/doc/version-ebfont.texi Wed Sep 3 23:30:40 2003 + *************** + *** 1,4 **** + @set UPDATED 30 August 2003 + @set UPDATED-MONTH August 2003 + ! @set EDITION 4.0beta2 + ! @set VERSION 4.0beta2 + --- 1,4 ---- + @set UPDATED 30 August 2003 + @set UPDATED-MONTH August 2003 + ! @set EDITION 4.0beta2.dos0.07 + ! @set VERSION 4.0beta2.dos0.07 + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc/version-ebinfo.texi eb-4.0beta2.dos0.07/doc/version-ebinfo.texi + *** eb-4.0beta2/doc/version-ebinfo.texi Wed Sep 3 20:32:48 2003 + --- eb-4.0beta2.dos0.07/doc/version-ebinfo.texi Wed Sep 3 23:30:39 2003 + *************** + *** 1,4 **** + @set UPDATED 30 August 2003 + @set UPDATED-MONTH August 2003 + ! @set EDITION 4.0beta2 + ! @set VERSION 4.0beta2 + --- 1,4 ---- + @set UPDATED 30 August 2003 + @set UPDATED-MONTH August 2003 + ! @set EDITION 4.0beta2.dos0.07 + ! @set VERSION 4.0beta2.dos0.07 + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc/version-ebrefile.texi eb-4.0beta2.dos0.07/doc/version-ebrefile.texi + *** eb-4.0beta2/doc/version-ebrefile.texi Wed Sep 3 20:32:48 2003 + --- eb-4.0beta2.dos0.07/doc/version-ebrefile.texi Wed Sep 3 23:30:39 2003 + *************** + *** 1,4 **** + @set UPDATED 30 August 2003 + @set UPDATED-MONTH August 2003 + ! @set EDITION 4.0beta2 + ! @set VERSION 4.0beta2 + --- 1,4 ---- + @set UPDATED 30 August 2003 + @set UPDATED-MONTH August 2003 + ! @set EDITION 4.0beta2.dos0.07 + ! @set VERSION 4.0beta2.dos0.07 + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc/version-ebstopcode.texi eb-4.0beta2.dos0.07/doc/version-ebstopcode.texi + *** eb-4.0beta2/doc/version-ebstopcode.texi Wed Sep 3 20:32:48 2003 + --- eb-4.0beta2.dos0.07/doc/version-ebstopcode.texi Wed Sep 3 23:30:39 2003 + *************** + *** 1,4 **** + @set UPDATED 30 August 2003 + @set UPDATED-MONTH August 2003 + ! @set EDITION 4.0beta2 + ! @set VERSION 4.0beta2 + --- 1,4 ---- + @set UPDATED 30 August 2003 + @set UPDATED-MONTH August 2003 + ! @set EDITION 4.0beta2.dos0.07 + ! @set VERSION 4.0beta2.dos0.07 + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc/version-ebzip.texi eb-4.0beta2.dos0.07/doc/version-ebzip.texi + *** eb-4.0beta2/doc/version-ebzip.texi Wed Sep 3 20:32:48 2003 + --- eb-4.0beta2.dos0.07/doc/version-ebzip.texi Wed Sep 3 23:30:40 2003 + *************** + *** 1,4 **** + @set UPDATED 30 August 2003 + @set UPDATED-MONTH August 2003 + ! @set EDITION 4.0beta2 + ! @set VERSION 4.0beta2 + --- 1,4 ---- + @set UPDATED 30 August 2003 + @set UPDATED-MONTH August 2003 + ! @set EDITION 4.0beta2.dos0.07 + ! @set VERSION 4.0beta2.dos0.07 + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc-ja/mdate-sh eb-4.0beta2.dos0.07/doc-ja/mdate-sh + *** eb-4.0beta2/doc-ja/mdate-sh Sun Jun 15 20:36:08 2003 + --- eb-4.0beta2.dos0.07/doc-ja/mdate-sh Thu Oct 30 02:00:18 2003 + *************** + *** 94,97 **** + esac + + # The result. + ! echo "$year 年 $nummonth 月 $day 日" + --- 94,97 ---- + esac + + # The result. + ! echo $day $month $year + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc-ja/version-eb.texi eb-4.0beta2.dos0.07/doc-ja/version-eb.texi + *** eb-4.0beta2/doc-ja/version-eb.texi Wed Sep 3 20:32:54 2003 + --- eb-4.0beta2.dos0.07/doc-ja/version-eb.texi Wed Sep 3 23:30:40 2003 + *************** + *** 1,4 **** + ! @set UPDATED 2003 年 8 + ! @set UPDATED-MONTH 年 8 + ! @set EDITION 4.0beta2 + ! @set VERSION 4.0beta2 + --- 1,4 ---- + ! @set UPDATED 30 August 2003 + ! @set UPDATED-MONTH August 2003 + ! @set EDITION 4.0beta2.dos0.07 + ! @set VERSION 4.0beta2.dos0.07 + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc-ja/version-ebappendix.texi eb-4.0beta2.dos0.07/doc-ja/version-ebappendix.texi + *** eb-4.0beta2/doc-ja/version-ebappendix.texi Wed Sep 3 20:32:54 2003 + --- eb-4.0beta2.dos0.07/doc-ja/version-ebappendix.texi Wed Sep 3 23:30:40 2003 + *************** + *** 1,4 **** + ! @set UPDATED 2003 年 8 + ! @set UPDATED-MONTH 年 8 + ! @set EDITION 4.0beta2 + ! @set VERSION 4.0beta2 + --- 1,4 ---- + ! @set UPDATED 24 August 2003 + ! @set UPDATED-MONTH August 2003 + ! @set EDITION 4.0beta2.dos0.07 + ! @set VERSION 4.0beta2.dos0.07 + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc-ja/version-ebfont.texi eb-4.0beta2.dos0.07/doc-ja/version-ebfont.texi + *** eb-4.0beta2/doc-ja/version-ebfont.texi Wed Sep 3 20:32:54 2003 + --- eb-4.0beta2.dos0.07/doc-ja/version-ebfont.texi Wed Sep 3 23:30:40 2003 + *************** + *** 1,4 **** + ! @set UPDATED 2003 年 8 + ! @set UPDATED-MONTH 年 8 + ! @set EDITION 4.0beta2 + ! @set VERSION 4.0beta2 + --- 1,4 ---- + ! @set UPDATED 30 August 2003 + ! @set UPDATED-MONTH August 2003 + ! @set EDITION 4.0beta2.dos0.07 + ! @set VERSION 4.0beta2.dos0.07 + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc-ja/version-ebinfo.texi eb-4.0beta2.dos0.07/doc-ja/version-ebinfo.texi + *** eb-4.0beta2/doc-ja/version-ebinfo.texi Wed Sep 3 20:32:54 2003 + --- eb-4.0beta2.dos0.07/doc-ja/version-ebinfo.texi Wed Sep 3 23:30:40 2003 + *************** + *** 1,4 **** + ! @set UPDATED 2003 年 8 + ! @set UPDATED-MONTH 年 8 + ! @set EDITION 4.0beta2 + ! @set VERSION 4.0beta2 + --- 1,4 ---- + ! @set UPDATED 30 August 2003 + ! @set UPDATED-MONTH August 2003 + ! @set EDITION 4.0beta2.dos0.07 + ! @set VERSION 4.0beta2.dos0.07 + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc-ja/version-ebrefile.texi eb-4.0beta2.dos0.07/doc-ja/version-ebrefile.texi + *** eb-4.0beta2/doc-ja/version-ebrefile.texi Wed Sep 3 20:32:54 2003 + --- eb-4.0beta2.dos0.07/doc-ja/version-ebrefile.texi Wed Sep 3 23:30:40 2003 + *************** + *** 1,4 **** + ! @set UPDATED 2003 年 8 + ! @set UPDATED-MONTH 年 8 + ! @set EDITION 4.0beta2 + ! @set VERSION 4.0beta2 + --- 1,4 ---- + ! @set UPDATED 30 August 2003 + ! @set UPDATED-MONTH August 2003 + ! @set EDITION 4.0beta2.dos0.07 + ! @set VERSION 4.0beta2.dos0.07 + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc-ja/version-ebstopcode.texi eb-4.0beta2.dos0.07/doc-ja/version-ebstopcode.texi + *** eb-4.0beta2/doc-ja/version-ebstopcode.texi Wed Sep 3 20:32:54 2003 + --- eb-4.0beta2.dos0.07/doc-ja/version-ebstopcode.texi Wed Sep 3 23:30:40 2003 + *************** + *** 1,4 **** + ! @set UPDATED 2003 年 8 + ! @set UPDATED-MONTH 年 8 + ! @set EDITION 4.0beta2 + ! @set VERSION 4.0beta2 + --- 1,4 ---- + ! @set UPDATED 30 August 2003 + ! @set UPDATED-MONTH August 2003 + ! @set EDITION 4.0beta2.dos0.07 + ! @set VERSION 4.0beta2.dos0.07 + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/doc-ja/version-ebzip.texi eb-4.0beta2.dos0.07/doc-ja/version-ebzip.texi + *** eb-4.0beta2/doc-ja/version-ebzip.texi Wed Sep 3 20:32:54 2003 + --- eb-4.0beta2.dos0.07/doc-ja/version-ebzip.texi Wed Sep 3 23:30:40 2003 + *************** + *** 1,4 **** + ! @set UPDATED 2003 年 8 + ! @set UPDATED-MONTH 年 8 + ! @set EDITION 4.0beta2 + ! @set VERSION 4.0beta2 + --- 1,4 ---- + ! @set UPDATED 30 August 2003 + ! @set UPDATED-MONTH August 2003 + ! @set EDITION 4.0beta2.dos0.07 + ! @set VERSION 4.0beta2.dos0.07 + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/Makefile.am eb-4.0beta2.dos0.07/dos/Makefile.am + *** eb-4.0beta2/dos/Makefile.am Thu Jan 1 09:00:00 1970 + --- eb-4.0beta2.dos0.07/dos/Makefile.am Wed Sep 3 22:33:01 2003 + *************** + *** 0 **** + --- 1,78 ---- + + EXTRA_DIST = codeconv.h codeconv.c ebutils.h libeb.mk ebcmds.mk \ + + tgettext.c libintl.h windll.c build.bat config.h.in gen_mo.pl \ + + dll.lnk Readme.ja Readme.en ebapp.c + + + + all: setup + + + + setup: eb/defs.h ebutils.h build-post.h widefont.c widealt.c + + mkdir -p dos + + mkdir -p os2 + + mkdir -p win + + mkdir -p ebu + + mkdir -p doc-ja + + mkdir -p doc + + nkf -s -Lw ../doc-ja/eb-ja.info > doc-ja/eb.txt + + nkf -s -Lw ../doc-ja/ebzip-ja.info > doc-ja/ebzip.txt + + nkf -s -Lw ../doc-ja/ebinfo-ja.info > doc-ja/ebinfo.txt + + nkf -s -Lw ../doc-ja/ebrefile-ja.info > doc-ja/ebrefile.txt + + nkf -s -Lw ../doc-ja/ebfont-ja.info > doc-ja/ebfont.txt + + nkf -s -Lw ../README-ja > doc-ja/readme.txt + + # nkf -s -Lw ../doc/eb.info > doc/eb.txt + + nkf -s -Lw ../doc/ebzip.info > doc/ebzip.txt + + nkf -s -Lw ../doc/ebinfo.info > doc/ebinfo.txt + + nkf -s -Lw ../doc/ebrefile.info > doc/ebrefile.txt + + nkf -s -Lw ../doc/ebfont.info > doc/ebfont.txt + + nkf -s -Lw ../README > doc/readme.txt + + perl gen_mo.pl eb ja eb.ja + + perl gen_mo.pl ebutils ja eb_cmds.ja + + cd ..; rm -f libebu; ln -s libebutils libebu; cd dos + + cd ..; rm -f appendix; ln -s ebappendix appendix; cd dos + + cd ../appendix; rm -f appendix.pl ; ln -s ebappendix appendix.pl ;\ + + cd ../dos + + + + eb/defs.h: stamp-defs-h + + stamp-defs-h: ../eb/defs.h.in Makefile + + mkdir -p eb + + rm -f defs.h.tmp + + sed -e 's;\@EB_VERSION_MAJOR\@;$(EB_VERSION_MAJOR);' \ + + -e 's;\@EB_VERSION_MINOR\@;$(EB_VERSION_MINOR);' \ + + ../eb/defs.h.in > defs.h.tmp + + $(top_srcdir)/move-if-change defs.h.tmp eb/defs.h + + @echo timestamp > stamp-defs-h + + + + ebutils.h: stamp-ebutils-h + + stamp-ebutils-h: ../libebutils/ebutils.h.in Makefile + + rm -f ebutils.h.tmp + + sed -e 's;\"\@localedir\@\";getenv("LOCALEDIR");' \ + + ../libebutils/ebutils.h.in > ebutils.h.tmp + + $(top_srcdir)/move-if-change ebutils.h.tmp ebutils.h + + @echo timestamp > stamp-ebutils-h + + build-post.h: stamp-build-post-h + + stamp-build-post-h: ../eb/build-post.h.in Makefile + + rm -f build-post.h.tmp + + sed -e 's;\"\@localedir\@\";getenv("LOCALEDIR");' \ + + ../eb/build-post.h.in > build-post.h.tmp + + $(top_srcdir)/move-if-change build-post.h.tmp build-post.h + + @echo timestamp > stamp-build-post-h + + + + widealt.c: stamp-widealt-h + + stamp-widealt-h: ../eb/narwalt.c Makefile + + rm -f widealt.c.tmp + + sed -e s/narrow/wide/g -e s/Narrow/Wide/g -e s/NARROW/WIDE/g \ + + ../eb/narwalt.c > widealt.c.tmp + + $(top_srcdir)/move-if-change widealt.c.tmp widealt.c + + @echo timestamp > stamp-widealt-h + + + + widefont.c: stamp-widefont-h + + stamp-widefont-h: ../eb/narwfont.c Makefile + + rm -f widefont.c.tmp + + sed -e s/narrow/wide/g -e s/Narrow/Wide/g -e s/NARROW/WIDE/g \ + + ../eb/narwfont.c > widefont.c.tmp + + $(top_srcdir)/move-if-change widefont.c.tmp widefont.c + + @echo timestamp > stamp-widefont-h + + + + clean: + + rm -f libeb.lib *.err *.o *.map *.obj *.exe *~ *.bak ebja.h ebutilja.h wide*.c + + rm -f eb*.txt *.LZH + + rm -rf os2_32 dos_32 win_32 libebsdk eb + + + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/Readme.en eb-4.0beta2.dos0.07/dos/Readme.en + *** eb-4.0beta2/dos/Readme.en Thu Jan 1 09:00:00 1970 + --- eb-4.0beta2.dos0.07/dos/Readme.en Wed Sep 3 22:33:01 2003 + *************** + *** 0 **** + --- 1,11 ---- + + eb-3.2.2 + many onofficial patches + + You can use, copy and modify under GPL. + + Please read "COPYING" file for more detail. + + + + Environment variable "LANG" should be defined as "en_US" + + if you can't understand japanese. + + Altanativly, remove the "eb.ja" and "eb_cmds.ja" files + + if you don't need messages written in japanese. + + + + The "ebappendix" is renamed as "appendix.pl" because of + + the restriction of DOS file name syntax. + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/Readme.ja eb-4.0beta2.dos0.07/dos/Readme.ja + *** eb-4.0beta2/dos/Readme.ja Thu Jan 1 09:00:00 1970 + --- eb-4.0beta2.dos0.07/dos/Readme.ja Wed Sep 3 22:33:01 2003 + *************** + *** 0 **** + --- 1,12 ---- + + eb-3.2.2 + dos $BMQ%Q%C%A(B + $B%Q%C%A$$$C$Q$$(B + + $B;HMQ>r7o!":FG[I[>r7o$O%*%j%8%J%k$K=>$$(B GPL $B$G$9!#(B + + $B>\$7$/$O(B copying $B%U%!%$%k$r8+$F2<$5$$!#(B + + + + eb.ja, eb_cmds.ja $B%U%!%$%k$O$N%3!<%I$rMxMQ$9$k$K$O!"(B + + $B4D6-JQ?t(B LANG $B$K(B "ja_JP.EUC-JP" $B$N$h$&$K;XDj$7$F2<$5$$!#(B + + + + $B$J$*(B ebappendix $B%3%^%s%I$O(B DOS $B$N%U%!%$%kL>$N@)8B$K(B + + $B$h$j(B appendix.pl $B$H$$$&L>A0$G<}O?$5$l$F$$$^$9!#(B + + + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/build.bat eb-4.0beta2.dos0.07/dos/build.bat + *** eb-4.0beta2/dos/build.bat Thu Jan 1 09:00:00 1970 + --- eb-4.0beta2.dos0.07/dos/build.bat Thu Oct 30 01:09:40 2003 + *************** + *** 0 **** + --- 1,85 ---- + + @echo off + + rem This batch file is made for command shell on Win NT series. + + rem Usage : + + rem build.bat [cmd] [lib] [arc] + + rem build.bat all + + rem build.bat clean + + + + set sys=dos os2 win + + :set sys=win + + + + mkdir eb + + mkdir ebu + + for %%i in (%sys%) do mkdir tmp-%%i + + for %%i in (%sys%) do mkdir %%i + + + + if '%1' == 'clean' goto clean + + + + copy ..\*.h ebu + + copy ..\zlib\*.h ebu + + copy ..\eb\*.h eb + + del ..\eb\build-post.h + + copy ..\libebutils\*.h ebu + + copy codeconv.h eb + + + + if '%1' == 'all' goto lib1 + + if not '%1' == 'lib' goto cmd + + shift + + :lib1 + + + + for %%i in (%sys%) do ( + + cd tmp-%%i + + wmake -f ..\libeb.mk sys=%%i all + + cd .. + + ) + + + + :cmd + + if '%1' == 'all' goto cmd1 + + if not '%1' == 'cmd' goto arc + + shift + + :cmd1 + + + + for %%i in (%sys%) do ( + + cd tmp-%%i + + wmake -f ..\ebcmds.mk sys=%%i + + cd .. + + ) + + + + :arc + + if '%1' == 'all' goto arc2 + + if not '%1' == 'arc' goto exit + + shift + + :arc2 + + + + del *.lzh + + copy ..\copying doc + + copy Readme.ja doc + + copy Readme.en doc + + for %%i in (%sys%) do ( + + lha a /r2x1 eb-%%i.lzh %%i + + ) + + REN EB-DOS.LZH EB-D32.LZH + + REN EB-OS2.LZH EB-O32.LZH + + REN EB-WIN.LZH EB-W32.LZH + + + + lha a /r2x1 eb-sdk.lzh eb\appendix.h eb\binary.h eb\defs.h eb\eb.h eb\error.h eb\font.h eb\text.h eb\zio.h lib\eb*.lib + + lha a /r2x1 eb-doc.lzh doc + + lha a /r2x1 eb-docja.lzh doc-ja + + + + goto exit + + + + + + :clean + + cd tmp-dos + + wmake -f ..\libeb.mk sys=dos clean + + cd ..\tmp-win + + wmake -f ..\libeb.mk sys=win clean + + cd ..\tmp-os2 + + wmake -f ..\libeb.mk sys=win clean + + cd .. + + + + :exit + + ECHO Done. + + set sys= + + + + :exit2 + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/codeconv.c eb-4.0beta2.dos0.07/dos/codeconv.c + *** eb-4.0beta2/dos/codeconv.c Thu Jan 1 09:00:00 1970 + --- eb-4.0beta2.dos0.07/dos/codeconv.c Wed Sep 3 22:33:01 2003 + *************** + *** 0 **** + --- 1,864 ---- + + /* + + * codeconv.c + + * Copyright(c) 2001 Takashi NEMOTO + + * + + * 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 2 of the License, or + + * (at your option) any later version. + + * + + * This program is distributed in the hope that it will be useful, + + * but WITHOUT ANY WARRANTY; without even the implied warranty of + + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + + * GNU General Public License for more details. + + * + + * Written by Takashi Nemoto (tnemoto@mvi.biglobe.ne.jp). + + * Modified by Kazuhiko + + * Modified by Satomi + + * + + */ + + + + /* #define DEBUG_CODECONV */ + + + + #ifdef HAVE_CONFIG_H + + #include "config.h" + + #endif + + + + #include "codeconv.h" + + + + #if defined(USE_CODECONV) && defined(__WATCOMC__) && defined(__WINDOWS_386__) + + /* dummy code to link floating point library */ + + static void dummy(void) { + + printf("%4.1f",0.1); + + } + + #endif + + + + #ifdef HAVE_SYS_TYPES_H + + # include + + #endif + + + + #include + + + + #ifdef HAVE_STDLIB_H + + # include + + #endif + + + + #ifdef HAVE_LOCALE_H + + # include + + #endif + + + + #ifdef HAVE_ICONV_H + + # include + + #endif + + + + #ifdef HAVE_ERRNO_H + + # include + + #endif + + + + #ifdef HAVE_STRING_H + + # include + + #endif + + + + #ifdef HAVE_LANGINFO_H + + #include + + #endif + + + + #ifdef HAVE_MALLOC_H + + #include + + #endif + + + + #ifndef HAVE_MEMCPY + + #define memcpy(d, s, n) bcopy((s), (d), (n)) + + #ifdef __STDC__ + + void *memchr(const void *, int, size_t); + + int memcmp(const void *, const void *, size_t); + + void *memmove(void *, const void *, size_t); + + void *memset(void *, int, size_t); + + #else /* not __STDC__ */ + + char *memchr(); + + int memcmp(); + + char *memmove(); + + char *memset(); + + #endif /* not __STDC__ */ + + #endif + + + + #ifdef HAVE_ICONV + + static iconv_t cur_to_euc = (iconv_t)-1; + + static iconv_t euc_to_cur = (iconv_t)-1; + + static const char *eucjp_code_name = NULL; + + #endif + + + + /* Return code <0: error, -2: Output Buffer Overflow */ + + size_t current_to_euc PROTO((char **current, size_t *in_len, + + char **euc, size_t *out_len)); + + static size_t euc_to_current PROTO((char **euc, size_t *in_len, + + char **current, size_t *out_len)); + + + + + + enum CONV_MODE {IO_AUTO, IO_ICONV, IO_SJIS, IO_EUC} conv_mode; + + + + static enum CONV_MODE detect_conv_mode PROTO((const char *encoding)); + + + + + + + + + + #define TMP_SIZE 10240 + + + + static int xputs_raw PROTO((const char *str, int len, FILE *fp)); + + static int xputs2 PROTO((const char *str, int len, FILE *fp)); + + + + static const char *euc_jp_names[] = { + + "eucJP", "EUC-JP", "eucjp", "euc-jp", "EUCJP", "ujis", "UJIS", + + "euc", "EUC", NULL + + }; + + + + static const char *shift_jis_names[] = { + + "SHIFT-JIS", "SHIFT_JIS", "SJIS", "CSSHIFTJIS", "SHIFTJIS", NULL + + }; + + + + #ifdef HAVE_ICONV + + static const char *iso_2022_jp_names[] = { + + "ISO-2022-JP-3", "ISO-2022-JP-2", "ISO-2022-JP", + + "CSISO2022JP", "CSISO2022JP2", "CSISO2022JP3", + + "ISO-2022", "ISO2022", "ISO2022JP", "ISO2022-JP", "JIS", NULL + + }; + + + + static const char *japanese_names[] = { + + "ja", "japanese", NULL + + }; + + #endif + + + + static int match_str(str,str_list) + + const char *str; + + const char **str_list; + + { + + const char **ptr; + + for(ptr=str_list;*ptr!=NULL;ptr++) { + + if (strcasecmp(str,*ptr)==0) return 1; + + } + + return 0; + + } + + + + /* + + + + ,A%3!<%IJQ494X?t=i4|2= IO_EUC / IO_SJIS + + 1b. ,A$@$a$J$i iconv ,A$GJQ49$G$-$k encoding ,A$+$rH=Dj => IO_ICONV + + ,A0J2It(.,A0J9_) ,A$+$i$N encoding ,A$, ja/japanese ,A$N>l9g + + iconv ,A$,M-$k>l9g => EUC_JP ,A$N iconv ,AL>$O!) + + iconv ,A$,L5$$>l9g => 4. ,A$G EUC_JP ,A$+$J!) + + locale ,A$, C ,A$H$+ en_US ,A$@$C$?$i!) => ,AEvLL FALLBACK ,A$9$k!# + + gettext ,ABP1~Ey$N>l9g$OMW$7!# + + + + */ + + + + #ifdef HAVE_ICONV + + + + static int + + setup_eucjp_code_name() + + { + + const char **enc; + + iconv_t ic; + + if (eucjp_code_name == NULL) { + + for (enc = euc_jp_names; *enc != NULL; enc++) { + + ic = iconv_open(*enc, *enc); + + if (ic != (iconv_t)-1) { + + eucjp_code_name = *enc; + + iconv_close(ic); + + break; + + } + + } + + if (eucjp_code_name == NULL) { + + /* EUC-JP ,A@_Dj$K<:GT - ,A[#Kf$J "ja" "japanese" ,A$b;n$9 */ + + for (enc = japanese_names; *enc != NULL; enc++) { + + ic = iconv_open(*enc,*enc); + + if (ic != (iconv_t)-1) { + + eucjp_code_name = *enc; + + iconv_close(ic); + + break; + + } + + } + + } + + } + + return eucjp_code_name != NULL; + + } + + + + /* Current locale ,A$N codeset ,A$GF|K\8l$,07$($k$+!) + + ,A<:GT$J$i 0, ,A@.8y$J$i 1 ,A$rJV$9 */ + + + + static int + + iconv_test(ctoe, etoc) + + iconv_t ctoe, etoc; + + { + + /* ,AJ8;zNs ",A current code ,A$NJQ49%F%9%H */ + + if (iconv(etoc,&test1,&ilen,&test2,&olen) == ((size_t)-1)) + + return 0; + + if (iconv(etoc,NULL,&ilen,&test2,&olen) == ((size_t)-1)) + + return 0; + + + + /* current code ,A$+$i ,A85$KLa$k$+ */ + + test2=test2_0; + + ilen=TEST_LENGTH-olen; + + olen=TEST_LENGTH; + + if (iconv(ctoe,&test2,&ilen,&test3,&olen) == ((size_t)-1)) + + return 0; + + if (iconv(ctoe,NULL,&ilen,&test3,&olen) == ((size_t)-1)) + + return 0; + + + + if (strncmp(test1_0,test3_0,strlen(test1_0)) != 0) + + return 0; + + + + return 1; + + } + + + + static int + + iconv_setup(current_code_name) + + const char *current_code_name; + + { + + iconv_t ctoe,etoc; + + static int disable_iconv = 0; + + + + if (disable_iconv) + + return 0; + + if (eucjp_code_name == NULL) { + + if (! setup_eucjp_code_name()) { + + disable_iconv = 1; + + return 0; + + } + + } + + + + if (current_code_name == NULL || eucjp_code_name == NULL) + + return 0; + + + + ctoe = iconv_open(eucjp_code_name, current_code_name); + + etoc = iconv_open(current_code_name, eucjp_code_name); + + + + + + if (iconv_test(ctoe, etoc)) { + + /* ,A$&$^$/$$$C$?$i ,A@_Dj$9$k */ + + if (cur_to_euc != (iconv_t) -1) + + iconv_close(cur_to_euc); + + if (euc_to_cur != (iconv_t) -1) + + iconv_close(euc_to_cur); + + cur_to_euc=ctoe; + + euc_to_cur=etoc; + + return 1; + + } else { + + if (ctoe != (iconv_t)-1) + + iconv_close(ctoe); + + if (etoc != (iconv_t)-1) + + iconv_close(etoc); + + return 0; + + } + + } + + #endif + + + + enum CONV_MODE detect_conv_mode(encoding) + + const char *encoding; + + { + + if (encoding == NULL) return IO_AUTO; + + if (match_str(encoding,euc_jp_names)) return IO_EUC; + + if (match_str(encoding,shift_jis_names)) return IO_SJIS; + + #ifdef HAVE_ICONV + + if (match_str(encoding,iso_2022_jp_names)) { + + const char **enc; + + for(enc = iso_2022_jp_names;*enc != NULL; enc++){ + + if (iconv_setup(*enc)) + + return IO_ICONV; + + } + + } else if (iconv_setup(encoding)) { + + return IO_ICONV; + + } + + #endif + + return IO_AUTO; + + } + + + + int + + locale_init(encoding) + + const char *encoding; + + { + + static int initialized = 0; + + #ifdef HAVE_SETLOCALE + + static char *locale_name = NULL; + + #ifdef HAVE_NL_LANGINFO + + static char *current_code_name = NULL; + + #endif + + #endif + + enum CONV_MODE cm_temp; + + + + #ifdef HAVE_SETLOCALE + + locale_name = setlocale(LC_CTYPE, ""); + + #endif + + + + /* 1. encoding ,A$K$h$k;XDj + + ,A!' ,AM-8z$J encoding ,A$,;XDj$5$l$l$P0JA0$NCM$r>e=q$- */ + + cm_temp = detect_conv_mode(encoding); + + if (cm_temp != IO_AUTO) { + + conv_mode = cm_temp; + + goto init_finish; + + } + + + + /* ,A$9$G$K ,A=i4|2=:Q$_$G$"$l$P ,A$=$N$^$^5"$k */ + + if (initialized != 0 && + + (conv_mode != IO_ICONV + + #ifdef HAVE_ICONV + + || (cur_to_euc != (iconv_t)-1 && euc_to_cur != (iconv_t)-1) + + #endif + + )) + + return CODECONV_OK; + + initialized = 0; + + conv_mode = IO_AUTO; + + + + #ifdef HAVE_SETLOCALE + + /* 2. current_locale ,A$+$i ,A7hDj$r;n$_$k */ + + #if defined(HAVE_NL_LANGINFO) && defined(CODESET) + + /* 2a/2b. nl_langinfo(CODESET) ,A$+$i$NIt$N3NG' */ + + if (locale_name != NULL) { + + char *try2; + + locale_name = strdup(locale_name); + + if (locale_name == NULL) + + return CODECONV_ERROR; + + try2 = strtok(locale_name, ".@"); + + if (try2 != NULL) + + try2 = strtok(NULL, ".@"); + + if (try2 != NULL) { + + conv_mode = detect_conv_mode(try2); + + if (conv_mode != IO_AUTO) goto init_finish; + + } + + } + + #endif /* HAVE_SETLOCALE */ + + + + /* 3a/3b. ,A$=$l$G$b$@$a$J$i FALLBACK ,A$9$k */ + + #ifdef FALLBACK_ENCODING + + conv_mode = detect_conv_mode(FALLBACK_ENCODING); + + #endif + + + + /* 4. ,A$"$-$i$a$F EUC_JP */ + + if (conv_mode == IO_AUTO) conv_mode = IO_EUC; + + + + init_finish: + + initialized = 1; + + return CODECONV_OK; + + } + + + + static int + + xputs_raw(str, len, fp) + + const char *str; + + int len; + + FILE *fp; + + { + + int outlen = 0; + + int len1 = len; + + int wlen; + + + + while (outlen < len) { + + wlen = fwrite(str, 1, len1, fp); + + if (wlen == 0) + + break; + + outlen += wlen; + + len1 -= wlen; + + str += wlen; + + } + + #ifdef __WATCOMC__ /* Bug ? */ + + fflush(fp); + + #endif + + return outlen; + + } + + + + static int + + xputs2(str, len, fp) + + const char *str; + + int len; + + FILE *fp; + + { + + char *buf1p, *buf1p0; + + char *buf2p, *buf2p0; + + size_t len1, len2; + + size_t outlen; + + int ret_code; + + size_t status; + + + + /* The maximum size of output is 4 times larger than input. */ + + outlen = len * 4; + + + + len1 = len; + + len2 = outlen; + + #ifdef HAVE_ALLOCA + + buf1p = buf1p0 = alloca(len1); + + #else + + buf1p = buf1p0 = malloc(len1); + + #endif + + if (buf1p == NULL) + + return EOF; + + #ifdef HAVE_ALLOCA + + buf2p = buf2p0 = alloca(len2); + + #else + + buf2p = buf2p0 = malloc(len2); + + #endif + + if (buf2p == NULL) { + + free(buf1p0); + + return EOF; + + } + + memcpy(buf1p, str, len); + + status=euc_to_current(&buf1p, &len1, &buf2p, &len2); + + if (status == -2) { /* ,A0l2s$@$1 ,A%a%b%jNN0h$r3HBg */ + + buf1p = buf1p0; + + len1 = len; + + outlen *= 3; + + len2 = outlen; + + #ifdef HAVE_ALLOCA + + buf2p = buf2p0 = alloca(outlen); + + #else + + free(buf2p0); + + buf2p = buf2p0 = malloc(outlen); + + #endif + + if (buf2p == NULL){ + + free(buf1p0); + + return EOF; + + } + + status=euc_to_current(&buf1p, &len1, &buf2p, &len2); + + } + + if (status == CODECONV_ERROR || status == CODECONV_BUFFER_OVERFLOW) { + + /* Conversion Error ,A$"$-$i$a$F ,A$=$N$^$^=PNO */ + + #ifndef HAVE_ALLOCA + + free(buf1p0); + + free(buf2p0); + + #endif + + return xputs_raw(str, len, fp); + + } + + #ifndef HAVE_ALLOCA + + free(buf1p0); + + #endif + + ret_code = xputs_raw(buf2p0, outlen - len2, fp); + + #ifndef HAVE_ALLOCA + + free(buf2p0); + + #endif + + return ret_code; + + } + + + + int + + xfputs(str, fp) + + const char *str; + + FILE* fp; + + { + + return xputs2(str, strlen(str), fp); + + } + + + + int + + xputs(str) + + const char *str; + + { + + int len; + + len=xfputs(str, stdout); + + if (len<0) return EOF; + + putchar('\n'); + + return len+1; + + } + + + + int + + xvfprintf(fp, fmt, ap) + + FILE *fp; + + const char *fmt; + + va_list ap; + + { + + char buf1[TMP_SIZE]; + + int len; + + #ifdef HAVE_VSNPRINTF + + len = vsnprintf(buf1, TMP_SIZE - 1, fmt, ap); + + buf1[TMP_SIZE - 1]=0; + + #else + + len = vsprintf(buf1, fmt, ap); + + #endif + + return xputs2(buf1, len, fp); + + } + + + + /* USE_STDARG_H is defined in codeconv.h */ + + #ifdef USE_STDARG_H + + int + + xfprintf(FILE *fp, const char *fmt, ...) + + #else + + int + + xfprintf(fp, fmt, va_alist) + + FILE *fp; + + const char *fmt; + + va_dcl + + #endif + + { + + int len; + + va_list ap; + + #ifdef USE_STDARG_H + + va_start(ap, fmt); + + #else + + va_start(ap); + + #endif + + len = xvfprintf(fp, fmt, ap); + + va_end(ap); + + return len; + + } + + + + int + + #ifdef USE_STDARG_H + + xprintf(const char *fmt, ...) + + #else + + xprintf(fmt, va_alist) + + const char *fmt; + + va_dcl + + #endif + + { + + int len; + + va_list ap; + + #ifdef USE_STDARG_H + + va_start(ap, fmt); + + #else + + va_start(ap); + + #endif + + len = xvfprintf(stdout, fmt, ap); + + va_end(ap); + + return len; + + } + + + + char * + + xfgets(str, size, fp) + + char *str; + + int size; + + FILE *fp; + + { + + char *ibuf, *ibuf0; + + size_t ilen; + + size_t status; + + char *str0; + + int size0; + + + + str0 = str; + + size0 = size; + + + + /* The maximum size of input is 4 times larger than size. */ + + ilen = size * 4; + + #ifdef HAVE_ALLOCA + + ibuf0 = ibuf = alloca(ilen+1); + + #else + + ibuf0 = ibuf = malloc(ilen+1); + + #endif + + if (ibuf == NULL) + + return NULL; + + + + if (fgets(ibuf, ilen, fp) == NULL) { + + #ifndef HAVE_ALLOCA + + free(ibuf); + + #endif + + return NULL; + + } + + ibuf[ilen]=0; + + ilen=strlen(ibuf); + + + + status = current_to_euc(&ibuf,&ilen,&str,(size_t *)&size); + + str0[size0-size]=0; + + #ifndef HAVE_ALLOCA + + free(ibuf0); + + #endif + + if (status != CODECONV_ERROR) return str0; + + return NULL; + + } + + + + /* ================================================================== */ + + + + char* + + jis_to_euc(euc, jis, len) + + char *euc; + + const char *jis; + + int len; + + { + + const char *jis_end; + + char *q; + + jis_end = jis + len; + + /* Remove white space at tail of string */ + + while (jis_end >= jis + 2 && + + ((jis_end[-1] == '\0' && jis_end[-2] == '\0') || + + (jis_end[-1] == 0x21 && jis_end[-2] == 0x21))) + + jis_end -= 2; + + q = euc; + + while (jis < jis_end) + + *q++ = (*jis++ | 0x80); + + *q = '\0'; + + return (char *)euc; + + } + + + + char* + + euc_to_jis(jis, euc, len) + + char *jis; + + const char *euc; + + int len; + + { + + const char *euc_end; + + char *q; + + euc_end = euc + len; + + /* Remove white space at tail of string */ + + while (euc_end >= euc + 2 && + + ((euc_end[-1] == '\0' && euc_end[-2] == '\0') || + + (euc_end[-1] == 0x21 && euc_end[-2] == 0x21))) + + euc_end -= 2; + + q = jis; + + while (euc < euc_end) + + *q++ = (*euc++ & 0x7f); + + *q = '\0'; + + return (char *)jis; + + } + + + + size_t current_to_euc (in_buf,in_len,out_buf,out_len) + + char **in_buf, **out_buf; + + size_t *in_len,*out_len; + + { + + static int output_left = -1; + + int c1, c2; + + size_t count = 0; + + + + #ifdef HAVE_ICONV + + if (conv_mode == IO_ICONV) { + + size_t ret; + + if (cur_to_euc == (iconv_t) -1) + + return CODECONV_ERROR; + + ret = iconv(cur_to_euc,in_buf,in_len,out_buf,out_len); + + if (ret != ((size_t)-1)) + + ret = iconv(cur_to_euc, NULL, in_len, out_buf, out_len); + + #if defined (HAVE_ERRNO_H) && defined (E2BIG) + + if (ret == ((size_t)-1)) { + + if (errno == E2BIG) + + return CODECONV_BUFFER_OVERFLOW; + + return CODECONV_ERROR; + + } + + #endif /* HAVE_ERRNO_H / E2BIG */ + + return ret; + + } + + #endif /* HAVE_ICONV */ + + + + if (output_left >= 0) { + + if (*out_len > 0) { + + *((*in_buf)++) = output_left; + + (*out_len)--; + + count++; + + output_left = -1; + + } else { + + /* Output Buffer Overflow */ + + return CODECONV_BUFFER_OVERFLOW; + + } + + } + + if (conv_mode == IO_SJIS) { + + while(*in_len>0) { + + if (*out_len<=0) break; + + c1 = *((*in_buf)++) & 0xff; + + (*in_len)--; + + if (c1 < 0x80) { /* ASCII ,AJ8;z */ + + (*out_len)--; + + count++; + + *((*out_buf)++)=c1; + + continue; + + } else if ((c1 < 0x81 || c1 > 0x9f) && (c1 < 0xe0 || c1 > 0xef)) { + + /* ,AH>3Q%+%J */ + + if (0xa1 <= c1 && c1 <= 0xdf) { + + c2 = c1 - 0x80; + + c1 = 0x8e; + + } else { + + return -1; + + } + + } else { + + c2 = *((*in_buf)++) & 0xff; + + (*in_len)--; + + if (c1 > 0x9f) + + c1 -= 0x40; + + c1 += c1; + + if (c2 <= 0x9e) { + + c1 -= 0xe1; + + if (c2 >= 0x80) + + c2 -= 1; + + c2 -= 0x1f; + + } else { + + c1 -= 0xe0; + + c2 -= 0x7e; + + } + + c2 |= 0x80; + + } + + *((*out_buf)++) = c1 | 0x80; + + (*out_len)--; + + count++; + + if (*out_len <= 0) { + + output_left = c2; + + return CODECONV_BUFFER_OVERFLOW; + + } + + *((*out_buf)++) = c2; + + (*out_len)--; + + count++; + + } + + if (*in_len == 0) return count; + + if (*out_len == 0) return CODECONV_BUFFER_OVERFLOW; + + return CODECONV_ERROR; + + } else { /* IO_EUC */ + + if (*out_len < *in_len) { + + memcpy(*out_buf,*in_buf,*out_len); + + count = *out_len; + + (*out_buf) += *out_len; + + (*in_buf) += *out_len; + + (*in_len) -= *out_len; + + *out_len = 0; + + return CODECONV_BUFFER_OVERFLOW; + + } else { + + memcpy(*out_buf,*in_buf,*in_len); + + count = *in_len; + + (*out_buf)+=*in_len; + + (*in_buf)+=*in_len; + + (*out_len)-=*in_len; + + *in_len=0; + + return count; + + } + + } + + return CODECONV_ERROR; /* Never */ + + } + + + + size_t euc_to_current (in_buf,in_len,out_buf,out_len) + + char **in_buf, **out_buf; + + size_t *in_len,*out_len; + + { + + static int output_left = -1; + + int c1, c2; + + size_t count = 0; + + + + #ifdef HAVE_ICONV + + if (conv_mode == IO_ICONV) { + + size_t ret; + + if (euc_to_cur == (iconv_t) -1) + + return CODECONV_ERROR; + + ret = iconv(euc_to_cur,in_buf,in_len,out_buf,out_len); + + if (ret != ((size_t)-1)) + + ret = iconv(euc_to_cur,NULL,in_len,out_buf,out_len); + + #if defined (HAVE_ERRNO_H) && defined (E2BIG) + + if (ret == ((size_t)-1)) { + + if (errno == E2BIG) + + return CODECONV_BUFFER_OVERFLOW; + + return CODECONV_ERROR; + + } + + #endif /* HAVE_ERRNO_H / E2BIG */ + + return ret; + + } + + #endif /* HAVE_ICONV */ + + + + if (output_left >= 0) { + + if (*out_len > 0) { + + *((*in_buf)++) = output_left; + + (*out_len)--; + + count++; + + output_left = -1; + + } else { + + /* Output Buffer Overflow */ + + return CODECONV_BUFFER_OVERFLOW; + + } + + } + + if (conv_mode == IO_SJIS) { + + while(*in_len>0) { + + if (*out_len<=0) break; + + c1 = *((*in_buf)++) & 0xff; + + (*in_len)--; + + if ((c1 & 0x80) == 0) { + + *((*out_buf)++) = c1; + + (*out_len)--; + + count++; + + continue; + + } + + if (0x8e == c1) { + + *((*out_buf)++) = *((*in_buf)++) | 0x80; + + (*in_len)--; + + (*out_len)--; + + count++; + + continue; + + } + + c1 &= 0x7f; + + c2 = *((*in_buf)++) & 0x7f; + + (*in_len)--; + + if (c1 & 0x01) { + + c2 += 0x1f; + + if (c2 > 0x7e) + + c2++; + + } else { + + c2 += 0x7e; + + } + + c1 = (c1 + 0xe1) >> 1; + + if (c1 > 0x9f) + + c1 += 0x40; + + *((*out_buf)++) = c1; + + (*out_len)--; + + count++; + + if (*out_len <= 0) { + + output_left = c2; + + return CODECONV_BUFFER_OVERFLOW; + + } + + *((*out_buf)++) = c2; + + (*out_len)--; + + count++; + + } + + if (*in_len == 0) return count; + + if (*out_len == 0) return CODECONV_BUFFER_OVERFLOW; + + return CODECONV_ERROR; + + } else { /* IO_EUC */ + + if (*out_len < *in_len) { + + memcpy(*out_buf,*in_buf,*out_len); + + count = *out_len; + + (*out_buf)+=*out_len; + + (*in_buf)+=*out_len; + + (*in_len)-=*out_len; + + *out_len=0; + + return CODECONV_BUFFER_OVERFLOW; + + } else { + + memcpy(*out_buf,*in_buf,*in_len); + + count = *in_len; + + (*out_buf)+=*in_len; + + (*in_buf)+=*in_len; + + (*out_len)-=*in_len; + + *in_len=0; + + return count; + + } + + } + + return CODECONV_ERROR; /* Never */ + + } + + + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/codeconv.h eb-4.0beta2.dos0.07/dos/codeconv.h + *** eb-4.0beta2/dos/codeconv.h Thu Jan 1 09:00:00 1970 + --- eb-4.0beta2.dos0.07/dos/codeconv.h Wed Sep 3 22:33:01 2003 + *************** + *** 0 **** + --- 1,60 ---- + + /* + + * codeconv.h - header file for code conversion + + * + + * 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 2 of the License, or + + * (at your option) any later version. + + * + + * This program is distributed in the hope that it will be useful, + + * but WITHOUT ANY WARRANTY; without even the implied warranty of + + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + + * GNU General Public License for more details. + + * + + * Written by Takashi Nemoto (tnemoto@mvi.biglobe.ne.jp). + + * Modified by Kazuhiko + + * Modified by Satomi + + */ + + + + #ifndef __CODECONV_H__ + + #define __CODECONV_H__ + + + + #ifdef HAVE_CONFIG_H + + #include "config.h" + + #endif + + + + #ifdef STDC_HEADERS + + #include + + #endif + + + + #if defined(__STDC__) || defined(WIN32) + + #include + + #define USE_STDARG_H + + #endif + + + + #define CODECONV_BUFFER_OVERFLOW ((size_t)-2) + + #define CODECONV_ERROR ((size_t)-1) + + #define CODECONV_OK 0 + + + + #ifndef PROTO + + #if defined(__STDC__) + + #define PROTO(p) p + + #else + + #define PROTO(p) () + + #endif + + #endif /* PROTO */ + + + + extern int locale_init PROTO((const char *encoding)); + + extern int xvfprintf PROTO((FILE *fp, const char *fmt, va_list ap)); + + extern int xfprintf PROTO((FILE *fp, const char *fmt, ...)); + + extern int xprintf PROTO((const char *fmt, ...)); + + extern int xfputs PROTO((const char *str, FILE *fp)); + + extern int xputs PROTO((const char *str)); + + extern char *xfgets PROTO((char *str, int size, FILE *fp)); + + + + extern char *euc_to_jis PROTO((char *jis, const char *euc, int len)); + + extern char *jis_to_euc PROTO((char *euc, const char *jis, int len)); + + extern size_t current_to_euc PROTO((char **current, size_t *in_len, + + char **euc, size_t *out_len)); + + + + #endif + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/config.h.in eb-4.0beta2.dos0.07/dos/config.h.in + *** eb-4.0beta2/dos/config.h.in Thu Jan 1 09:00:00 1970 + --- eb-4.0beta2.dos0.07/dos/config.h.in Thu Oct 30 01:09:21 2003 + *************** + *** 0 **** + --- 1,244 ---- + + /* Configuration file for DOS-32bit, OS/2-32bit, Windows-32bit environment */ + + #ifndef __CONFIG_H__ + + #define __CONFIG_H__ + + + + /* Define if using `alloca.c'. */ + + /* #undef C_ALLOCA */ + + /* Define if EB Library is built with pthread support. */ + + /* #undef EBCONF_ENABLE_PTHREAD */ + + + + /* Define if NLS is requested */ + + #define ENABLE_NLS + + + + /* Define if pthread support is enabled. */ + + /* #undef ENABLE_PTHREAD */ + + + + /* Define if command names have the suffix `.exe' */ + + #define EXEEXT_EXE + + + + /* Define if you have `alloca', as a function or macro. */ + + #define HAVE_ALLOCA 1 + + + + /* Define if you have and it should be used (not on Ultrix). */ + + /* #undef HAVE_ALLOCA_H */ + + + + /* Define if you have the header file. */ + + /* #undef HAVE_ARGZ_H */ + + + + /* Define if you have the header file. */ + + #define HAVE_DIRECT_H + + + + /* Define if you have the header file, and it defines `DIR'. */ + + /* #undef HAVE_DIRENT_H */ + + + + /* Define if you have the header file. */ + + /* #undef HAVE_DLFCN_H */ + + + + /* Define if you don't have `vprintf' but do have `_doprnt.' */ + + /* #undef HAVE_DOPRNT */ + + + + /* Define if you have the header file. */ + + #define HAVE_FCNTL_H 1 + + + + /* Define if you have the `getcwd' function. */ + + #define HAVE_GETCWD 1 + + + + /* Define if you have the `getpagesize' function. */ + + /* #undef HAVE_GETPAGESIZE */ + + + + /* Define if you have the header file. */ + + /* #undef HAVE_INTTYPES_H */ + + + + /* Define if you have the `LC_MESSAGES' locale category */ + + /* #undef HAVE_LC_MESSAGES */ + + + + /* Define if you have the header file. */ + + #define HAVE_LIMITS_H 1 + + + + /* Define if you have the header file. */ + + #define HAVE_LOCALE_H + + + + /* Define if you have the header file. */ + + #define HAVE_MALLOC_H 1 + + + + /* Define if you have the `memcpy' function. */ + + #define HAVE_MEMCPY 1 + + + + /* Define if you have the `memmove' function. */ + + #define HAVE_MEMMOVE 1 + + + + /* Define if you have the header file. */ + + #define HAVE_MEMORY_H 1 + + + + /* Define if you have the `memset' function. */ + + #define HAVE_MEMSET 1 + + + + /* Define if you have a working `mmap' system call. */ + + /* #undef HAVE_MMAP */ + + + + /* Define if you have the `munmap' function. */ + + /* #undef HAVE_MUNMAP */ + + + + /* Define if you have the header file, and it defines `DIR'. */ + + /* #undef HAVE_NDIR_H */ + + + + /* Define if you have the header file. */ + + /* #undef HAVE_NL_TYPES_H */ + + + + /* Define if you have the header file. */ + + /* #undef HAVE_PTHREAD_H */ + + + + /* Define if you have the `putenv' function. */ + + #define HAVE_PUTENV 1 + + + + /* Define if you have the `setenv' function. */ + + #define HAVE_SETENV 1 + + + + /* Define if you have the `setlocale' function. */ + + #define HAVE_SETLOCALE 1 + + + + /* Define if you have the header file. */ + + /* #undef HAVE_STDINT_H */ + + + + /* Define if you have the header file. */ + + #define HAVE_STDLIB_H 1 + + + + /* Define if you have the `strcasecmp' function. */ + + #define HAVE_STRCASECMP + + #define strcasecmp stricmp + + #define strncasecmp strnicmp + + + + /* Define if you have the `strchr' function. */ + + #define HAVE_STRCHR 1 + + + + /* Define if you have the `strdup' function. */ + + #define HAVE_STRDUP 1 + + + + /* Define if you have the `strerror' function. */ + + #define HAVE_STRERROR 1 + + + + /* Define if you have the header file. */ + + /* #undef HAVE_STRINGS_H */ + + + + /* Define if you have the header file. */ + + #define HAVE_STRING_H 1 + + + + /* Define if `struct utimbuf' is declared -- usually in . */ + + #define HAVE_STRUCT_UTIMBUF 1 + + + + /* Define if you have the `syslog' function. */ + + /* #undef HAVE_SYSLOG */ + + + + /* Define if you have the header file. */ + + /* #undef HAVE_SYSLOG_H */ + + + + /* Define if you have the header file, and it defines `DIR'. */ + + /* #undef HAVE_SYS_DIR_H */ + + + + /* Define if you have the header file, and it defines `DIR'. */ + + /* #undef HAVE_SYS_NDIR_H */ + + + + /* Define if you have the header file. */ + + /* #undef HAVE_SYS_PARAM_H */ + + + + /* Define if you have the header file. */ + + #define HAVE_SYS_STAT_H 1 + + + + /* Define if you have the header file. */ + + #define HAVE_SYS_TYPES_H 1 + + + + /* Define if you have the header file. */ + + #define HAVE_SYS_UTIME_H 1 + + + + /* Define if you have the header file. */ + + #define HAVE_UNISTD_H 1 + + + + /* Define if you have the `utime' function. */ + + #define HAVE_UTIME 1 + + + + /* Define if you have the header file. */ + + /* #undef HAVE_UTIME_H */ + + + + /* Define if you have the `vprintf' function. */ + + #define HAVE_VPRINTF 1 + + + + /* Define if you have the `vsyslog' function. */ + + /* #undef HAVE_VSYSLOG */ + + + + /* Define if you have the `_getdcwd' function. */ + + /* #undef HAVE__GETDCWD */ + + + + /* Define if you have the `__argz_count' function. */ + + /* #undef HAVE___ARGZ_COUNT */ + + + + /* Define if you have the `__argz_next' function. */ + + /* #undef HAVE___ARGZ_NEXT */ + + + + /* Define if you have the `__argz_stringify' function. */ + + /* #undef HAVE___ARGZ_STRINGIFY */ + + + + /* Mailing address */ + + #define MAILING_ADDRESS "m-kasahr@sra.co.jp" + + + + /* Name of package */ + + #define PACKAGE "eb" + + + + /* Define as the return type of signal handlers (`int' or `void'). */ + + #define RETSIGTYPE void + + + + /* Define if the signal function returns void. */ + + #define RETSIGTYPE_VOID 1 + + + + /* If using the C implementation of alloca, define if you know the + + direction of stack growth for your system; otherwise it will be + + automatically deduced at run-time. + + STACK_DIRECTION > 0 => grows toward higher addresses + + STACK_DIRECTION < 0 => grows toward lower addresses + + STACK_DIRECTION = 0 => direction of growth unknown */ + + /* #undef STACK_DIRECTION */ + + + + /* Define if the `S_IS*' macros in do not work properly. */ + + /* #undef STAT_MACROS_BROKEN */ + + + + /* Define if you have the ANSI C header files. */ + + #define STDC_HEADERS 1 + + + + /* Define if you can safely include both and . */ + + /* #undef TIME_WITH_SYS_TIME */ + + + + /* Version number of package */ + + #define VERSION "@VERSION@" + + + + /* Define to empty if `const' does not conform to ANSI C. */ + + /* #undef const */ + + + + /* Define as `__inline' if that's what the C compiler calls it, or to nothing + + if it is not supported. */ + + /* #undef inline */ + + + + /* Define to `int' if does not define. */ + + #define mode_t int + + + + /* Define to `long' if does not define. */ + + /* #undef off_t */ + + + + /* Define to `unsigned' if does not define. */ + + /* #undef size_t */ + + + + /* Define to `int' if does not define. */ + + #define ssize_t int + + + + #define REPLACE_GETOPT + + #define DOS_FILE_PATH + + #define getdcwd _getdcwd + + #define USE_CODECONV + + #define USE_TINY_GETTEXT + + #define FALLBACK_ENCODING "SHIFT-JIS" + + #define TEXT_DOMAIN_NAME"eb_cmds" + + + + #if 0 && defined(__WATCOMC__) && defined(__NT__) + + #define ENABLE_EBNET + + #endif + + + + #endif + + + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/dll.lnk eb-4.0beta2.dos0.07/dos/dll.lnk + *** eb-4.0beta2/dos/dll.lnk Thu Jan 1 09:00:00 1970 + --- eb-4.0beta2.dos0.07/dos/dll.lnk Thu Oct 30 01:14:45 2003 + *************** + *** 0 **** + --- 1,321 ---- + + # + + # appendix.h + + # + + + + # appendix.c + + export eb_initialize_appendix + + export eb_finalize_appendix + + export eb_bind_appendix + + export eb_is_appendix_bound + + export eb_appendix_path + + + + # appsub.c + + export eb_load_all_appendix_subbooks + + export eb_appendix_subbook_list + + export eb_appendix_subbook + + export eb_appendix_subbook_directory + + export eb_appendix_subbook_directory2 + + export eb_set_appendix_subbook + + export eb_unset_appendix_subbook + + + + # narwalt.c + + export eb_have_narrow_alt + + export eb_narrow_alt_start + + export eb_narrow_alt_end + + export eb_narrow_alt_character_text + + export eb_forward_narrow_alt_character + + export eb_backward_narrow_alt_character + + + + # stopcode.c + + export eb_have_stop_code + + export eb_stop_code + + + + # widealt.c + + export eb_have_wide_alt + + export eb_wide_alt_start + + export eb_wide_alt_end + + export eb_wide_alt_character_text + + export eb_forward_wide_alt_character + + export eb_backward_wide_alt_character + + + + # book.c + + export eb_initialize_book + + export eb_bind + + export eb_finalize_book + + export eb_is_bound + + export eb_path + + export eb_disc_type + + export eb_character_code + + + + # copyright.h + + export eb_have_copyright + + export eb_copyright + + + + # eb.c + + export eb_initialize_library + + export eb_finalize_library + + + + # endword.c + + export eb_have_endword_search + + export eb_search_endword + + + + # exactword.c + + export eb_have_exactword_search + + export eb_search_exactword + + + + # graphic.c + + #export eb_have_graphic_search + + + + # keyword.c + + export eb_have_keyword_search + + export eb_search_keyword + + + + # lock.c + + export eb_pthread_enabled + + + + # log.c + + export eb_set_log_function + + export eb_enable_log + + export eb_disable_log + + export eb_log + + export eb_log_stderr + + + + # menu.c + + export eb_have_menu + + export eb_menu + + + + # multi.c + + export eb_have_multi_search + + export eb_multi_search_list + + export eb_multi_entry_count + + export eb_multi_entry_list + + export eb_multi_entry_label + + export eb_multi_entry_have_candidates + + export eb_multi_entry_candidates + + export eb_search_multi + + export eb_multi_title + + + + # text.c + + export eb_have_text + + export eb_text + + + + # search.c + + export eb_hit_list + + + + # subbook.c + + export eb_load_all_subbooks + + export eb_subbook_list + + export eb_subbook + + export eb_subbook_title + + export eb_subbook_title2 + + export eb_subbook_directory + + export eb_subbook_directory2 + + export eb_set_subbook + + export eb_unset_subbook + + + + # word.c + + export eb_have_word_search + + export eb_search_word + + + + ##################### + + # font.h + + ##################### + + # bitmap.c + + export eb_narrow_font_xbm_size + + export eb_narrow_font_xpm_size + + export eb_narrow_font_gif_size + + export eb_narrow_font_bmp_size + + export eb_wide_font_xbm_size + + export eb_wide_font_xpm_size + + export eb_wide_font_gif_size + + export eb_wide_font_bmp_size + + export eb_bitmap_to_xbm + + export eb_bitmap_to_xpm + + export eb_bitmap_to_gif + + export eb_bitmap_to_bmp + + + + # font.c + + export eb_font + + export eb_set_font + + export eb_unset_font + + export eb_font_list + + export eb_have_font + + export eb_font_height + + export eb_font_height2 + + + + # narwfont.c + + export eb_have_narrow_font + + export eb_narrow_font_width + + export eb_narrow_font_width2 + + export eb_narrow_font_size + + export eb_narrow_font_size2 + + export eb_narrow_font_start + + export eb_narrow_font_end + + export eb_narrow_font_character_bitmap + + export eb_forward_narrow_font_character + + export eb_backward_narrow_font_character + + + + # widefont.c + + export eb_have_wide_font + + export eb_wide_font_width + + export eb_wide_font_width2 + + export eb_wide_font_size + + export eb_wide_font_size2 + + export eb_wide_font_start + + export eb_wide_font_end + + export eb_wide_font_character_bitmap + + export eb_forward_wide_font_character + + export eb_backward_wide_font_character + + + + # + + # codeconv.h + + # + + export locale_init + + export xvfprintf + + export xfprintf + + export xprintf + + export xfputs + + export xputs + + export xfgets + + + + export euc_to_jis + + export jis_to_euc + + + + # + + # Tiny gettext + + # + + export bindtextdomain + + export textdomain + + export dgettext + + export gettext + + + + # + + # error.c + + # + + export eb_error_string + + export eb_error_message + + + + # + + # ebutils.c + + # + + export output_try_help + + export output_version + + export parse_subbook_name_argument + + export find_subbook + + export canonicalize_path + + + + # + + # samefile.c + + # + + export is_same_file + + + + # + + # yesno.c + + # + + export query_y_or_n + + + + # + + # + + # + + + + # + + # getopt.c + + # + + + + export eb_canonicalize_path_name + + export eb_canonicalize_file_name + + export eb_fix_directory_name + + export eb_fix_directory_name2 + + export eb_fix_path_name_suffix + + export eb_find_file_name + + export eb_find_file_name2 + + export eb_find_file_name3 + + export eb_compose_path_name + + export eb_compose_path_name2 + + export eb_compose_path_name3 + + export eb_path_name_zio_code + + export get_umask + + export make_missing_directory + + + + # + + # zlib + + # + + export deflate + + export deflateEnd + + export deflateInit_ + + export adler32 + + + + # + + # zio + + # + + export zio_initialize_library + + export zio_finalize_library + + export zio_initialize + + export zio_finalize + + export zio_set_sebxa_mode + + export zio_open + + export zio_close + + export zio_file + + export zio_mode + + export zio_lseek + + export zio_read + + + + + + # + + # text.h + + # + + # /* hook.c */ + + export eb_initialize_hookset + + export eb_finalize_hookset + + export eb_set_hook + + export eb_set_hooks + + export eb_hook_euc_to_ascii + + # export eb_hook_stop_code + + export eb_hook_narrow_character_text + + export eb_hook_wide_character_text + + export eb_hook_newline + + export eb_hook_empty + + + + #/* readtext.c */ + + export eb_seek_text + + export eb_tell_text + + export eb_read_text + + export eb_read_heading + + export eb_read_rawtext + + export eb_is_text_stopped + + export eb_write_text_byte1 + + export eb_write_text_byte2 + + export eb_write_text_string + + export eb_write_text + + export eb_current_candidate + + export eb_forward_text + + export eb_backward_text + + + + # + + # binary.h + + # + + # /* binary.c */ + + export eb_set_binary_mono_graphic + + export eb_set_binary_gray_graphic + + # export eb_set_binary_bitmap + + export eb_set_binary_wave + + export eb_set_binary_color_graphic + + export eb_set_binary_mpeg + + export eb_read_binary + + export eb_unset_binary + + + + # /* filename.c */ + + export eb_compose_movie_file_name + + export eb_decompose_movie_file_name + + + + # /* booklist.c */ + + export eb_initialize_booklist + + export eb_get_booklist + + export eb_booklist_book_count + + export eb_booklist_book_name + + export eb_booklist_book_title + + export eb_finalize_booklist + + + + + + export set_invoked_name + + + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/ebapp.c eb-4.0beta2.dos0.07/dos/ebapp.c + *** eb-4.0beta2/dos/ebapp.c Thu Jan 1 09:00:00 1970 + --- eb-4.0beta2.dos0.07/dos/ebapp.c Wed Sep 3 22:33:01 2003 + *************** + *** 0 **** + --- 1,112 ---- + + #include + + #include + + + + #include "build-pre.h" + + #include "eb.h" + + #include "error.h" + + #include "build-post.h" + + + + #include "getopt.h" + + #include "codeconv.h" + + + + static char *Version = "0.00001"; + + static char *CmdName = "yaapp"; + + static char *MailingAddress = "tnemoto@mvi.biglobe.ne.jp"; + + static char *HelpMsg = + + "Usage: %s [option...] [input-directory]\n" + + "Options:\n" + + " -b BOOK-TYPE --book-type BOOK-TYPE\n" + + " make an appendix as BOOK-TYPE; eb or epwing\n" + + " (default: depend on `catalog(s).app')\n" + + " -c CASE --case CASE\n" + + " output files which have filenames with CASE\n" + + " letters; upper or lower\n" + + " (default: depend on `catalog(s).app')\n" + + " -d --debug --verbose debug mode\n" + + " -h --help output this help, then exit\n" + + " -n --no-catalog don't output a catalog file\n" + + " -o DIRECTORY --output-directory DIRECTORY\n" + + " output files to DIRECTORY\n" + + " (default: .)\n" + + " -s SUFFIX --suffix SUFFIX\n" + + " output files which have filenames with SUFFIX;\n" + + " none, dot, version or both\n" + + " (default: none)\n" + + " -t --test only check for input files\n" + + " -v --version output version number, then exit\n" + + "\n" + + "Argument:\n" + + " input-directory input files at this directory\n" + + " (default: .)\n" + + "\n" + + "Report bugs to %s.\n"; + + + + + + static const char *short_options = "b:c:dhno:s:tv"; + + static struct option long_options[] = { + + {"book-type", required_argument, NULL, 'b'}, + + {"case", required_argument, NULL, 'c'}, + + {"debug", no_argument, NULL, 'd'}, + + {"verbose", no_argument, NULL, 'd'}, + + {"help", no_argument, NULL, 'h'}, + + {"no-catalog", no_argument, NULL, 'n'}, + + {"output-directory", required_argument, NULL, 'o'}, + + {"suffix", required_argument, NULL, 's'}, + + {"test", no_argument, NULL, 't'}, + + {"version", no_argument, NULL, 'v'}, + + {NULL, 0, NULL, 0} + + }; + + + + enum {TYPE_EB, TYPE_EPWING}; + + enum {LOWER_CASE, UPPER_CASE, AUTOMATIC_CASE }; + + enum {DEBUG_OFF, DEBUG_ON}; + + enum {SUFFIX_NONE, SUFFIX_DOT, SUFFIX_VERSION, SUFFIX_BOTH}; + + enum {CHECK_NOT_ONLY, CHECK_ONLY}; + + + + int Disc = TYPE_EPWING; + + int Upcase = AUTOMATIC_CASE; + + int Debug = DEBUG_OFF; + + int Book_type = TYPE_EPWING; + + int Suffix_type = SUFFIX_NONE; + + int Check_only = CHECK_NOT_ONLY; + + + + int MaxSubbooks = 50; + + int MaxLen_Alt = 31; + + int MaxLen_Subname = 8; + + + + void try_help(char *cmd) { + + fprintf(stderr,_("Try '%s --help' for more information\n"), cmd); + + exit(1); + + }; + + + + int main(int argc, char **argv) { + + char indir[EB_MAX_PATH_LENGTH+1]; + + char outdir[EB_MAX_PATH_LENGTH+1]; + + char catpath[EB_MAX_PATH_LENGTH+1]; + + + + int ch; + + for(;;) { + + ch = getopt_long(argc, argv, short_options, long_options, NULL); + + if (ch<0) break; + + switch (ch) { + + case 'v': + + fprintf(stderr,"Yet Another APPpendix generator %s version %s\n", + + CmdName, Version); + + exit(0); + + case 'h': + + fprintf(stderr, HelpMsg, argv[0], MailingAddress); + + exit(0); + + case 'b': + + if (optarg != NULL) { + + if (strcasecmp(optarg,"eb") == 0) { + + Disc = TYPE_EB; + + } else if (strcasecmp(optarg,"epwing") == 0) { + + Disc = TYPE_EPWING; + + } + + } else { + + fprintf(stderr,_("Unknown disc type '%s'.\n"),optarg); + + try_help(argv[0]); + + } + + } + + } + + } + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/ebcmds.mk eb-4.0beta2.dos0.07/dos/ebcmds.mk + *** eb-4.0beta2/dos/ebcmds.mk Thu Jan 1 09:00:00 1970 + --- eb-4.0beta2.dos0.07/dos/ebcmds.mk Wed Sep 3 22:33:01 2003 + *************** + *** 0 **** + --- 1,92 ---- + + # Valid System Name : sys=os2, win, dos + + + + CC = wcl386 + + + + !ifeq sys os2 + + CF_SYSDEP = -5s -bt=os2 -mf + + LF_SYSDEP = SYS os2v2 + + + + !else ifeq sys win + + CF_SYSDEP = -5s -bt=nt -mf -fpc + + LF_SYSDEP = SYS nt + + + + !else ifeq sys dos + + CF_SYSDEP = -5s -bt=dos -mf + + CFDLL_SYSDEP = $(CF_SYSDEP) + + + + !else + + !error Target System is invalid. "$(sys)" + + !endif + + + + CF_COMMON = -i=$(%WATCOM)\h;..;..\eb;..\ebu -w4 -e25 -od -ficonfig.h + + LF_COMMON = d all op m op maxe=25 + + + + + + CFLAGS=$(CF_COMMON) $(CF_SYSDEP) + + LDFLAGS=$(LF_COMMON) $(LF_SYSDEP) + + WCL = $(CFLAGS) + + WCL386 = $(WCL) + + LD = wlink + + + + LIB = ..\lib\eb$(SYS).lib + + + + all : ..\$(SYS)\ebinfo.exe ..\$(SYS)\ebrefile.exe ..\$(SYS)\ebfont.exe ..\$(SYS)\ebzip.exe ..\$(SYS)\appendix.pl ..\$(SYS)\eb_cmds.ja .symbolic + + @echo Finish !! + + + + ..\$(SYS)\eb_cmds.ja : ..\eb_cmds.ja + + -copy ..\eb_cmds.ja ..\$(SYS) + + + + .EXTENSIONS : .txt + + .c: ..;..\..;..\..\zlib;..\..\eb;..\..\libebu;..\..\ebinfo;..\..\ebrefile;..\..\ebzip;..\..\ebfont + + .c.obj: .AUTODEPEND + + $(CC) $(CFLAGS) -c $[@ + + + + ebutils.obj : ebutils.h + + + + ..\$(SYS)\ebinfo.exe : ebinfo.obj $(LIB) + + $(LD) $(LDFLAGS) Name $@ File $[@ Library $(LIB) + + + + ..\$(SYS)\ebrefile.exe : ebrefile.obj $(LIB) + + $(LD) $(LDFLAGS) Name $@ File $[@ Library $(LIB) + + + + ..\$(SYS)\ebzip.exe : ebzip.obj copyfile.obj ebzip1.obj sebxa.obj unzipbook.obj unzipfile.obj zipbook.obj zipfile.obj zipinfobook.obj zipinfofile.obj $(LIB) + + $(LD) $(LDFLAGS) Name $@ File ebzip.obj,copyfile.obj,ebzip1.obj,sebxa.obj,unzipbook.obj,unzipfile.obj,zipbook.obj,zipfile.obj,zipinfobook.obj,zipinfofile.obj Library $(LIB) + + + + ..\$(SYS)\ebfont.exe : ebfont.obj $(LIB) + + $(LD) $(LDFLAGS) Name $@ File $[@ Library $(LIB) + + + + ebutils.h : ..\libebutils\ebutils.h.in + + copy ..\libebutils\ebutils.h.in eb\ebutils.h + + + + ..\$(SYS)\bookinfo.exe : bookinfo.obj $(LIB) + + $(LD) $(LDFLAGS) Name $@ File $[@ Library $(LIB) + + + + ..\$(SYS)\appendix.pl : ..\..\appendix\appendix.pl + + copy ..\..\appendix\appendix.pl ..\$(SYS)\appendix.pl + + + + cleanbin : .SYMBOLIC + + -del *.obj + + -del *.exe + + -del *.dll + + -del *.lib + + + + clean : .SYMBOLIC + + -del *.obj + + -del *.txt + + + + pkg : cleanbin all .SYMBOLIC + + -mkdir ..\$(sys) + + -mkdir ..\lib + + -del ..\$(sys)\*.txt + + -del ..\$(sys)\*.exe + + + + wstrip ebzip.exe + + wstrip ebinfo.exe + + wstrip ebrefile.exe + + wstrip ebfont.exe + + + + copy *.exe ..\$(sys) + + copy *.txt ..\$(sys) + + copy libeb$(SYS).lib ..\lib\libeb$(sys).lib + + copy libeb$(SYS).dll ..\$(sys) + + copy ..\COPYING ..\$(sys) + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/ebutils.h eb-4.0beta2.dos0.07/dos/ebutils.h + *** eb-4.0beta2/dos/ebutils.h Thu Jan 1 09:00:00 1970 + --- eb-4.0beta2.dos0.07/dos/ebutils.h Wed Sep 3 22:33:01 2003 + *************** + *** 0 **** + --- 1,51 ---- + + /* -*- C -*- + + * Copyright (c) 2000, 01 + + * Motoyuki Kasahara + + * + + * 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 2, or (at your option) + + * any later version. + + * + + * This program is distributed in the hope that it will be useful, + + * but WITHOUT ANY WARRANTY; without even the implied warranty of + + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + + * GNU General Public License for more details. + + */ + + + + #ifndef EBUTILS_H + + #define EBUTILS_H + + + + #ifdef HAVE_CONFIG_H + + #include "config.h" + + #endif + + + + #include "eb/eb.h" + + + + /* + + * Text domain name for message catalog. + + */ + + #ifndef TEXT_DOMAIN_NAME + + #define TEXT_DOMAIN_NAME "ebutils" + + #endif + + + + /* + + * Path to the locale directory. + + */ + + #ifdef LOCALEDIR + + #undef LOCALEDIR + + #endif + + #define LOCALEDIR getenv("LOCALEDIR") + + + + /* + + * Function declarations. + + */ + + void output_try_help EB_P((const char *)); + + void output_version EB_P((const char *, const char *)); + + int parse_subbook_name_argument EB_P((const char *, const char *, + + char [][EB_MAX_DIRECTORY_NAME_LENGTH + 1], int *)); + + EB_Subbook_Code find_subbook EB_P((EB_Book *, const char *, + + EB_Subbook_Code *)); + + void canonicalize_path EB_P((char *)); + + + + #endif /* not EBUTILS_H */ + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/gen_mo.pl eb-4.0beta2.dos0.07/dos/gen_mo.pl + *** eb-4.0beta2/dos/gen_mo.pl Thu Jan 1 09:00:00 1970 + --- eb-4.0beta2.dos0.07/dos/gen_mo.pl Wed Sep 3 22:33:01 2003 + *************** + *** 0 **** + --- 1,93 ---- + + #!/usr/bin/perl + + # + + # tiny msgfmt compatible text converter + + # + + # Copyright (c) 2002 + + # Takashi Nemoto + + # + + # 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 2, or (at your option) + + # any later version. + + # + + # This program is distributed in the hope that it will be useful, + + # but WITHOUT ANY WARRANTY; without even the implied warranty of + + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + + # GNU General Public License for more details. + + # + + + + $domain_name = shift(@ARGV); + + $lang_name = shift(@ARGV); + + $infile="../po-".$domain_name."/".$lang_name.".po"; + + $outfile = shift(@ARGV); + + + + open(INFILE,$infile) || die; + + open(OUTFILE,">".$outfile) || die; + + binmode(OUTFILE); + + + + $mode = 0; + + + + while() { + + chop; + + if ($_ eq "") { + + if ($mode == 2) { + + $msgstr =~ s/\\n/\n/g; + + $msgstr =~ s/\\t/\t/g; + + $msgid =~ s/\\n/\n/g; + + $msgid =~ s/\\t/\t/g; + + $msglist{$msgid}=$msgstr; + + } + + $mode = 0; + + } else { + + if ($_ =~ /msgid/) { + + $msgid = ''; + + $mode = 1; + + } elsif ($_ =~ /msgstr/) { + + $msgstr = ''; + + $mode = 2; + + } + + s/^[^\"]*\"//; + + s/\"[^\"]*$//; + + if ($mode == 1) { + + $msgid .= $_; + + } elsif ($mode == 2) { + + $msgstr .= $_; + + } + + } + + } + + + + if ($mode == 2) { + + $msgstr =~ s/\\n/\n/g; + + $msgstr =~ s/\\t/\t/g; + + $msgid =~ s/\\n/\n/g; + + $msgid =~ s/\\t/\t/g; + + $msglist{$msgid}=$msgstr; + + }; + + + + $nMsg=scalar keys %msglist; + + print OUTFILE "\x95\x04\x12\xde"; + + print OUTFILE pack("N",0); + + print OUTFILE pack("N",$nMsg); + + print OUTFILE pack("N",28); + + print OUTFILE pack("N",$nMsg*4+28); + + print OUTFILE pack("N",0); + + print OUTFILE pack("N",0); + + + + $start=$nMsg*4*2+28; + + foreach $word (sort keys(%msglist)){ + + print OUTFILE pack("N", $start); + + $start += length($word) + 1; + + } + + foreach $word (sort keys(%msglist)){ + + print OUTFILE pack("N", $start); + + $start += length($msglist{$word}) + 1; + + } + + + + foreach $word (sort keys(%msglist)){ + + print OUTFILE $word,"\0"; + + } + + foreach $word (sort keys(%msglist)){ + + print OUTFILE $msglist{$word},"\0"; + + } + + close(OUTFILE); + + + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/libeb.mk eb-4.0beta2.dos0.07/dos/libeb.mk + *** eb-4.0beta2/dos/libeb.mk Thu Jan 1 09:00:00 1970 + --- eb-4.0beta2.dos0.07/dos/libeb.mk Thu Oct 30 01:10:54 2003 + *************** + *** 0 **** + --- 1,143 ---- + + # Valid System Name : sys=os2, win, dos + + + + CC = wcc386 + + + + !ifeq sys os2 + + # CF_SYSDEP = -5s -bt=os2 -mf -br -bd + + CF_SYSDEP = -5s -bt=os2 -mf + + CF_SYSDEP2 = + + # LF_SYSDEP = sys os2v2 dll initinstance terminstance option manyautodata + + LF_SYSDEP = sys os2v2 + + + + !else ifeq sys win + + CF_SYSDEP = -5s -bt=nt -mf + + CF_SYSDEP2 = + + LF_SYSDEP = sys nt dll initinstance terminstance + + + + !else ifeq sys dos + + CF_SYSDEP = -5s -bt=dos -mf + + CF_SYSDEP2 = + + LF_SYSDEP = SYS dos4g Option Stack=655360 + + + + !else + + !error Target System is invalid. "$(sys)" + + !endif + + + + CF_COMMON = -i=$(%WATCOM)\h;..;..\eb;..\ebu -w4 -e25 -od -ficonfig.h + + LF_COMMON = d all op m op maxe=25 + + + + + + CFLAGS=$(CF_COMMON) $(CF_SYSDEP) -DEB_BUILD_LIBRARY + + LDFLAGS=$(LF_COMMON) $(LF_SYSDEP) + + WCL = $(CFLAGS) + + WCL386 = $(WCL) + + LD = wlink + + + + LIBEB_O1 = appendix.obj appsub.obj bcd.obj binary.obj bitmap.obj book.obj + + LIBEB_O2 = copyright.obj eb.obj endword.obj error.obj exactword.obj + + LIBEB_O3 = filename.obj font.obj hook.obj jacode.obj keyword.obj lock.obj + + LIBEB_O4 = log.obj match.obj menu.obj multi.obj narwalt.obj narwfont.obj + + LIBEB_O5 = widealt.obj widefont.obj readtext.obj search.obj setword.obj + + LIBEB_O6 = stopcode.obj subbook.obj text.obj word.obj zio.obj + + LIBEB_O7 = codeconv.obj windll.obj tgettext.obj booklist.obj + + NOTDLL_OBJS = getopt.obj + + + + LIBEB_1 = +appendix.obj +appsub.obj +bcd.obj +binary.obj +bitmap.obj +book.obj + + LIBEB_2 = +copyright.obj +eb.obj +endword.obj +error.obj +exactword.obj + + LIBEB_3 = +filename.obj +font.obj +hook.obj +jacode.obj +keyword.obj +lock.obj + + LIBEB_4 = +log.obj +match.obj +menu.obj +multi.obj +narwalt.obj +narwfont.obj + + LIBEB_5 = +widealt.obj +widefont.obj +readtext.obj +search.obj +setword.obj + + LIBEB_6 = +stopcode.obj +subbook.obj +text.obj +word.obj +zio.obj + + LIBEB_7 = +codeconv.obj +windll.obj +tgettext.obj +booklist.obj + + NOTDLL_OBJS_P = +getopt.obj + + + + !ifeq sys win=== + + LIBEB_O8 = ebnet.obj + + LIBEB_8 = +ebnet.obj + + !endif + + + + LIBEB_OBJS = $(LIBEB_O1) $(LIBEB_O2) $(LIBEB_O3) $(LIBEB_O4) $(LIBEB_O5) & + + $(LIBEB_O6) $(LIBEB_O7) $(LIBEB_O8) + + + + ZLIB_OBJS = inflate.obj adler32.obj infblock.obj inftrees.obj infutil.obj & + + infcodes.obj zutil.obj inffast.obj deflate.obj trees.obj + + ZLIB1P = +inflate.obj +adler32.obj +infblock.obj +inftrees.obj +infutil.obj + + ZLIB2P = +infcodes.obj +zutil.obj +inffast.obj +deflate.obj +trees.obj + + + + LIBEBUTILS_OBJS = ebutils.obj getumask.obj & + + makedir.obj samefile.obj yesno.obj + + LIBEBUTILS_P = +ebutils.obj +getumask.obj & + + +makedir.obj +samefile.obj +yesno.obj + + + + MISC_OBJS = + + MISCP = + + + + # DOCS = ebutils.txt squeeze.txt bookinfo.txt catdump.txt README.txt ..\COPYING + + + + !ifneq sys win + + LIB_A = ..\lib\eb$(SYS).lib + + DLL = + + LIB = + + !else + + LIB_A = ..\lib\eb$(SYS)_a.lib + + DLL = ..\$(SYS)\eb$(SYS).dll + + LIB = ..\lib\eb$(SYS).lib + + !endif + + LIBS = $(LIB) $(DLL) $(LIB_A) + + + + + + all : $(LIBS) ..\eb.ja .symbolic + + copy ..\eb.ja ..\$(SYS) + + @echo Finish !! + + + + .EXTENSIONS : .txt + + .c: ..;..\..;..\..\zlib;..\..\eb;..\..\libebu;..\..\ebinfo;..\..\ebrefile;..\..\ebzip;..\..\ebfont + + .c.obj: .AUTODEPEND + + $(CC) $(CFLAGS) $[@ + + + + ebutils.obj : ..\..\libebu\ebutils.c ..\ebu\ebutils.h + + ..\ebu\ebutils.h : ..\..\libebutils\ebutils.h.in + + copy ..\..\libebutils\ebutils.h.in ..\ebu\ebutils.h + + + + #.DEFAULT: .AUTODEPEND + + # $(CC) $(CFLAGS) -c $[@ + + + + lib.wlb : $(__MAKEFILES__) + + echo $(ZLIB1P) > lib.wlb + + echo $(ZLIB2P) >> lib.wlb + + echo $(LIBEB_1) >> lib.wlb + + echo $(LIBEB_2) >> lib.wlb + + echo $(LIBEB_3) >> lib.wlb + + echo $(LIBEB_4) >> lib.wlb + + echo $(LIBEB_5) >> lib.wlb + + echo $(LIBEB_6) >> lib.wlb + + echo $(LIBEB_7) >> lib.wlb + + !ifeq sys win=== + + echo $(LIBEB_8) >> lib.wlb + + !endif + + echo $(LIBEBUTILS_P) >> lib.wlb + + + + tmp.lib : $(ZLIB_OBJS) $(LIBEB_OBJS) $(LIBEBUTILS_OBJS) & + + $(__MAKEFILES__) lib.wlb + + wlib -n tmp.lib @lib.wlb + + + + $(LIB_A) : tmp.lib $(NOTDLL_OBJS) + + -mkdir ..\$(sys) + + -mkdir ..\lib + + wlib -n $(LIB_A) +tmp.lib $(NOTDLL_OBJS_P) + + + + !ifeq sys win + + $(LIB) : $(DLL) $(NOTDLL_OBJS) + + -mkdir ..\$(sys) + + -mkdir ..\lib + + wlib -n $(LIB) +$(DLL) $(NOTDLL_OBJS_P) + + + + $(DLL) : tmp.lib windll.obj $(__MAKEFILES__) ..\dll.lnk + + $(LD) $(LF_SYSDEP) Name $(DLL) @..\dll.lnk file tmp.lib + + !endif + + + + clean : .SYMBOLIC + + -del *.obj + + + + pkg : all .SYMBOLIC + + copy ..\COPYING $(sys) + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/libintl.h eb-4.0beta2.dos0.07/dos/libintl.h + *** eb-4.0beta2/dos/libintl.h Thu Jan 1 09:00:00 1970 + --- eb-4.0beta2.dos0.07/dos/libintl.h Wed Sep 3 22:33:01 2003 + *************** + *** 0 **** + --- 1,19 ---- + + #ifndef __tgettext_h__ + + #define __tgettext_h__ + + + + typedef struct { + + const char *msgid; + + const char *msgstr; + + } gettext_msg_t ; + + + + extern char *bindtextdomain(const char *domainname, const char *dummydirname); + + extern char *textdomain(const char *domainname); + + extern const char *dgettext(const char *domain_name,const char *str); + + extern const char *gettext(const char *str); + + + + extern void set_invoked_name(char*); + + extern char *ARG0; + + + + #endif + + + + + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/tgettext.c eb-4.0beta2.dos0.07/dos/tgettext.c + *** eb-4.0beta2/dos/tgettext.c Thu Jan 1 09:00:00 1970 + --- eb-4.0beta2.dos0.07/dos/tgettext.c Wed Sep 3 22:33:01 2003 + *************** + *** 0 **** + --- 1,190 ---- + + /* Tiny gettext for DOS (return code : EUC-JP) + + # + + # Copyright (c) 2002 + + # Takashi Nemoto + + # + + # 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 2, or (at your option) + + # any later version. + + # + + # This program is distributed in the hope that it will be useful, + + # but WITHOUT ANY WARRANTY; without even the implied warranty of + + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + + # GNU General Public License for more details. + + # + + */ + + + + #include "config.h" + + #include "libintl.h" + + #include + + #include + + #include + + #include + + #include + + #include "ebutils.h" + + + + #define MAX_DOMAIN 10 + + + + static const gettext_msg_t *current_msglist = NULL; + + static int current_msglist_length = 0; + + static char *current_domain = NULL; + + + + static const char *raw_msgfile[MAX_DOMAIN]; + + static gettext_msg_t *msglist_list[MAX_DOMAIN]; + + static int msglist_length_list[MAX_DOMAIN]; + + static const char *msglist_domains[MAX_DOMAIN]; + + static int msglist_list_length; + + + + char *ARG0; + + + + void set_invoked_name(argv0) + + char* argv0; + + { + + ARG0 = argv0; + + } + + + + static unsigned long getdword(const char *buf) { + + unsigned char *ubuf; + + ubuf=(unsigned char *)buf; + + return 0x1000000L*ubuf[0]+0x10000L*ubuf[1]+0x100L*ubuf[2]+ubuf[3]; + + } + + + + int bindtextdomain_sub(const char *domainname, const char *rawfile, int len) { + + int nWord,i; + + if (msglist_list_length >= MAX_DOMAIN) + + return 0; + + if (len<28) return 0; + + if (getdword(rawfile)!=0x950412de) return 0; + + nWord=getdword(rawfile+8); + + if (nWord>10000) return 0; /* May be error */ + + if (nWord*4*2+28 >=len) return 0; + + msglist_list[msglist_list_length]=calloc(nWord,sizeof(gettext_msg_t)); + + msglist_length_list[msglist_list_length] = nWord; + + msglist_domains[msglist_list_length] = strdup(domainname); + + raw_msgfile[msglist_list_length]=rawfile; + + + + for(i=0;ilen || dp>len) return 0; + + msglist_list[msglist_list_length][i].msgid=rawfile+op; + + msglist_list[msglist_list_length][i].msgstr=rawfile+dp; + + } + + + + msglist_list_length++; + + return 1; + + } + + + + char *bindtextdomain(const char *domainname, const char *dirname) { + + char *lang,lang1[4],*dir_name,domain_name[9],*buf,*buf2; + + FILE *fp; + + int file_len,read_len; + + lang = getenv("LANG"); + + if (lang == NULL || stricmp(lang,"jp")==0 || strnicmp(lang,"ja",2)==0) + + lang = "ja"; + + strncpy(lang1,lang,3); + + lang1[3]=0; + + if (dirname==NULL) { + + char *p0,*p,*pp; + + dir_name=strdup(ARG0); + + p=pp=NULL; + + p0=dir_name; + + do { + + pp=p; + + p=_mbschr(p0,'\\'); + + p0=p+1; + + } while (p!=NULL); + + if (pp!=NULL) *pp=0; + + } else + + dir_name=strdup(dirname); + + strncpy(domain_name,domainname,8); + + domain_name[8]=0; + + if (dir_name==NULL) return NULL; + + buf=alloca(strlen(dir_name)+15); + + sprintf(buf,"%s\\%s.%s",dir_name,domain_name,lang1); + + fp=fopen(buf,"rb"); + + if (fp==NULL) goto fail; + + + + fseek(fp,0,SEEK_END); + + file_len=ftell(fp); + + fseek(fp,0,SEEK_SET); + + buf2=malloc(file_len); + + if (buf2==NULL) goto fail2; + + read_len=0; + + while(read_len < file_len) { + + int r; + + r=fread(buf2+read_len,1,file_len-read_len,fp); + + if (r<0) goto fail2; + + read_len+=r; + + } + + if (bindtextdomain_sub(domainname,buf2,file_len)==0) goto fail2; + + fclose(fp); + + return NULL; + + + + fail2: + + fclose(fp); + + fail: + + free(dir_name); + + return NULL; + + } + + + + char *textdomain(const char *domainname) { + + int i; + + if (current_domain != NULL && strcmp(domainname,current_domain)==0) + + return NULL; + + for(i=0; i< msglist_list_length;i++){ + + if (strcmp(msglist_domains[i], domainname) == 0) { + + if (current_domain != NULL) free(current_domain); + + current_domain = strdup(domainname); + + current_msglist = msglist_list[i]; + + current_msglist_length = msglist_length_list[i]; + + return NULL; + + } + + } + + current_domain = NULL; + + current_msglist = NULL; + + current_msglist_length = 0; + + return NULL; + + } + + + + static const char *gettext_sub(const char *str, + + const gettext_msg_t *msglist, + + int msglist_length){ + + int begin, end, point, diff; + + if (msglist == NULL) return str; + + begin = 0; + + end = msglist_length-1; + + while(begin<=end) { + + point = (begin+end)/2; + + diff = strcmp(msglist[point].msgid,str); + + if (diff == 0) + + return msglist[point].msgstr; + + else if (diff < 0) { + + begin = point+1; + + } else { + + end = point-1; + + } + + } + + return str; + + } + + + + const char *gettext(const char *str){ + + return gettext_sub(str, current_msglist, current_msglist_length); + + } + + + + const char *dgettext(const char *domainname, const char *str){ + + int i; + + if (current_domain != NULL && strcmp(domainname,current_domain)==0) + + return gettext_sub(str, current_msglist, current_msglist_length); + + for(i=0; i< msglist_list_length;i++){ + + if (strcmp(msglist_domains[i], domainname) == 0) { + + return gettext_sub(str, msglist_list[i], msglist_length_list[i]); + + } + + } + + return str; + + } + + + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/dos/windll.c eb-4.0beta2.dos0.07/dos/windll.c + *** eb-4.0beta2/dos/windll.c Thu Jan 1 09:00:00 1970 + --- eb-4.0beta2.dos0.07/dos/windll.c Wed Sep 3 22:33:01 2003 + *************** + *** 0 **** + --- 1,6 ---- + + #ifdef __NT__ + + #include + + int DllMain() { + + return 1; + + } + + #endif + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/eb/appendix.c eb-4.0beta2.dos0.07/eb/appendix.c + *** eb-4.0beta2/eb/appendix.c Sun Jun 15 20:37:42 2003 + --- eb-4.0beta2.dos0.07/eb/appendix.c Wed Sep 3 22:33:01 2003 + *************** + *** 13,18 **** + --- 13,22 ---- + * GNU General Public License for more details. + */ + + + #ifdef HAVE_CONFIG_H + + #include "config.h" + + #endif + + + #include "build-pre.h" + #include "eb.h" + #include "error.h" + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/eb/build-post.h eb-4.0beta2.dos0.07/eb/build-post.h + *** eb-4.0beta2/eb/build-post.h Wed Sep 3 20:32:01 2003 + --- eb-4.0beta2.dos0.07/eb/build-post.h Thu Oct 30 02:00:44 2003 + *************** + *** 26,32 **** + /* + * Locale directory. + */ + ! #define LOCALEDIR "/usr/private/share/locale" + + /* + * Data size of a book entry in a catalog file. + --- 26,32 ---- + /* + * Locale directory. + */ + ! #define LOCALEDIR "$(datadir)/locale" + + /* + * Data size of a book entry in a catalog file. + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/eb/build-pre.h eb-4.0beta2.dos0.07/eb/build-pre.h + *** eb-4.0beta2/eb/build-pre.h Sun Jun 15 20:37:34 2003 + --- eb-4.0beta2.dos0.07/eb/build-pre.h Thu Oct 30 00:17:19 2003 + *************** + *** 61,66 **** + --- 61,69 ---- + #if HAVE_DIRENT_H + #include + #define NAMLEN(dirent) strlen((dirent)->d_name) + + #elif defined(HAVE_DIRECT_H) + + #include + + #define NAMLEN(dirent) strlen((dirent)->d_name) + #else /* not HAVE_DIRENT_H */ + #define dirent direct + #define NAMLEN(dirent) (dirent)->d_namlen + *************** + *** 172,177 **** + --- 175,181 ---- + /* + * Character type tests and conversions. + */ + + #ifndef isdigit + #define isdigit(c) ('0' <= (c) && (c) <= '9') + #define isupper(c) ('A' <= (c) && (c) <= 'Z') + #define islower(c) ('a' <= (c) && (c) <= 'z') + *************** + *** 181,186 **** + --- 185,191 ---- + (isdigit(c) || ('A' <= (c) && (c) <= 'F') || ('a' <= (c) && (c) <= 'f')) + #define toupper(c) (('a' <= (c) && (c) <= 'z') ? (c) - 0x20 : (c)) + #define tolower(c) (('A' <= (c) && (c) <= 'Z') ? (c) + 0x20 : (c)) + + #endif + + /* + * For (void *). + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/eb/defs.h.in eb-4.0beta2.dos0.07/eb/defs.h.in + *** eb-4.0beta2/eb/defs.h.in Wed Sep 3 20:27:05 2003 + --- eb-4.0beta2.dos0.07/eb/defs.h.in Wed Sep 3 22:33:01 2003 + *************** + *** 1020,1023 **** + --- 1020,1027 ---- + } + #endif + + + #ifndef __WATCOMC__ + + #define set_invoked_name(x) + + #endif + + + #endif /* not EB_DEFS_H */ + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/eb/dummyin6.h eb-4.0beta2.dos0.07/eb/dummyin6.h + *** eb-4.0beta2/eb/dummyin6.h Fri Jun 20 21:58:02 2003 + --- eb-4.0beta2.dos0.07/eb/dummyin6.h Thu Oct 30 00:21:07 2003 + *************** + *** 34,42 **** + --- 34,46 ---- + #endif + + #include + + #ifdef __NT__ + + #include + + #else + #include + #include + #include + + #endif + + #ifndef AF_INET6 + #define AF_INET6 (AF_INET + 1) + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/eb/ebnet.c eb-4.0beta2.dos0.07/eb/ebnet.c + *** eb-4.0beta2/eb/ebnet.c Fri Aug 15 08:34:45 2003 + --- eb-4.0beta2.dos0.07/eb/ebnet.c Thu Oct 30 00:20:39 2003 + *************** + *** 17,25 **** + #include "config.h" + #endif + + ! #include "build-pre.h" + ! + #include + + #ifdef TIME_WITH_SYS_TIME + #include + --- 17,29 ---- + #include "config.h" + #endif + + ! #ifdef __NT__ + ! #include + ! #else + #include + + #endif + + + + #include "build-pre.h" + + #ifdef TIME_WITH_SYS_TIME + #include + *************** + *** 38,44 **** + #include "build-post.h" + #include "dummyin6.h" + + ! #if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO) + #include "getaddrinfo.h" + #endif + + --- 42,49 ---- + #include "build-post.h" + #include "dummyin6.h" + + ! #if !defined(__NT__) && \ + ! (!defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)) + #include "getaddrinfo.h" + #endif + + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/eb/filename.c eb-4.0beta2.dos0.07/eb/filename.c + *** eb-4.0beta2/eb/filename.c Fri Aug 15 22:25:45 2003 + --- eb-4.0beta2.dos0.07/eb/filename.c Wed Sep 3 22:33:01 2003 + *************** + *** 523,533 **** + sprintf(composed_path_name, "%s/%s", path_name, file_name); + } + #else + ! if (isalpha(*path_name) && strcmp(path_name + 1, ":\\") == 0) { + sprintf(composed_path_name, "%s%s", path_name, file_name); + ! } else { + ! sprintf(composed_path_name, "%s\\%s", path_name, file_name); + ! } + #endif + } + + --- 523,532 ---- + sprintf(composed_path_name, "%s/%s", path_name, file_name); + } + #else + ! const char *last_backslash = strchr(path_name, '\\'); + ! if (last_backslash && '\0' == *(last_backslash + 1)) + sprintf(composed_path_name, "%s%s", path_name, file_name); + ! else sprintf(composed_path_name, "%s\\%s", path_name, file_name); + #endif + } + + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/eb/match.c eb-4.0beta2.dos0.07/eb/match.c + *** eb-4.0beta2/eb/match.c Wed Sep 3 20:34:47 2003 + --- eb-4.0beta2.dos0.07/eb/match.c Sun Sep 21 22:03:09 2003 + *************** + *** 351,357 **** + + for (;;) { + if (length <= i) { + ! result = *word; + break; + } + if (*word_p == '\0') { + --- 351,357 ---- + + for (;;) { + if (length <= i) { + ! result = *word_p; + break; + } + if (*word_p == '\0') { diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/eb.spec eb-4.0beta2.dos0.07/eb.spec *** eb-4.0beta2/eb.spec Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/eb.spec Thu Oct 30 02:00:36 2003 *************** *** 0 **** --- 1,247 ---- + Summary: A library to handle EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING (tnemoto variant) + Name: eb + Version: 4.0beta2.dos0.07 + Release: 0.00.%{_real_vendor} + License: GPL + Group: System Environment/Libraries + Source0: http://ebsnap.lkj.jp/eb-%{version}.tar.gz + URL: http://www.sra.co.jp/people/m-kasahr/eb/ + BuildRoot: %{_tmppath}/%{name}-%{version}-root + Obsoletes: ndtpd-devel + BuildRequires: zlib-devel >= 1.1.4 + + %description + eb is a library to handle EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING. + + %package devel + Summary: static library and header files for eb. + Group: Development/Libraries + Requires: %{name} = %{version}-%{release} + Obsoletes: ndtpd-devel + + %description devel + eb is a library to handle EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING. + + %prep + %setup -q + + %build + %configure \ + --without-included-zlib \ + --enable-pthreads + make + + %install + rm -rf %{buildroot} + %makeinstall + + %post + /sbin/ldconfig + if [ "$1" = 1 ]; then + /sbin/install-info %{_infodir}/eb-ja.info.* %{_infodir}/dir + #/sbin/install-info %{_infodir}/eb.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebfont-ja.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebfont.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebinfo-ja.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebinfo.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebrefile-ja.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebrefile.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebzip-ja.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebzip.info.* %{_infodir}/dir + fi + + %preun + if [ "$1" = 0 ]; then + /sbin/install-info --delete %{_infodir}/eb-ja.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/eb.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebfont-ja.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebfont.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebinfo-ja.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebinfo.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebrefile-ja.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebrefile.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebzip-ja.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebzip.info.* %{_infodir}/dir + fi + + %postun + if [ "$1" = 0 ]; then + /sbin/ldconfig + fi + + %clean + rm -rf %{buildroot} + + %files + %defattr(-,root,root) + %doc AUTHORS COPYING ChangeLog* NEWS README* *html samples + %config /etc/eb.conf + %{_bindir}/* + %{_libdir}/libeb.so.* + %{_datadir}/eb + %{_datadir}/locale/*/*/* + %{_infodir}/eb* + + %files devel + %defattr(-,root,root) + %{_libdir}/libeb.a + %{_libdir}/libeb.la + %{_libdir}/libeb.so + %{_includedir}/eb + + %changelog + * Wed Sep 03 2003 tnemoto + - import this file from momonga CVS + - 4.0beta2 + - modify for snapshot + + * Sun Jul 20 2003 Kazuhiko + - (3.3.4-1m) + + * Tue Apr 08 2003 TABUCHI Takaaki + - (3.3.2-2m) + - rebuild against zlib 1.1.4-5m + + * Sat Mar 8 2003 Kazuhiko + - (3.3.2-1m) + + * Sun Mar 2 2003 Kazuhiko + - (3.3.1-1m) + + * Tue Feb 11 2003 Kazuhiko + - (3.3-2m) + - apply a patch to eb/multi.c [ndtpd 01795] + + * Fri Feb 7 2003 Kazuhiko + - (3.3-1m) + + * Sat Feb 1 2003 Kazuhiko + - (3.3-0.3.2m) + - apply a patch to eb/binary.c [ndtpd 01787] + + * Sun Jan 19 2003 Kazuhiko + - (3.3-0.3.1m) + - 3.3beta3 + + * Mon Nov 4 2002 Kazuhiko + - (3.3-0.2.1m) + - 3.3beta2 + + * Mon Sep 30 2002 Kazuhiko + - (3.3-0.1.1m) + - 3.3beta1 + + * Sun Aug 25 2002 Kazuhiko + - (3.3-0.0.1m) + - 3.3beta0 + + * Sat Aug 17 2002 Kazuhiko + - (3.2.3-1m) + + * Tue Jun 11 2002 Kazuhiko + - (3.2.2-2k) + + * Thu Mar 14 2002 Kazuhiko + - (3.2.1-2k) + + * Wed Feb 13 2002 Kazuhiko + - (3.2-2k) + + * Wed Jan 23 2002 Kazuhiko + - (3.2-0.0003002k) + - 3.2beta3 + + * Thu Jan 17 2002 Kazuhiko + - (3.2-0.0001004k) + - add a patch for zio.c + + * Tue Jan 8 2002 Kazuhiko + - (3.2-0.0001002k) + - 3.2beta1 + - enable pthreads + + * Sat Dec 15 2001 Kazuhiko + - (3.2-0.0000002k) + - 3.2beta0 + + * Sat Dec 1 2001 Kazuhiko + - (3.1-14k) + - revise text.c patch to support inline bmp + + * Mon Nov 26 2001 Kazuhiko + - (3.1-12k) + - add text.c patch + + * Sun Nov 18 2001 Kazuhiko + - (3.1-10k) + - add eb-3.1+4.diff + + * Mon Nov 12 2001 Kazuhiko + - (3.1-8k) + - add eb-3.1+3.diff + + * Wed Oct 17 2001 Toru Hoshina + - (3.1-6k) + - rebuild against gettext 0.10.40. + + * Thu Oct 4 2001 Kazuhiko + - (3.1-4k) + - add eb-3.1+.diff and eb-3.1+2.diff + + * Fri Aug 31 2001 Kazuhiko + - (3.1-2k) + - use %configure macro + + * Sun Jul 1 2001 Kazuhiko + - (3.0.1-2k) + + * Wed Jun 6 2001 Hidetomo Machi + - (3.0-2k) + - use macro + - modif files section + + * Tue Jun 5 2001 Kazuhiko + - (3.0-3k) + + * Tue Apr 10 2001 Kazuhiko + - (3.0-0.0100003k) + - 0.0100 means beta0, 0.0101 means beta1... + + * Thu Feb 8 2001 Kazuhiko + - (3.0-0.0004003k) + + * Sat Oct 28 2000 Toru Hoshina + - bugfix by Kazuhiko has been merged, release 3k. + + * Wed Oct 25 2000 Kenichi Matsubara + - info.gz to info.*. + + * Thu Oct 19 2000 Kazuhiko + - (3.0alpha1-5k) + - add ebzip.c patch + + * Fri Oct 13 2000 Kazuhiko + - (3.0alpha1-3k) + - modify eb/text.c (patch by Rei) + + * Mon Oct 9 2000 Kazuhiko + - (eb-3.0alpha1) + + * Wed Jul 05 2000 Toru Hoshina + - rebuild against glibc-2.1.90, X-4.0, rpm-3.0.5. + + * Tue Jun 27 2000 Kenzi Cano + - (2.3.8-1k) + - version 2.3.8 + + * Mon Apr 17 2000 Kenzi Cano + - version 2.3.7 + + * Fri Jan 21 2000 Toru Hoshina + - fixed info conflict. + + * Fri Jan 14 2000 Yuichi ARATA + - /usr/local -> /usr + + * Thu Dec 23 1999 Masanori Hanawa + - The 1st RPM release (Kondara style) diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/eb.spec.in eb-4.0beta2.dos0.07/eb.spec.in *** eb-4.0beta2/eb.spec.in Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/eb.spec.in Thu Oct 30 02:00:35 2003 *************** *** 0 **** --- 1,247 ---- + Summary: A library to handle EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING (tnemoto variant) + Name: eb + Version: @VERSION@ + Release: 0.00.%{_real_vendor} + License: GPL + Group: System Environment/Libraries + Source0: http://ebsnap.lkj.jp/eb-%{version}.tar.gz + URL: http://www.sra.co.jp/people/m-kasahr/eb/ + BuildRoot: %{_tmppath}/%{name}-%{version}-root + Obsoletes: ndtpd-devel + BuildRequires: zlib-devel >= 1.1.4 + + %description + eb is a library to handle EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING. + + %package devel + Summary: static library and header files for eb. + Group: Development/Libraries + Requires: %{name} = %{version}-%{release} + Obsoletes: ndtpd-devel + + %description devel + eb is a library to handle EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING. + + %prep + %setup -q + + %build + %configure \ + --without-included-zlib \ + --enable-pthreads + make + + %install + rm -rf %{buildroot} + %makeinstall + + %post + /sbin/ldconfig + if [ "$1" = 1 ]; then + /sbin/install-info %{_infodir}/eb-ja.info.* %{_infodir}/dir + #/sbin/install-info %{_infodir}/eb.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebfont-ja.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebfont.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebinfo-ja.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebinfo.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebrefile-ja.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebrefile.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebzip-ja.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebzip.info.* %{_infodir}/dir + fi + + %preun + if [ "$1" = 0 ]; then + /sbin/install-info --delete %{_infodir}/eb-ja.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/eb.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebfont-ja.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebfont.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebinfo-ja.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebinfo.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebrefile-ja.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebrefile.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebzip-ja.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebzip.info.* %{_infodir}/dir + fi + + %postun + if [ "$1" = 0 ]; then + /sbin/ldconfig + fi + + %clean + rm -rf %{buildroot} + + %files + %defattr(-,root,root) + %doc AUTHORS COPYING ChangeLog* NEWS README* *html samples + %config /etc/eb.conf + %{_bindir}/* + %{_libdir}/libeb.so.* + %{_datadir}/eb + %{_datadir}/locale/*/*/* + %{_infodir}/eb* + + %files devel + %defattr(-,root,root) + %{_libdir}/libeb.a + %{_libdir}/libeb.la + %{_libdir}/libeb.so + %{_includedir}/eb + + %changelog + * Wed Sep 03 2003 tnemoto + - import this file from momonga CVS + - 4.0beta2 + - modify for snapshot + + * Sun Jul 20 2003 Kazuhiko + - (3.3.4-1m) + + * Tue Apr 08 2003 TABUCHI Takaaki + - (3.3.2-2m) + - rebuild against zlib 1.1.4-5m + + * Sat Mar 8 2003 Kazuhiko + - (3.3.2-1m) + + * Sun Mar 2 2003 Kazuhiko + - (3.3.1-1m) + + * Tue Feb 11 2003 Kazuhiko + - (3.3-2m) + - apply a patch to eb/multi.c [ndtpd 01795] + + * Fri Feb 7 2003 Kazuhiko + - (3.3-1m) + + * Sat Feb 1 2003 Kazuhiko + - (3.3-0.3.2m) + - apply a patch to eb/binary.c [ndtpd 01787] + + * Sun Jan 19 2003 Kazuhiko + - (3.3-0.3.1m) + - 3.3beta3 + + * Mon Nov 4 2002 Kazuhiko + - (3.3-0.2.1m) + - 3.3beta2 + + * Mon Sep 30 2002 Kazuhiko + - (3.3-0.1.1m) + - 3.3beta1 + + * Sun Aug 25 2002 Kazuhiko + - (3.3-0.0.1m) + - 3.3beta0 + + * Sat Aug 17 2002 Kazuhiko + - (3.2.3-1m) + + * Tue Jun 11 2002 Kazuhiko + - (3.2.2-2k) + + * Thu Mar 14 2002 Kazuhiko + - (3.2.1-2k) + + * Wed Feb 13 2002 Kazuhiko + - (3.2-2k) + + * Wed Jan 23 2002 Kazuhiko + - (3.2-0.0003002k) + - 3.2beta3 + + * Thu Jan 17 2002 Kazuhiko + - (3.2-0.0001004k) + - add a patch for zio.c + + * Tue Jan 8 2002 Kazuhiko + - (3.2-0.0001002k) + - 3.2beta1 + - enable pthreads + + * Sat Dec 15 2001 Kazuhiko + - (3.2-0.0000002k) + - 3.2beta0 + + * Sat Dec 1 2001 Kazuhiko + - (3.1-14k) + - revise text.c patch to support inline bmp + + * Mon Nov 26 2001 Kazuhiko + - (3.1-12k) + - add text.c patch + + * Sun Nov 18 2001 Kazuhiko + - (3.1-10k) + - add eb-3.1+4.diff + + * Mon Nov 12 2001 Kazuhiko + - (3.1-8k) + - add eb-3.1+3.diff + + * Wed Oct 17 2001 Toru Hoshina + - (3.1-6k) + - rebuild against gettext 0.10.40. + + * Thu Oct 4 2001 Kazuhiko + - (3.1-4k) + - add eb-3.1+.diff and eb-3.1+2.diff + + * Fri Aug 31 2001 Kazuhiko + - (3.1-2k) + - use %configure macro + + * Sun Jul 1 2001 Kazuhiko + - (3.0.1-2k) + + * Wed Jun 6 2001 Hidetomo Machi + - (3.0-2k) + - use macro + - modif files section + + * Tue Jun 5 2001 Kazuhiko + - (3.0-3k) + + * Tue Apr 10 2001 Kazuhiko + - (3.0-0.0100003k) + - 0.0100 means beta0, 0.0101 means beta1... + + * Thu Feb 8 2001 Kazuhiko + - (3.0-0.0004003k) + + * Sat Oct 28 2000 Toru Hoshina + - bugfix by Kazuhiko has been merged, release 3k. + + * Wed Oct 25 2000 Kenichi Matsubara + - info.gz to info.*. + + * Thu Oct 19 2000 Kazuhiko + - (3.0alpha1-5k) + - add ebzip.c patch + + * Fri Oct 13 2000 Kazuhiko + - (3.0alpha1-3k) + - modify eb/text.c (patch by Rei) + + * Mon Oct 9 2000 Kazuhiko + - (eb-3.0alpha1) + + * Wed Jul 05 2000 Toru Hoshina + - rebuild against glibc-2.1.90, X-4.0, rpm-3.0.5. + + * Tue Jun 27 2000 Kenzi Cano + - (2.3.8-1k) + - version 2.3.8 + + * Mon Apr 17 2000 Kenzi Cano + - version 2.3.7 + + * Fri Jan 21 2000 Toru Hoshina + - fixed info conflict. + + * Fri Jan 14 2000 Yuichi ARATA + - /usr/local -> /usr + + * Thu Dec 23 1999 Masanori Hanawa + - The 1st RPM release (Kondara style) diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/eb.spec.in.in eb-4.0beta2.dos0.07/eb.spec.in.in *** eb-4.0beta2/eb.spec.in.in Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/eb.spec.in.in Wed Sep 3 23:49:23 2003 *************** *** 0 **** --- 1,250 ---- + #S%define ebsnap @SNAPDATE@ + Summary: A library to handle EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING (tnemoto variant) + Name: eb + Version: @VERSION@ + #SRelease: 0.00%{ebsnap}.%{_real_vendor} + #sRelease: 0.00.%{_real_vendor} + License: GPL + Group: System Environment/Libraries + #SSource0: http://ebsnap.lkj.jp/eb-%{version}-%{ebsnap}.tar.gz + #sSource0: http://ebsnap.lkj.jp/eb-%{version}.tar.gz + URL: http://www.sra.co.jp/people/m-kasahr/eb/ + BuildRoot: %{_tmppath}/%{name}-%{version}-root + Obsoletes: ndtpd-devel + BuildRequires: zlib-devel >= 1.1.4 + + %description + eb is a library to handle EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING. + + %package devel + Summary: static library and header files for eb. + Group: Development/Libraries + Requires: %{name} = %{version}-%{release} + Obsoletes: ndtpd-devel + + %description devel + eb is a library to handle EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING. + + %prep + %setup -q + + %build + %configure \ + --without-included-zlib \ + --enable-pthreads + make + + %install + rm -rf %{buildroot} + %makeinstall + + %post + /sbin/ldconfig + if [ "$1" = 1 ]; then + /sbin/install-info %{_infodir}/eb-ja.info.* %{_infodir}/dir + #/sbin/install-info %{_infodir}/eb.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebfont-ja.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebfont.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebinfo-ja.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebinfo.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebrefile-ja.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebrefile.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebzip-ja.info.* %{_infodir}/dir + /sbin/install-info %{_infodir}/ebzip.info.* %{_infodir}/dir + fi + + %preun + if [ "$1" = 0 ]; then + /sbin/install-info --delete %{_infodir}/eb-ja.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/eb.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebfont-ja.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebfont.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebinfo-ja.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebinfo.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebrefile-ja.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebrefile.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebzip-ja.info.* %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/ebzip.info.* %{_infodir}/dir + fi + + %postun + if [ "$1" = 0 ]; then + /sbin/ldconfig + fi + + %clean + rm -rf %{buildroot} + + %files + %defattr(-,root,root) + %doc AUTHORS COPYING ChangeLog* NEWS README* *html samples + %config /etc/eb.conf + %{_bindir}/* + %{_libdir}/libeb.so.* + %{_datadir}/eb + %{_datadir}/locale/*/*/* + %{_infodir}/eb* + + %files devel + %defattr(-,root,root) + %{_libdir}/libeb.a + %{_libdir}/libeb.la + %{_libdir}/libeb.so + %{_includedir}/eb + + %changelog + * Wed Sep 03 2003 tnemoto + - import this file from momonga CVS + - 4.0beta2 + - modify for snapshot + + * Sun Jul 20 2003 Kazuhiko + - (3.3.4-1m) + + * Tue Apr 08 2003 TABUCHI Takaaki + - (3.3.2-2m) + - rebuild against zlib 1.1.4-5m + + * Sat Mar 8 2003 Kazuhiko + - (3.3.2-1m) + + * Sun Mar 2 2003 Kazuhiko + - (3.3.1-1m) + + * Tue Feb 11 2003 Kazuhiko + - (3.3-2m) + - apply a patch to eb/multi.c [ndtpd 01795] + + * Fri Feb 7 2003 Kazuhiko + - (3.3-1m) + + * Sat Feb 1 2003 Kazuhiko + - (3.3-0.3.2m) + - apply a patch to eb/binary.c [ndtpd 01787] + + * Sun Jan 19 2003 Kazuhiko + - (3.3-0.3.1m) + - 3.3beta3 + + * Mon Nov 4 2002 Kazuhiko + - (3.3-0.2.1m) + - 3.3beta2 + + * Mon Sep 30 2002 Kazuhiko + - (3.3-0.1.1m) + - 3.3beta1 + + * Sun Aug 25 2002 Kazuhiko + - (3.3-0.0.1m) + - 3.3beta0 + + * Sat Aug 17 2002 Kazuhiko + - (3.2.3-1m) + + * Tue Jun 11 2002 Kazuhiko + - (3.2.2-2k) + + * Thu Mar 14 2002 Kazuhiko + - (3.2.1-2k) + + * Wed Feb 13 2002 Kazuhiko + - (3.2-2k) + + * Wed Jan 23 2002 Kazuhiko + - (3.2-0.0003002k) + - 3.2beta3 + + * Thu Jan 17 2002 Kazuhiko + - (3.2-0.0001004k) + - add a patch for zio.c + + * Tue Jan 8 2002 Kazuhiko + - (3.2-0.0001002k) + - 3.2beta1 + - enable pthreads + + * Sat Dec 15 2001 Kazuhiko + - (3.2-0.0000002k) + - 3.2beta0 + + * Sat Dec 1 2001 Kazuhiko + - (3.1-14k) + - revise text.c patch to support inline bmp + + * Mon Nov 26 2001 Kazuhiko + - (3.1-12k) + - add text.c patch + + * Sun Nov 18 2001 Kazuhiko + - (3.1-10k) + - add eb-3.1+4.diff + + * Mon Nov 12 2001 Kazuhiko + - (3.1-8k) + - add eb-3.1+3.diff + + * Wed Oct 17 2001 Toru Hoshina + - (3.1-6k) + - rebuild against gettext 0.10.40. + + * Thu Oct 4 2001 Kazuhiko + - (3.1-4k) + - add eb-3.1+.diff and eb-3.1+2.diff + + * Fri Aug 31 2001 Kazuhiko + - (3.1-2k) + - use %configure macro + + * Sun Jul 1 2001 Kazuhiko + - (3.0.1-2k) + + * Wed Jun 6 2001 Hidetomo Machi + - (3.0-2k) + - use macro + - modif files section + + * Tue Jun 5 2001 Kazuhiko + - (3.0-3k) + + * Tue Apr 10 2001 Kazuhiko + - (3.0-0.0100003k) + - 0.0100 means beta0, 0.0101 means beta1... + + * Thu Feb 8 2001 Kazuhiko + - (3.0-0.0004003k) + + * Sat Oct 28 2000 Toru Hoshina + - bugfix by Kazuhiko has been merged, release 3k. + + * Wed Oct 25 2000 Kenichi Matsubara + - info.gz to info.*. + + * Thu Oct 19 2000 Kazuhiko + - (3.0alpha1-5k) + - add ebzip.c patch + + * Fri Oct 13 2000 Kazuhiko + - (3.0alpha1-3k) + - modify eb/text.c (patch by Rei) + + * Mon Oct 9 2000 Kazuhiko + - (eb-3.0alpha1) + + * Wed Jul 05 2000 Toru Hoshina + - rebuild against glibc-2.1.90, X-4.0, rpm-3.0.5. + + * Tue Jun 27 2000 Kenzi Cano + - (2.3.8-1k) + - version 2.3.8 + + * Mon Apr 17 2000 Kenzi Cano + - version 2.3.7 + + * Fri Jan 21 2000 Toru Hoshina + - fixed info conflict. + + * Fri Jan 14 2000 Yuichi ARATA + - /usr/local -> /usr + + * Thu Dec 23 1999 Masanori Hanawa + - The 1st RPM release (Kondara style) diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/ebfont/ebfont.c eb-4.0beta2.dos0.07/ebfont/ebfont.c *** eb-4.0beta2/ebfont/ebfont.c Sun Jun 15 20:37:19 2003 --- eb-4.0beta2.dos0.07/ebfont/ebfont.c Wed Sep 3 22:33:01 2003 *************** *** 65,70 **** --- 65,78 ---- #include "makedir.h" #include "ebutils.h" + #ifdef USE_CODECONV + #include "codeconv.h" + #define printf xprintf + #define fprintf xfprintf + #define puts xputs + #define fputs xfputs + #endif + #ifndef HAVE_STRCASECMP #ifdef __STDC__ int strcasecmp(const char *, const char *); *************** *** 182,188 **** */ static const char *program_name = "ebfont"; static const char *program_version = VERSION; ! static const char *invoked_name; /* * Debug flag. --- 190,196 ---- */ static const char *program_name = "ebfont"; static const char *program_version = VERSION; ! static char *invoked_name; /* * Debug flag. *************** *** 267,272 **** --- 275,282 ---- int ch; invoked_name = argv[0]; + set_invoked_name(argv[0]); + debug_flag = 0; strcpy(out_path, DEFAULT_OUTPUT_DIRECTORY); *************** *** 277,282 **** --- 287,297 ---- #ifdef HAVE_SETLOCALE setlocale(LC_ALL, ""); #endif + + #if defined (USE_CODECONV) + locale_init(NULL); + #endif + bindtextdomain(TEXT_DOMAIN_NAME, LOCALEDIR); textdomain(TEXT_DOMAIN_NAME); #endif diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/ebinfo/ebinfo.c eb-4.0beta2.dos0.07/ebinfo/ebinfo.c *** eb-4.0beta2/ebinfo/ebinfo.c Fri Aug 15 23:09:48 2003 --- eb-4.0beta2.dos0.07/ebinfo/ebinfo.c Wed Sep 3 22:33:01 2003 *************** *** 41,46 **** --- 41,54 ---- #include "getopt.h" #include "ebutils.h" + #ifdef USE_CODECONV + #include "codeconv.h" + #define printf xprintf + #define fprintf xfprintf + #define puts xputs + #define fputs xfputs + #endif + #ifndef HAVE_STRCHR #define strchr index #define strrchr rindex *************** *** 122,129 **** char *book_path; int booklist_flag; int multi_flag; - invoked_name = argv[0]; /* * Initialize locale data. --- 130,137 ---- char *book_path; int booklist_flag; int multi_flag; invoked_name = argv[0]; + set_invoked_name(argv[0]); /* * Initialize locale data. *************** *** 132,137 **** --- 140,150 ---- #ifdef HAVE_SETLOCALE setlocale(LC_ALL, ""); #endif + + #if defined (USE_CODECONV) + locale_init(NULL); + #endif + bindtextdomain(TEXT_DOMAIN_NAME, LOCALEDIR); textdomain(TEXT_DOMAIN_NAME); #endif diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/ebrefile/ebrefile.c eb-4.0beta2.dos0.07/ebrefile/ebrefile.c *** eb-4.0beta2/ebrefile/ebrefile.c Sun Jun 15 20:37:20 2003 --- eb-4.0beta2.dos0.07/ebrefile/ebrefile.c Wed Sep 3 22:33:01 2003 *************** *** 50,55 **** --- 50,61 ---- #include #endif + #ifdef USE_CODECONV + #include "codeconv.h" + #define printf xprintf + #define fprintf xfprintf + #endif + #ifdef ENABLE_NLS #ifdef HAVE_LOCALE_H #include *************** *** 213,219 **** */ const char *program_name = "ebrefile"; const char *program_version = VERSION; ! const char *invoked_name; /* * File name to be deleted and file to be closed when signal is received. --- 219,225 ---- */ const char *program_name = "ebrefile"; const char *program_version = VERSION; ! static char *invoked_name; /* * File name to be deleted and file to be closed when signal is received. *************** *** 233,239 **** int subbook_name_count = 0; int ch; ! invoked_name = argv[0]; strcpy(out_path, DEFAULT_OUTPUT_DIRECTORY); /* --- 239,247 ---- int subbook_name_count = 0; int ch; ! invoked_name=argv[0]; ! set_invoked_name(argv[0]); ! strcpy(out_path, DEFAULT_OUTPUT_DIRECTORY); /* *************** *** 243,248 **** --- 251,259 ---- #ifdef HAVE_SETLOCALE setlocale(LC_ALL, ""); #endif + #ifdef USE_CODECONV + locale_init(NULL); + #endif bindtextdomain(TEXT_DOMAIN_NAME, LOCALEDIR); textdomain(TEXT_DOMAIN_NAME); #endif diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/ebzip/copyfile.c eb-4.0beta2.dos0.07/ebzip/copyfile.c *** eb-4.0beta2/ebzip/copyfile.c Sun Jun 15 20:38:06 2003 --- eb-4.0beta2.dos0.07/ebzip/copyfile.c Wed Sep 3 22:33:01 2003 *************** *** 13,18 **** --- 13,22 ---- * GNU General Public License for more details. */ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + #include "ebzip.h" #include "ebutils.h" diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/ebzip/ebzip.c eb-4.0beta2.dos0.07/ebzip/ebzip.c *** eb-4.0beta2/ebzip/ebzip.c Sun Jun 15 20:38:06 2003 --- eb-4.0beta2.dos0.07/ebzip/ebzip.c Wed Sep 3 22:33:01 2003 *************** *** 13,18 **** --- 13,22 ---- * GNU General Public License for more details. */ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + #include "ebzip.h" #include "ebutils.h" *************** *** 115,120 **** --- 119,126 ---- char *invoked_base_name; invoked_name = argv[0]; + set_invoked_name(argv[0]); + strcpy(out_top_path, EBZIP_DEFAULT_OUTPUT_DIRECTORY); /* *************** *** 124,129 **** --- 130,138 ---- #ifdef HAVE_SETLOCALE setlocale(LC_ALL, ""); #endif + #if defined (USE_CODECONV) + locale_init(FALLBACK_ENCODING); + #endif bindtextdomain(TEXT_DOMAIN_NAME, LOCALEDIR); textdomain(TEXT_DOMAIN_NAME); #endif diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/ebzip/ebzip.h eb-4.0beta2.dos0.07/ebzip/ebzip.h *** eb-4.0beta2/ebzip/ebzip.h Sun Jun 15 20:38:03 2003 --- eb-4.0beta2.dos0.07/ebzip/ebzip.h Wed Sep 3 22:33:01 2003 *************** *** 68,73 **** --- 68,76 ---- #if HAVE_DIRENT_H #include #define NAMLEN(dirent) strlen((dirent)->d_name) + #elif defined(HAVE_DIRECT_H) + #include + #define NAMLEN(dirent) strlen((dirent)->d_name) #else /* not HAVE_DIRENT_H */ #define dirent direct #define NAMLEN(dirent) (dirent)->d_namlen *************** *** 89,94 **** --- 92,105 ---- #include #endif + #ifdef USE_CODECONV + #include "codeconv.h" + #define printf xprintf + #define fprintf xfprintf + #define puts xputs + #define fputs xfputs + #endif + #include #ifndef HAVE_STRCHR diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/ebzip/sebxa.c eb-4.0beta2.dos0.07/ebzip/sebxa.c *** eb-4.0beta2/ebzip/sebxa.c Sun Jun 15 20:38:04 2003 --- eb-4.0beta2.dos0.07/ebzip/sebxa.c Wed Sep 3 22:33:01 2003 *************** *** 13,18 **** --- 13,22 ---- * GNU General Public License for more details. */ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + #include "ebzip.h" #define zio_uint4(p) ((*(const unsigned char *)(p) << 24) \ diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/ebzip/unzipbook.c eb-4.0beta2.dos0.07/ebzip/unzipbook.c *** eb-4.0beta2/ebzip/unzipbook.c Sun Jun 15 20:38:03 2003 --- eb-4.0beta2.dos0.07/ebzip/unzipbook.c Wed Sep 3 22:33:01 2003 *************** *** 13,18 **** --- 13,22 ---- * GNU General Public License for more details. */ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + #include "ebzip.h" #include "ebutils.h" diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/ebzip/unzipfile.c eb-4.0beta2.dos0.07/ebzip/unzipfile.c *** eb-4.0beta2/ebzip/unzipfile.c Sun Jun 15 20:38:05 2003 --- eb-4.0beta2.dos0.07/ebzip/unzipfile.c Wed Sep 3 22:33:01 2003 *************** *** 13,18 **** --- 13,22 ---- * GNU General Public License for more details. */ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + #include "ebzip.h" #include "getumask.h" diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/ebzip/zipbook.c eb-4.0beta2.dos0.07/ebzip/zipbook.c *** eb-4.0beta2/ebzip/zipbook.c Sun Jun 15 20:38:07 2003 --- eb-4.0beta2.dos0.07/ebzip/zipbook.c Wed Sep 3 22:33:01 2003 *************** *** 13,18 **** --- 13,22 ---- * GNU General Public License for more details. */ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + #include "ebzip.h" #include "ebutils.h" diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/ebzip/zipfile.c eb-4.0beta2.dos0.07/ebzip/zipfile.c *** eb-4.0beta2/ebzip/zipfile.c Sun Jun 15 20:38:04 2003 --- eb-4.0beta2.dos0.07/ebzip/zipfile.c Wed Sep 3 22:33:01 2003 *************** *** 13,18 **** --- 13,22 ---- * GNU General Public License for more details. */ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + #include "ebzip.h" #include "getumask.h" diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/ebzip/zipinfobook.c eb-4.0beta2.dos0.07/ebzip/zipinfobook.c *** eb-4.0beta2/ebzip/zipinfobook.c Sun Jun 15 20:38:05 2003 --- eb-4.0beta2.dos0.07/ebzip/zipinfobook.c Wed Sep 3 22:33:01 2003 *************** *** 13,18 **** --- 13,22 ---- * GNU General Public License for more details. */ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + #include "ebzip.h" #include "ebutils.h" diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/ebzip/zipinfofile.c eb-4.0beta2.dos0.07/ebzip/zipinfofile.c *** eb-4.0beta2/ebzip/zipinfofile.c Sun Jun 15 20:38:03 2003 --- eb-4.0beta2.dos0.07/ebzip/zipinfofile.c Wed Sep 3 22:33:01 2003 *************** *** 13,18 **** --- 13,22 ---- * GNU General Public License for more details. */ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + #include "ebzip.h" #include "samefile.h" diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/install-sh eb-4.0beta2.dos0.07/install-sh *** eb-4.0beta2/install-sh Sun Jun 15 20:38:08 2003 --- eb-4.0beta2.dos0.07/install-sh Thu Oct 30 02:00:17 2003 *************** *** 1,37 **** #!/bin/sh # # install - install a program, script, or datafile # ! # This originates from X11R5 (mit/util/scripts/install.sh), which was ! # later released in X11R6 (xc/config/util/install.sh) with the ! # following copyright and license. # ! # Copyright (C) 1994 X Consortium ! # ! # 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 THE ! # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ! # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- ! # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ! # ! # Except as contained in this notice, the name of the X Consortium shall not ! # be used in advertising or otherwise to promote the sale, use or other deal- ! # ings in this Software without prior written authorization from the X Consor- ! # tium. ! # ! # ! # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent # `make' implicit rules from creating a file called install from it --- 1,19 ---- #!/bin/sh # # install - install a program, script, or datafile + # This comes from X11R5 (mit/util/scripts/install.sh). # ! # Copyright 1991 by the Massachusetts Institute of Technology # ! # Permission to use, copy, modify, distribute, and sell this software and its ! # documentation for any purpose is hereby granted without fee, provided that ! # the above copyright notice appear in all copies and that both that ! # copyright notice and this permission notice appear in supporting ! # documentation, and that the name of M.I.T. not be used in advertising or ! # publicity pertaining to distribution of the software without specific, ! # written prior permission. M.I.T. makes no representations about the ! # suitability of this software for any purpose. It is provided "as is" ! # without express or implied warranty. # # Calling this script install-sh is preferred over install.sh, to prevent # `make' implicit rules from creating a file called install from it diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/libebutils/ebutils.c eb-4.0beta2.dos0.07/libebutils/ebutils.c *** eb-4.0beta2/libebutils/ebutils.c Sun Jun 15 20:37:51 2003 --- eb-4.0beta2.dos0.07/libebutils/ebutils.c Wed Sep 3 22:33:01 2003 *************** *** 66,71 **** --- 66,77 ---- #include "eb/error.h" #include "ebutils.h" + #ifdef USE_CODECONV + #include "codeconv.h" + #define printf xprintf + #define fprintf xfprintf + #endif + /* * Tricks for gettext. */ *************** *** 249,254 **** --- 255,263 ---- #else /* DOS_FILE_PATH */ + #define iskanji(c) \ + ((0x81 <= (c) && (c) <= 0x9f) || (0xe0 <= (c) && (c) <= 0xfc)) + /* * Canonicalize `path' (DOS version). * It eliminaes `\' at the tail of `path' unless `path' is not "X:\". *************** *** 257,295 **** canonicalize_path(path) char *path; { ! char *slash; ! char *last_backslash; ! ! /* ! * Replace `/' with `\\'. ! */ ! slash = path; ! for (;;) { ! slash = strchr(slash, '/'); ! if (slash == NULL) ! break; ! *slash++ = '\\'; ! } ! last_backslash = strrchr(path, '\\'); ! if (last_backslash == NULL || *(last_backslash + 1) != '\0') ! return; ! ! /* ! * Eliminate `\' in the tail of the path. ! */ ! if (isalpha(*path) && *(path + 1) == ':') { ! if (last_backslash != path + 2) ! *last_backslash = '\0'; ! } else if (*path == '\\' && *(path + 1) == '\\') { ! if (last_backslash != path + 1) ! *last_backslash = '\0'; ! } else if (*path == '\\') { ! if (last_backslash != path) ! *last_backslash = '\0'; ! } else { ! *last_backslash = '\0'; ! } } #endif /* DOS_FILE_PATH */ --- 266,287 ---- canonicalize_path(path) char *path; { ! unsigned char *p, *file; ! if (*path == '\0') return; ! p = file = (unsigned char *)path; ! while (*p) { ! if (iskanji(*p)) { ! p++; ! } else if ('\\' == *p) { ! file = p + 1; ! } else if ('/' == *p) { ! *p = '\\'; ! file = p + 1; ! } ! p++; ! } ! if (3 < (file - path) && '\0' == *file) *(file - 1) = '\0'; } #endif /* DOS_FILE_PATH */ diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/libebutils/ebutils.h.in eb-4.0beta2.dos0.07/libebutils/ebutils.h.in *** eb-4.0beta2/libebutils/ebutils.h.in Sun Jun 15 20:37:52 2003 --- eb-4.0beta2.dos0.07/libebutils/ebutils.h.in Wed Sep 3 22:33:01 2003 *************** *** 25,35 **** --- 25,40 ---- /* * Text domain name for message catalog. */ + #ifndef TEXT_DOMAIN_NAME #define TEXT_DOMAIN_NAME "ebutils" + #endif /* * Path to the locale directory. */ + #ifdef LOCALEDIR + #undef LOCALEDIR + #endif #define LOCALEDIR "@localedir@" /* diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/libebutils/getopt.c eb-4.0beta2.dos0.07/libebutils/getopt.c *** eb-4.0beta2/libebutils/getopt.c Sun Jun 15 20:37:49 2003 --- eb-4.0beta2.dos0.07/libebutils/getopt.c Wed Sep 3 22:33:01 2003 *************** *** 62,67 **** --- 62,71 ---- #ifdef ENABLE_NLS #include #endif + #ifdef USE_CODECONV + #include "codeconv.h" + #define fprintf xfprintf + #endif #ifdef ENABLE_NLS #define _(string) gettext(string) *************** *** 515,517 **** --- 519,522 ---- } return retval; } + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/libebutils/getumask.c eb-4.0beta2.dos0.07/libebutils/getumask.c *** eb-4.0beta2/libebutils/getumask.c Sun Jun 15 20:37:52 2003 --- eb-4.0beta2.dos0.07/libebutils/getumask.c Wed Sep 3 22:33:01 2003 *************** *** 30,35 **** --- 30,39 ---- #include #endif + #ifdef HAVE_IO_H + #include + #endif + /* * Get the current umask. */ diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/libebutils/makedir.c eb-4.0beta2.dos0.07/libebutils/makedir.c *** eb-4.0beta2/libebutils/makedir.c Sun Jun 15 20:37:51 2003 --- eb-4.0beta2.dos0.07/libebutils/makedir.c Wed Sep 3 22:33:01 2003 *************** *** 29,34 **** --- 29,38 ---- #include #include + #ifdef HAVE_DIRECT_H + #include + #endif + #ifdef STAT_MACROS_BROKEN #ifdef S_ISREG #undef S_ISREG *************** *** 61,68 **** if (stat(path, &status) == 0 && S_ISDIR(status.st_mode)) return 0; if (mkdir(path, mode) < 0) return -1; - return 0; } --- 65,75 ---- if (stat(path, &status) == 0 && S_ISDIR(status.st_mode)) return 0; + #ifdef HAVE_DIRECT_H + if (mkdir(path) < 0) + #else if (mkdir(path, mode) < 0) + #endif return -1; return 0; } diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/libebutils/strerror.c eb-4.0beta2.dos0.07/libebutils/strerror.c *** eb-4.0beta2/libebutils/strerror.c Sun Jun 15 20:37:53 2003 --- eb-4.0beta2.dos0.07/libebutils/strerror.c Wed Sep 3 22:33:01 2003 *************** *** 36,41 **** --- 36,47 ---- #include #endif /* not STDC_HEADERS and not HAVE_STRING_H */ + #ifdef USE_CODECONV + #include "codeconv.h" + #define fprintf xfprintf + #define fputs xfputs + #endif + extern char *sys_errlist[]; extern int sys_nerr; diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/libebutils/yesno.c eb-4.0beta2.dos0.07/libebutils/yesno.c *** eb-4.0beta2/libebutils/yesno.c Sun Jun 15 20:37:55 2003 --- eb-4.0beta2.dos0.07/libebutils/yesno.c Wed Sep 3 22:33:01 2003 *************** *** 37,42 **** --- 37,47 ---- #include #endif /* not STDC_HEADERS and not HAVE_STRING_H */ + #ifdef USE_CODECONV + #include "codeconv.h" + #define fputs xfputs + #endif + #ifndef HAVE_STRCHR #define strchr index #define strrchr rindex diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/mac.sh eb-4.0beta2.dos0.07/mac.sh *** eb-4.0beta2/mac.sh Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/mac.sh Sat Oct 4 03:46:33 2003 *************** *** 0 **** --- 1,78 ---- + #!/bin/sh + + version=4.0beta2.dos0.07 + install_root=$(PWD)/mac/root + packagedir=$(PWD)/libeb.pkg + sizesfile=$(PWD)/mac/sizes.txt + + #./configure + #make + rm -f $(PWD)/mac + mkdir -p $(PWD)/mac + make install prefix=$(PWD)/mac/root/usr/local + infofile=$(PWD)/mac/libeb.info + echo 'Title EB Library' > ${infofile} + echo "Version ${version}" >> ${infofile} + echo "Description Install libeb and utilities as a command-line app" >> ${infofile} + echo 'DefaultLocation /' >> ${infofile} + echo 'DeleteWarning' >> ${infofile} + echo 'NeedsAuthorization YES' >> ${infofile} + echo 'Required NO' >> ${infofile} + echo 'Relocatable NO' >> ${infofile} + echo 'RequiresReboot NO' >> ${infofile} + echo 'UseUserMask NO' >> ${infofile} + echo 'OverwritePermissions NO' >> ${infofile} + echo 'InstallFat NO' >> ${infofile} + package $(PWD)/mac/root ${infofile} + + numFiles=`du -a ${install_root} | wc -l` + installedSize=`du -s ${insall_root} | cut -f1` + compressedSize=`du -s ${packagedir} | cut -f1` + + echo "NumFiles ${numFiles}" > ${sizesfile} + echo "InstalledSize ${installedSize}" >> ${sizesfile} + echo "CompressedSize ${compressedSize}" >> ${sizesfile} + cat ${sizesfile} + exit 1 + echo "Creating Disc Image" + ## From hdiutil man page, a sector is 512k. Allocate an extra 5% for + ## directories and partition tables. + sectorsAlloced=`echo 2.1*${compressedSize}|bc` + hdiutil create -ov ${builddir}/mac/EmacsRW -sectors ${sectorsAlloced} + ## Need to format the disc image before mounting + mountLoc=`hdid -nomount ${builddir}/mac/EmacsRW.dmg | grep HFS | cut -f1` + /sbin/newfs_hfs -v Emacs ${mountLoc} + hdiutil eject ${mountLoc} + echo "Copying Package to Disc Image" + hdid ${builddir}/mac/EmacsRW.dmg + + if test "$keep_directory" = "no"; then + rm -rf ${tempparentfull} + else + mv ${tempparentfull} ${emacsname} + fi + + if [ ! -d /Volumes/Emacs ]; then + echo "Could not create disc image. The Emacs installer package (Emacs.pkg) + in this directory should be correct. Please use the Disc Copy program to + create a disc image." >&2 + exit 0 + fi + + cp -R ${packagedir} /Volumes/Emacs + + ## Converting Disk Image to read-only + echo 'Converting Disc Image to read-only' + hdiutil eject ${mountLoc} + hdiutil resize ${builddir}/mac/EmacsRW.dmg -sectors min + if test "$comp_diskimage" = "yes"; then + hdiutil convert ${builddir}/mac/EmacsRW.dmg -format UDZO -imagekey zlib-leve + l=2 -o ${srcdir}/mac/EmacsInstaller.dmg + else + hdiutil convert ${builddir}/mac/EmacsRW.dmg -format UDRO -o ${srcdir}/mac/Em + acsInstaller.dmg + fi + rm ${builddir}/mac/EmacsRW.dmg + + echo "Cleaning up the staging directory" + rm -rf ${builddir}/mac/Emacs.pkg ${removable_build_dir} バイナリー・ファイルeb-4.0beta2/po-ebutils/ja.moとeb-4.0beta2.dos0.07/po-ebutils/ja.moは違います diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/zaurus.cnt eb-4.0beta2.dos0.07/zaurus.cnt *** eb-4.0beta2/zaurus.cnt Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/zaurus.cnt Wed Sep 3 22:46:52 2003 *************** *** 0 **** --- 1,10 ---- + Package: eb-variant + Priority: optional + Section: text/libs + Maintainer: Takashi Nemoto + Architecture: arm + Version: 4.0b2-0.071 + Depends: + License: GPL + Description: EB library and tools + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/zaurus.sh eb-4.0beta2.dos0.07/zaurus.sh *** eb-4.0beta2/zaurus.sh Thu Jan 1 09:00:00 1970 --- eb-4.0beta2.dos0.07/zaurus.sh Wed Sep 3 22:33:01 2003 *************** *** 0 **** --- 1,8 ---- + ZAUDIR=$PWD/package + ./configure --host=arm-linux CC=arm-linux-gcc LDFLAGS="-Wl,--rpath -Wl,/usr/local/lib" --disable-nls --prefix=/usr/local + make + make install prefix=$ZAUDIR/usr/local + mkdir -p $ZAUDIR/CONTROL + cp zaurus.cnt $ZAUDIR/CONTROL/control + ipkg-build package + diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/zlib/Makefile.am eb-4.0beta2.dos0.07/zlib/Makefile.am *** eb-4.0beta2/zlib/Makefile.am Sun Jun 15 20:36:56 2003 --- eb-4.0beta2.dos0.07/zlib/Makefile.am Wed Sep 3 22:33:01 2003 *************** *** 5,11 **** libz_la_SOURCES = adler32.c compress.c crc32.c gzio.c uncompr.c deflate.c \ trees.c zutil.c inflate.c infblock.c inftrees.c infcodes.c \ infutil.c inffast.c ! #libz_la_LDFLAGS = -version-info @LIBZ_VERSION_INFO@ include_HEADERS = zlib.h zconf.h noinst_HEADERS = deflate.h infblock.h infcodes.h inffast.h inffixed.h \ --- 5,11 ---- libz_la_SOURCES = adler32.c compress.c crc32.c gzio.c uncompr.c deflate.c \ trees.c zutil.c inflate.c infblock.c inftrees.c infcodes.c \ infutil.c inffast.c ! libz_la_LDFLAGS = -version-info @LIBZ_VERSION_INFO@ include_HEADERS = zlib.h zconf.h noinst_HEADERS = deflate.h infblock.h infcodes.h inffast.h inffixed.h \ diff -rcN -x '*.info' -x '*.info-*' -x configure -x config.guess -x config.sub -x aclocal.m4 -x Makefile.in -x ltmain.sh -x mkinstalldirs -x COPYING -x INSTALL -x 'stamp-*' -x texinfo.tex -x '*.pot' -x '*.po' -x '*-ver.texi' eb-4.0beta2/zlib/configure.ac eb-4.0beta2.dos0.07/zlib/configure.ac *** eb-4.0beta2/zlib/configure.ac Sun Jun 15 20:36:22 2003 --- eb-4.0beta2.dos0.07/zlib/configure.ac Wed Sep 3 22:33:01 2003 *************** *** 9,16 **** dnl * dnl * Library version info. dnl * ! dnl LIBZ_VERSION_INFO=1:2:0 ! dnl AC_SUBST(LIBZ_VERSION_INFO) dnl * dnl * Programs. --- 9,16 ---- dnl * dnl * Library version info. dnl * ! LIBZ_VERSION_INFO=2:4:0 ! AC_SUBST(LIBZ_VERSION_INFO) dnl * dnl * Programs.