[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freewnn:00380] another patch for hpux11



次の二つの patch を元に、FreeWnn-1.1.1-a015 を
hpux11 で configure & make してみました。

	田中さん、
	[freewnn:00350] FreeWnn-1.1.1-a015 bug? report 

	本木さん、
	[freewnn:00290] patch: HAVE_MKDIR

希かもしれませんが、jserver だけですが、
install path が長い場合にうまく起動できないという不具合に
対応してみました。

originality は低いですが、
参考までに 以上のものをあわせた patch を最後に示します。

			      引地信之 オープンソース・ビジネス部 (株)SRA
					 hikichi@sra.co.jp



*** FreeWnn-1.1.1-a015.org/Xsi/ChangeLog	Mon Feb 14 02:23:54 2000
--- FreeWnn-1.1.1-a015/Xsi/ChangeLog	Wed Mar 15 14:53:09 2000
***************
*** 1,3 ****
--- 1,25 ----
+ 2000-03-15  Nobuyuki Hikichi  
+ 
+ 	* Wnn/include/msg.h: fix the constraint for path name length.
+ 	* Wnn/etc/msg.c: likewise.
+ 	* Wnn/jlib/js.c: add the include of sys/param.h for removing path
+ 	name length.
+ 
+ 	* Wnn/jlib/jl.c: use mkdir library instead of command.
+ 	  ([freewnn:00290] 元木さんのパッチ)
+ 	* Wnn/XWnmo/xjutil/jutil.c: likewise
+ 	
+ 	* Wnn/etc/msg.c: fix the message file handling.
+ 	([freewnn:00350] 高田さんのパッチ)
+ 
+ 2000-03-10  Nobuyuki Hikichi  
+ 
+ 	* config.h.in:
+ 	change the file which generated by autoheader using acconfig.h.
+ 	  ([freewnn:00290] 元木さんのパッチ)
+ 	
+ 	* Makefile.in: add the entry, distclean.
+ 	
  Mon Feb 14 02:23:38 2000  Tatsuo Furukawa  
  
  	* 開発版 1.1.1-a015 として内部リリース
diff -rNc3 -x RCS -x InstallDir -x *.orig -x *.rej -x #.* -x *~ FreeWnn-1.1.1-a015.org/Xsi/Makefile.in FreeWnn-1.1.1-a015/Xsi/Makefile.in
*** FreeWnn-1.1.1-a015.org/Xsi/Makefile.in	Tue Feb  1 22:18:59 2000
--- FreeWnn-1.1.1-a015/Xsi/Makefile.in	Fri Mar 10 20:09:43 2000
***************
*** 1,5 ****
  #
! #   $Id: Makefile.in $
  #
  
  #
--- 1,5 ----
  #
! #   $Id: Makefile.in,v 1.2 2000/03/10 11:07:21 hikichi Exp $
  #
  
  #
***************
*** 75,80 ****
--- 75,85 ----
  	@echo ""
  	@echo "Rebuild of Input Method."
  	@echo ""
+ 
+ distclean::
+ 	make clean
+ 	rm -f makerule.mk config.h config.status config.cache config.log
+ 	find . -name Makefile -exec rm -f {} \;
  
  # ----------------------------------------------------------------------
  # common rules for all Makefiles - do not edit
diff -rNc3 -x RCS -x InstallDir -x *.orig -x *.rej -x #.* -x *~ FreeWnn-1.1.1-a015.org/Xsi/Wnn/etc/msg.c FreeWnn-1.1.1-a015/Xsi/Wnn/etc/msg.c
*** FreeWnn-1.1.1-a015.org/Xsi/Wnn/etc/msg.c	Thu Jan 20 01:20:20 2000
--- FreeWnn-1.1.1-a015/Xsi/Wnn/etc/msg.c	Wed Mar 15 13:23:20 2000
***************
*** 1,5 ****
  /*
!  *  $Id: msg.c $
   */
  
  /*
--- 1,5 ----
  /*
!  *  $Id: msg.c,v 1.2 2000/03/15 04:20:45 hikichi Exp $
   */
  
  /*
***************
*** 284,290 ****
  {
      struct msg_cat *cd;
  
!     char fn[128];
      FILE *fp;
      char data[1024];
      char save[1024];
--- 284,290 ----
  {
      struct msg_cat *cd;
  
!     char fn[MAXPATHLEN];
      FILE *fp;
      char data[1024];
      char save[1024];
***************
*** 323,329 ****
  	    break;
  	if(*data == '#')
  	    continue;	/* comment */
! 	for(dp = data ; *dp != '\t'; dp++);	/* msg_id:message\n */
  	dp++;
  	msg_byte += strlen(dp);
  	msg_cnt++;
--- 323,331 ----
  	    break;
  	if(*data == '#')
  	    continue;	/* comment */
! 	for(dp = data ; *dp && *dp != '\t' ; dp++) ;	/* msg_id:message\n */
! 	if(*dp == '\0')
! 	    continue;
  	dp++;
  	msg_byte += strlen(dp);
  	msg_cnt++;
***************
*** 345,351 ****
  	    break;
  	if(*data == '#')
  	    continue;	/* comment */
! 	for(dp = data ; *dp != '\t'; dp++);	/* msg_id:message\n */
  	*dp = 0;
  	dp++;
  	bd->msg_id = atoi(data);
--- 347,355 ----
  	    break;
  	if(*data == '#')
  	    continue;	/* comment */
! 	for(dp = data ; *dp && *dp != '\t' ; dp++) ;	/* msg_id:message\n */
! 	if(*dp == '\0')
! 	    continue;
  	*dp = 0;
  	dp++;
  	bd->msg_id = atoi(data);
diff -rNc3 -x RCS -x InstallDir -x *.orig -x *.rej -x #.* -x *~ FreeWnn-1.1.1-a015.org/Xsi/Wnn/include/msg.h FreeWnn-1.1.1-a015/Xsi/Wnn/include/msg.h
*** FreeWnn-1.1.1-a015.org/Xsi/Wnn/include/msg.h	Thu Jan 20 01:28:14 2000
--- FreeWnn-1.1.1-a015/Xsi/Wnn/include/msg.h	Wed Mar 15 13:42:22 2000
***************
*** 1,5 ****
  /*
!  *  $Id: msg.h $
   */
  
  /*
--- 1,5 ----
  /*
!  *  $Id: msg.h,v 1.2 2000/03/15 04:39:48 hikichi Exp $
   */
  
  /*
***************
*** 37,43 ****
  struct msg_cat {
      char lang[32];
      char name[64];
!     char nlspath[64];
      int msg_cnt;
      struct msg_cat *nextp;
      struct msg_bd *msg_bd;
--- 37,43 ----
  struct msg_cat {
      char lang[32];
      char name[64];
!     char nlspath[MAXPATHLEN];
      int msg_cnt;
      struct msg_cat *nextp;
      struct msg_bd *msg_bd;
diff -rNc3 -x RCS -x InstallDir -x *.orig -x *.rej -x #.* -x *~ FreeWnn-1.1.1-a015.org/Xsi/Wnn/jlib/jl.c FreeWnn-1.1.1-a015/Xsi/Wnn/jlib/jl.c
*** FreeWnn-1.1.1-a015.org/Xsi/Wnn/jlib/jl.c	Thu Jan 20 01:16:29 2000
--- FreeWnn-1.1.1-a015/Xsi/Wnn/jlib/jl.c	Wed Mar 15 14:23:05 2000
***************
*** 1,5 ****
  /*
!  *  $Id: jl.c $
   */
  
  /*
--- 1,5 ----
  /*
!  *  $Id: jl.c,v 1.2 2000/03/15 05:20:30 hikichi Exp $
   */
  
  /*
***************
*** 33,38 ****
--- 33,42 ----
  	Nihongo Henkan Hi-level Library
  */
  
+ #if 1 || defined(HAVE_CONFIG_H)
+ #include "config.h"
+ #endif
+ 
  #include "commonhd.h"
  #include "wnn_config.h"
  #include 
***************
*** 52,57 ****
--- 56,62 ----
  #include "jslib.h"
  #include "jllib.h"
  
+ #include 
  #include "msg.h"
  #include "wnn_string.h"
  extern struct msg_cat *wnn_msg_cat;
***************
*** 2864,2876 ****
      }
      if(dirname[0] == C_LOCAL){  /* Create Directory */
  #define	MODE (0000000 | 0000777)
! #if defined(BSD42) || defined(uniosu)
  	if(mkdir(dirname + 1 , MODE ) != 0 ){
  	    wnn_errorno=WNN_MKDIR_FAIL;
  	    return(-1);
  	}
! #endif
! #if defined(SYSVR2) && !defined(uniosu)
  	char buf[256];
  	strcpy(buf , "/bin/mkdir ");
  	strcat(buf ,dirname + 1 );
--- 2869,2880 ----
      }
      if(dirname[0] == C_LOCAL){  /* Create Directory */
  #define	MODE (0000000 | 0000777)
! #if defined(HAVE_MKDIR)
  	if(mkdir(dirname + 1 , MODE ) != 0 ){
  	    wnn_errorno=WNN_MKDIR_FAIL;
  	    return(-1);
  	}
! #else
  	char buf[256];
  	strcpy(buf , "/bin/mkdir ");
  	strcat(buf ,dirname + 1 );
diff -rNc3 -x RCS -x InstallDir -x *.orig -x *.rej -x #.* -x *~ FreeWnn-1.1.1-a015.org/Xsi/Wnn/jlib/js.c FreeWnn-1.1.1-a015/Xsi/Wnn/jlib/js.c
*** FreeWnn-1.1.1-a015.org/Xsi/Wnn/jlib/js.c	Thu Jan 20 01:16:38 2000
--- FreeWnn-1.1.1-a015/Xsi/Wnn/jlib/js.c	Wed Mar 15 14:25:34 2000
***************
*** 1,5 ****
  /*
!  *  $Id: js.c $
   */
  
  /*
--- 1,5 ----
  /*
!  *  $Id: js.c,v 1.2 2000/03/15 05:23:00 hikichi Exp $
   */
  
  /*
***************
*** 77,82 ****
--- 77,83 ----
  #include "jslib.h"
  #include "jh.h"
  
+ #include 
  #include "msg.h"
  
  #define JS			/* For include ../etc/bdic.c */
diff -rNc3 -x RCS -x InstallDir -x *.orig -x *.rej -x #.* -x *~ FreeWnn-1.1.1-a015.org/Xsi/Wnn/jserver/de.c FreeWnn-1.1.1-a015/Xsi/Wnn/jserver/de.c
*** FreeWnn-1.1.1-a015.org/Xsi/Wnn/jserver/de.c	Sun Feb 13 18:27:10 2000
--- FreeWnn-1.1.1-a015/Xsi/Wnn/jserver/de.c	Mon Mar  6 10:08:50 2000
***************
*** 186,192 ****
  	extern char *get_cswidth_name();
  	extern void set_cswidth();
  
! 	char nlspath[64];
  
  	strcpy(lang_dir, LANG_NAME);
  	strcpy(nlspath, LIBDIR);
--- 186,192 ----
  	extern char *get_cswidth_name();
  	extern void set_cswidth();
  
! 	char nlspath[MAXPATHLEN];
  
  	strcpy(lang_dir, LANG_NAME);
  	strcpy(nlspath, LIBDIR);
diff -rNc3 -x RCS -x InstallDir -x *.orig -x *.rej -x #.* -x *~ FreeWnn-1.1.1-a015.org/Xsi/Wnn/jserver/do_filecom.c FreeWnn-1.1.1-a015/Xsi/Wnn/jserver/do_filecom.c
*** FreeWnn-1.1.1-a015.org/Xsi/Wnn/jserver/do_filecom.c	Thu Jan 20 01:38:31 2000
--- FreeWnn-1.1.1-a015/Xsi/Wnn/jserver/do_filecom.c	Wed Mar 15 14:31:31 2000
***************
*** 1,5 ****
  /*
!  *  $Id: do_filecom.c $
   */
  
  /*
--- 1,5 ----
  /*
!  *  $Id: do_filecom.c,v 1.2 2000/03/15 05:28:56 hikichi Exp $
   */
  
  /*
***************
*** 33,38 ****
--- 33,42 ----
   *	Do Global File command
   */
  
+ #if 1 || defined(HAVE_CONFIG_H)
+ #include "config.h"
+ #endif
+ 
  #include 
  #include 
  #include 
***************
*** 64,70 ****
  /*	mkdir	*/
  
  #define	MODE (0000000 | 0000777)
! #if defined(BSD42) || defined(uniosu) || defined(UX386) || defined(DGUX)
  /* #define	MODE (0040000 | 0000731) */
  /* #define	MODE (0000000 | 0000733) */ 
  
--- 68,74 ----
  /*	mkdir	*/
  
  #define	MODE (0000000 | 0000777)
! #if defined(HAVE_MKDIR)
  /* #define	MODE (0040000 | 0000731) */
  /* #define	MODE (0000000 | 0000733) */ 
  
***************
*** 87,95 ****
   put4_cur(0);
   putc_purge();
  }
! #endif
! 
! #if defined(SYSVR2) && !defined(uniosu) && !defined(UX386) && !defined(DGUX)
  void
  js_mkdir()
  {char path[FILENAME];
--- 91,97 ----
   put4_cur(0);
   putc_purge();
  }
! #else
  void
  js_mkdir()
  {char path[FILENAME];
diff -rNc3 -x RCS -x InstallDir -x *.orig -x *.rej -x #.* -x *~ FreeWnn-1.1.1-a015.org/Xsi/Xwnmo/xjutil/jutil.c FreeWnn-1.1.1-a015/Xsi/Xwnmo/xjutil/jutil.c
*** FreeWnn-1.1.1-a015.org/Xsi/Xwnmo/xjutil/jutil.c	Fri May 14 16:08:35 1999
--- FreeWnn-1.1.1-a015/Xsi/Xwnmo/xjutil/jutil.c	Wed Mar 15 14:32:14 2000
***************
*** 1,5 ****
  /*
!  * $Id: jutil.c,v 1.10.2.3 1999/04/19 06:05:25 nakanisi Exp $
   */
  
  /*
--- 1,5 ----
  /*
!  * $Id: jutil.c,v 1.2 2000/03/15 05:29:39 hikichi Exp $
   */
  
  /*
***************
*** 566,578 ****
      }
      if(dirname[0] == C_LOCAL){  /* Create Directory */
  #define	MODE (0000000 | 0000777)
! #if defined(BSD42) || defined(SX8870)
  	if(mkdir(dirname + 1 , MODE ) != 0 ){
  	    wnn_errorno=WNN_MKDIR_FAIL;
  	    return(-1);
  	}
! #endif
! #if defined(SYSVR2) && !defined(SX8870)
  	char buf[256];
  	strcpy(buf , "/bin/mkdir ");
  	strcat(buf ,dirname + 1 );
--- 566,577 ----
      }
      if(dirname[0] == C_LOCAL){  /* Create Directory */
  #define	MODE (0000000 | 0000777)
! #if defined(HAVE_MKDIR)
  	if(mkdir(dirname + 1 , MODE ) != 0 ){
  	    wnn_errorno=WNN_MKDIR_FAIL;
  	    return(-1);
  	}
! #else
  	char buf[256];
  	strcpy(buf , "/bin/mkdir ");
  	strcat(buf ,dirname + 1 );
diff -rNc3 -x RCS -x InstallDir -x *.orig -x *.rej -x #.* -x *~ FreeWnn-1.1.1-a015.org/Xsi/acconfig.h FreeWnn-1.1.1-a015/Xsi/acconfig.h
*** FreeWnn-1.1.1-a015.org/Xsi/acconfig.h	Thu Jan  1 09:00:00 1970
--- FreeWnn-1.1.1-a015/Xsi/acconfig.h	Tue Mar  7 16:36:03 2000
***************
*** 0 ****
--- 1,11 ----
+ /* $Id$ */
+ 
+ /* Define to `long' if  doesn't define.  */
+ #undef time_t
+ 
+ /* Define to 'socklen_t' if  does'n define. */
+ #undef socklen_t
+ 
+ /* Define to 'RAND_MAX' if  does'n define. */
+ #undef HAVE_RAND_MAX
+ 
diff -rNc3 -x RCS -x InstallDir -x *.orig -x *.rej -x #.* -x *~ FreeWnn-1.1.1-a015.org/Xsi/config.h.in FreeWnn-1.1.1-a015/Xsi/config.h.in
*** FreeWnn-1.1.1-a015.org/Xsi/config.h.in	Tue Feb  1 22:18:03 2000
--- FreeWnn-1.1.1-a015/Xsi/config.h.in	Tue Mar  7 16:36:13 2000
***************
*** 1,55 ****
! /*
!  *   $Id: config.h.in $
!  */
! 
! /*
!  * FreeWnn is a network-extensible Kana-to-Kanji conversion system.
!  * This file is part of FreeWnn.
!  * 
!  * Copyright Kyoto University Research Institute for Mathematical Sciences
!  *                 1987, 1988, 1989, 1990, 1991, 1992
!  * Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999
!  * Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992
!  * Copyright FreeWnn Project 1999, 2000
!  * 
!  * Maintainer:  FreeWnn Project   
!  * 
!  * 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.
!  * 
!  * You should have received a copy of the GNU General Public License
!  * along with this program; if not, write to the Free Software
!  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  */
  
! #define HAVE_UNISTD_H 0
  
  
! /* *_t が定義されているか? (定義されていればここでは undef になる) */
  #undef time_t
  #undef socklen_t
  
  
! /*
!  *   drand48() があるかどうかを調べる。あれば srand48() もあるはずなので
!  *   HAVE_SRAND48 は作らず、これで兼用させる。
!  */    
  #undef HAVE_DRAND48
  
! /*
!  *   RAND_MAX が定義されていればこれも定義される。ちなみにこれは rand() が
!  *   返す値の最大値である。
!  */
! #undef HAVE_RAND_MAX
  
! /*
!  *   perror() が定義されていればこれも定義される。
!  */
  #undef HAVE_PERROR
--- 1,88 ----
! /* config.h.in.  Generated automatically from configure.in by autoheader.  */
  
! /* Define if you have  that is POSIX.1 compatible.  */
! #undef HAVE_SYS_WAIT_H
  
+ /* Define if you have the wait3 system call.  */
+ #undef HAVE_WAIT3
  
! /* Define to `int' if  doesn't define.  */
! #undef mode_t
! 
! /* Define as the return type of signal handlers (int or void).  */
! #undef RETSIGTYPE
! 
! /* Define if you have the ANSI C header files.  */
! #undef STDC_HEADERS
! 
! /* Define if you can safely include both  and .  */
! #undef TIME_WITH_SYS_TIME
! 
! /* Define to `long' if  doesn't define.  */
  #undef time_t
+ 
+ /* Define to 'socklen_t' if  does'n define. */
  #undef socklen_t
  
+ /* Define to 'RAND_MAX' if  does'n define. */
+ #undef HAVE_RAND_MAX
  
! /* Define if you have the drand48 function.  */
  #undef HAVE_DRAND48
  
! /* Define if you have the gethostname function.  */
! #undef HAVE_GETHOSTNAME
! 
! /* Define if you have the mkdir function.  */
! #undef HAVE_MKDIR
  
! /* Define if you have the perror function.  */
  #undef HAVE_PERROR
+ 
+ /* Define if you have the select function.  */
+ #undef HAVE_SELECT
+ 
+ /* Define if you have the socket function.  */
+ #undef HAVE_SOCKET
+ 
+ /* Define if you have the strtol function.  */
+ #undef HAVE_STRTOL
+ 
+ /* Define if you have the  header file.  */
+ #undef HAVE_FCNTL_H
+ 
+ /* Define if you have the  header file.  */
+ #undef HAVE_LIMITS_H
+ 
+ /* Define if you have the  header file.  */
+ #undef HAVE_MALLOC_H
+ 
+ /* Define if you have the  header file.  */
+ #undef HAVE_SGTTY_H
+ 
+ /* Define if you have the  header file.  */
+ #undef HAVE_STRINGS_H
+ 
+ /* Define if you have the  header file.  */
+ #undef HAVE_SYS_FILE_H
+ 
+ /* Define if you have the  header file.  */
+ #undef HAVE_SYS_IOCTL_H
+ 
+ /* Define if you have the  header file.  */
+ #undef HAVE_SYS_TIME_H
+ 
+ /* Define if you have the  header file.  */
+ #undef HAVE_TERMIO_H
+ 
+ /* Define if you have the  header file.  */
+ #undef HAVE_UNISTD_H
+ 
+ /* Define if you have the crypt library (-lcrypt).  */
+ #undef HAVE_LIBCRYPT
+ 
+ /* Define if you have the nsl library (-lnsl).  */
+ #undef HAVE_LIBNSL
+ 
+ /* Define if you have the socket library (-lsocket).  */
+ #undef HAVE_LIBSOCKET