Attachment #47389 for bug #74694




2.6.7-gentoo: (02.01.2005)

  - configure fixed to correctly process --disable-multibyte
  - configure falls back to standard iconv() if no libiconv is found
  - BUGFIX: three off-by-one error in get_attr found by Ewald Dieterich

2.6.7: (19.12.2004)

  - BUGFIX: buffer overflow in get_attr() found by Ariel Berkman
  - BUGFIX: compilation fix for Solaris by Fredrik Roubert
  - more robust behaviour when encountering invalid byte sequences
  - added RPM-spec file by Joshua Jensen

2.6.6: (24.08.2004)


Lines 11-17 Link Here

(-)vilistextum-2.6.7/INSTALL (-1 / +1 lines)
11	Multibyte/Unicode version	11	Multibyte/Unicode version
12	=========================	12	=========================
13		13
14	./configure --enable && make && make install	14	./configure --enable-multibyte && make && make install
15		15
16	The multibyte version needs libiconv.	16	The multibyte version needs libiconv.
17	http://www.gnu.org/software/libiconv	17	http://www.gnu.org/software/libiconv

Lines 3-8 Link Here

(-)vilistextum-2.6.7/config.h.in (+3 lines)
3	/* Define to 1 if you have the <getopt.h> header file. */	3	/* Define to 1 if you have the <getopt.h> header file. */
4	#undef HAVE_GETOPT_H	4	#undef HAVE_GETOPT_H
5		5
		6	/* Define to 1 if you have the <iconv.h> header file. */
		7	#undef HAVE_ICONV_H
		8
6	/* Define to 1 if you have the <inttypes.h> header file. */	9	/* Define to 1 if you have the <inttypes.h> header file. */
7	#undef HAVE_INTTYPES_H	10	#undef HAVE_INTTYPES_H
8		11




  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
  --disable-dependency-tracking Speeds up one-time builds
  --enable-dependency-tracking  Do not reject slow dependency extractors
  --enable-multibyte      Enable multibyte support.

Optional Packages:
  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]


# Define the identity of the package.
 PACKAGE=vilistextum
 VERSION=2.6.7-gentoo


cat >>confdefs.h <<_ACEOF



cat >>confdefs.h <<_ACEOF
#define RELEASEDATE "02.01.2005"
_ACEOF



# Check whether --enable-multibyte or --disable-multibyte was given.
if test "${enable_multibyte+set}" = set; then
  enableval="$enable_multibyte"
  use_multibyte=$enableval
else
  use_multibyte=no
fi;
echo "$as_me:$LINENO: result: $use_multibyte" >&5
echo "${ECHO_T}$use_multibyte" >&6

if test "$use_multibyte" = "yes"; then

cat >>confdefs.h <<\_ACEOF
#define MULTIBYTE 1


fi

if test "$use_multibyte" = "yes"; then

for ac_header in iconv.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
  echo "$as_me:$LINENO: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
  # Is the header compilable?
echo "$as_me:$LINENO: checking $ac_header usability" >&5
echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
$ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_header_compiler=yes
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

ac_header_compiler=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6

# Is the header present?
echo "$as_me:$LINENO: checking $ac_header presence" >&5
echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <$ac_header>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
  else
    ac_cpp_err=
  fi
else
  ac_cpp_err=yes
fi
if test -z "$ac_cpp_err"; then
  ac_header_preproc=yes
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

  ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6

# So?  What about this header?
case $ac_header_compiler:$ac_header_preproc in
  yes:no )
    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
    (
      cat <<\_ASBOX
## ------------------------------------ ##
## Report this to bug-autoconf@gnu.org. ##
## ------------------------------------ ##
_ASBOX
    ) |
      sed "s/^/$as_me: WARNING:     /" >&2
    ;;
  no:yes )
    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
    (
      cat <<\_ASBOX
## ------------------------------------ ##
## Report this to bug-autoconf@gnu.org. ##
## ------------------------------------ ##
_ASBOX
    ) |
      sed "s/^/$as_me: WARNING:     /" >&2
    ;;
esac
echo "$as_me:$LINENO: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
else
  eval "$as_ac_Header=$ac_header_preproc"
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
  cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF

else
  { { echo "$as_me:$LINENO: error: Need libiconv or iconv.h for multibyte support" >&5
echo "$as_me: error: Need libiconv or iconv.h for multibyte support" >&2;}
   { (exit 1); exit 1; }; }
fi

done



echo "$as_me:$LINENO: checking for iconv in -liconv" >&5
echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6

  LIBS="-liconv $LIBS"

else
  { echo "$as_me:$LINENO: WARNING: only generic iconv has been found not libiconv" >&5
echo "$as_me: WARNING: only generic iconv has been found not libiconv" >&2;}
   { (exit 1); exit 1; }; }
fi






dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/debug.h)
AM_INIT_AUTOMAKE(vilistextum, 2.6.7-gentoo)

AM_CONFIG_HEADER(config.h)

dnl Set current date
AC_DEFINE_UNQUOTED(RELEASEDATE, "02.01.2005", "Release date of the program")

dnl Checks for programs.
AC_PROG_CC

dnl checking for options
AC_MSG_CHECKING(if --enable-multibyte specified)
AC_ARG_ENABLE(multibyte,
  AC_HELP_STRING([--enable-multibyte], [Enable multibyte support.]),
  [use_multibyte=$enableval], [use_multibyte=no])
AC_MSG_RESULT($use_multibyte)

if test "$use_multibyte" = "yes"; then
        AC_DEFINE(MULTIBYTE, 1, "Enable multibyte support (e.g. unicode, shift_jis)")
fi

dnl Checks for libraries.
if test "$use_multibyte" = "yes"; then
AC_CHECK_HEADERS(iconv.h,,
			AC_MSG_ERROR(Need libiconv or iconv.h for multibyte support))

	AC_CHECK_LIB(iconv, iconv,,
			AC_MSG_WARN(only generic iconv has been found not libiconv))

dnl setting INTERNAL_LOCALE
AC_MSG_CHECKING(for unicode locale)




#ifdef MULTIBYTE
  #include <iconv.h>
  #include <locale.h>
  #if defined(__sun__)
    #include <libcharset.h>
  #else
    #include <localcharset.h>
  #endif
#endif

FILE *in, *out;

	char *inp, *outp;
	int fehlernr=0;
	size_t insize, outsize;
	char *ret;

	/* set locale based on environment variables */
	ret = setlocale(LC_CTYPE, "");
  if (ret==NULL) { 
		fprintf(stderr, "setlocale failed with: %s\n\n", getenv("LC_CTYPE"));
		exit(1);
	}

	insize = strlen(str);
	if (insize > DEF_STR_LEN) { insize = DEF_STR_LEN; }
	outsize = DEF_STR_LEN;

	inp = str;
	outp = output;

	if ((conv = iconv_open("utf-8", "char"))==(iconv_t)(-1))
		{	printf("iconv_open failed in convert_string: Can't convert from %s to UTF-8?\n", getenv("LC_CTYPE")); exit(1); }

	result = iconv(conv, &inp, &insize, &outp, &outsize);
	fehlernr = errno;

	if (fehlernr==E2BIG) { fprintf(stderr, "errno==E2BIG\n"); }
	else if (fehlernr==EILSEQ) { 
		fprintf(stderr, "Can't interpret '%s' as character from charset %s\n", str, getenv("LC_CTYPE"));
		fprintf(stderr, "Check your language settings with locale(1)\n");
	}
	else if (fehlernr==EINVAL) { fprintf(stderr, "errno==EINVAL\n"); }
		
	output[strlen(output)] = '\0';

	ret = setlocale(LC_CTYPE, INTERNAL_LOCALE);
  if (ret==NULL) { 
		fprintf(stderr, "setlocale failed with: %s\n\n", INTERNAL_LOCALE);
		exit(1);
	}
	mbstowcs(converted_string, output, strlen(output));

	iconv_close(conv);

		fehlernr = errno;

		if (fehlernr==E2BIG) { fprintf(stderr, "errno==E2BIG\n"); }
		else if (fehlernr==EILSEQ) { fprintf(stderr, "errno==EILSEQ in output_string\n"); fprintf(stderr, "input: %s\n", inp); }
		else if (fehlernr==EINVAL) { fprintf(stderr, "errno==EINVAL\n"); }
		
		output[DEF_STR_LEN-outsize] = '\0';




	while ((ch!='=') && (ch!='>')) {
		ch=read_char();
		if (i<DEF_STR_LEN) { attr_name[i++] = ch; }
	} /* post cond: i<=DEF_STR_LEN */
	attr_name[i-1] = '\0';
	else { attr_name[DEF_STR_LEN-1] = '\0'; }
	
  if (ch=='>') { attr_ctnt[0]='\0'; return '>'; }


    i=0;
    ch=read_char();
    while(quote!=ch) {
			if (i<DEF_STR_LEN-1) { temp[i++] = ch; }
			ch=read_char(); 
		} /* post cond: i<=DEF_STR_LEN-1 */
		temp[i] = '\0';
    else { temp[DEF_STR_LEN] = '\0'; }
    ch=read_char();
  }
  else

    while ((ch!='>') && (!isspace(ch))) {
			ch=read_char();
			if (i<DEF_STR_LEN) { temp[i++] = ch; }
		} /* post cond: i<=DEF_STR_LEN */
		temp[i-1] = '\0';
    else { temp[DEF_STR_LEN-1] = '\0'; }
  }

	uppercase_str(attr_name);




	/* read html tag */
  while ((ch!='>') && (ch!=' ') && (ch!=13) && (ch!=10))
  {
    if (i<DEF_STR_LEN-1) { str[i++] = ch; }
		i++;
    ch = uppercase(read_char());
  } /* post cond: i<=DEF_STR_LEN-1 */
	str[i] = '\0';
	else { str[i] = '\0';}

#ifdef debug
  fprintf(stderr, "html_tag: %ls\n",str);

		else if CMP("/SCRIPT", str)   {}
		else if CMP("STYLE", str)     {}
		else if CMP("/STYLE", str)    {}
		else if CMP("TITLE", str)     {}
		else if CMP("/TITLE", str)    {}
		else { if (errorlevel>=2) { print_error("tag ignored: ", str);} } 
	}


Lines 253-259 Link Here

(-)vilistextum-2.6.7/src/main.c (-1 / +1 lines)
253	case 's':	253	case 's':
254	shrink_lines = atoi(argument); if (shrink_lines==0) { shrink_lines = 1; } break;	254	shrink_lines = atoi(argument); if (shrink_lines==0) { shrink_lines = 1; } break;
255		255
256	case 'r': remove_empty_alt = 1; /* printf("remove_empty_alt\n"); */ break;	256	case 'r': remove_empty_alt = 1; break;
257	case 'i':	257	case 'i':
258	#ifdef MULTIBYTE	258	#ifdef MULTIBYTE
259	convert_string(argument, user_image);	259	convert_string(argument, user_image);





  if (!palm)
  {
		if (wort_pos+len<DEF_STR_LEN) {
    while (i<wort_pos+len) { wort[i] = s[j]; j++; i++; }
    wort[i] = '\0';
    wort_pos += len;
  }
  }

#ifdef proc_debug
  printf("wort_plus_string_nocount() ende\n");

  printf("s: %ls len: %d\n", s,len);
#endif

	if (wort_pos+len<DEF_STR_LEN) {
  while (i<wort_pos+len) { wort[i] = s[j]; j++; i++; }
  wort[i] = '\0';
  wort_pos += len; wort_len += len;
	}

#ifdef proc_debug
  printf("wort_plus_string() ende\n");

Return to bug 74694

Lines 27-37 Link Here

(-)vilistextum-2.6.7/src/fileio.c (-10 / +15 lines)
27	#ifdef MULTIBYTE	27	#ifdef MULTIBYTE
28	#include <iconv.h>	28	#include <iconv.h>
29	#include <locale.h>	29	#include <locale.h>
30	#if defined(__sun__)
31	#include <libcharset.h>
32	#else
33	#include <localcharset.h>
34	#endif
35	#endif	30	#endif
36		31
37	FILE in, out;	32	FILE in, out;
Lines 74-105 Link Here
74	char inp, outp;	69	char inp, outp;
75	int fehlernr=0;	70	int fehlernr=0;
76	size_t insize, outsize;	71	size_t insize, outsize;
		72	char *ret;
77		73
78	/* set locale based on environment variables */	74	/* set locale based on environment variables */
79	setlocale(LC_CTYPE, "");	75	ret = setlocale(LC_CTYPE, "");
		76	if (ret==NULL) {
		77	fprintf(stderr, "setlocale failed with: %s\n\n", getenv("LC_CTYPE"));
		78	exit(1);
		79	}
80		80
81	insize = strlen(str);	81	insize = strlen(str);
		82	if (insize > DEF_STR_LEN) { insize = DEF_STR_LEN; }
82	outsize = DEF_STR_LEN;	83	outsize = DEF_STR_LEN;
83		84
84	inp = str;	85	inp = str;
85	outp = output;	86	outp = output;
86		87
87	if ((conv = iconv_open("utf-8", "char"))==(iconv_t)(-1))	88	if ((conv = iconv_open("utf-8", "char"))==(iconv_t)(-1))
88	{ printf("iconv_open failed in convert_string: Can't convert from %s to UTF-8?\n", locale_charset()); exit(1); }	89	{ printf("iconv_open failed in convert_string: Can't convert from %s to UTF-8?\n", getenv("LC_CTYPE")); exit(1); }
89		90
90	result = iconv(conv, &inp, &insize, &outp, &outsize);	91	result = iconv(conv, &inp, &insize, &outp, &outsize);
91	fehlernr = errno;	92	fehlernr = errno;
92		93
93	if (fehlernr==E2BIG) { fprintf(stderr, "errno==E2BIG\n"); }	94	if (fehlernr==E2BIG) { fprintf(stderr, "errno==E2BIG\n"); }
94	else if (fehlernr==EILSEQ) {	95	else if (fehlernr==EILSEQ) {
95	fprintf(stderr, "Can't convert '%s' as character set %s\n", str, locale_charset());	96	fprintf(stderr, "Can't interpret '%s' as character from charset %s\n", str, getenv("LC_CTYPE"));
96	fprintf(stderr, "Check your language settings with locale(1)\n");	97	fprintf(stderr, "Check your language settings with locale(1)\n");
97	}	98	}
98	else if (fehlernr==EINVAL) { fprintf(stderr, "errno==EINVAL\n"); }	99	else if (fehlernr==EINVAL) { fprintf(stderr, "errno==EINVAL\n"); }
99		100
100	output[strlen(output)] = '\0';	101	output[strlen(output)] = '\0';
101		102
102	setlocale(LC_CTYPE, INTERNAL_LOCALE);	103	ret = setlocale(LC_CTYPE, INTERNAL_LOCALE);
		104	if (ret==NULL) {
		105	fprintf(stderr, "setlocale failed with: %s\n\n", INTERNAL_LOCALE);
		106	exit(1);
		107	}
103	mbstowcs(converted_string, output, strlen(output));	108	mbstowcs(converted_string, output, strlen(output));
104		109
105	iconv_close(conv);	110	iconv_close(conv);
Lines 141-147 Link Here
141	fehlernr = errno;	146	fehlernr = errno;
142		147
143	if (fehlernr==E2BIG) { fprintf(stderr, "errno==E2BIG\n"); }	148	if (fehlernr==E2BIG) { fprintf(stderr, "errno==E2BIG\n"); }
144	else if (fehlernr==EILSEQ) { fprintf(stderr, "errno==EILSEQ in output_string\n"); }	149	else if (fehlernr==EILSEQ) { fprintf(stderr, "errno==EILSEQ in output_string\n"); fprintf(stderr, "input: %s\n", inp); }
145	else if (fehlernr==EINVAL) { fprintf(stderr, "errno==EINVAL\n"); }	150	else if (fehlernr==EINVAL) { fprintf(stderr, "errno==EINVAL\n"); }
146		151
147	output[DEF_STR_LEN-outsize] = '\0';	152	output[DEF_STR_LEN-outsize] = '\0';

Lines 95-103 Link Here

(-)vilistextum-2.6.7/src/html.c (-10 / +7 lines)
95	while ((ch!='=') && (ch!='>')) {	95	while ((ch!='=') && (ch!='>')) {
96	ch=read_char();	96	ch=read_char();
97	if (i<DEF_STR_LEN) { attr_name[i++] = ch; }	97	if (i<DEF_STR_LEN) { attr_name[i++] = ch; }
98	}	98	} /* post cond: i<=DEF_STR_LEN */
99	if (i<DEF_STR_LEN) { attr_name[i-1] = '\0'; }	99	attr_name[i-1] = '\0';
100	else { attr_name[DEF_STR_LEN-1] = '\0'; }
101		100
102	if (ch=='>') { attr_ctnt[0]='\0'; return '>'; }	101	if (ch=='>') { attr_ctnt[0]='\0'; return '>'; }
103		102
Lines 116-126 Link Here
116	i=0;	115	i=0;
117	ch=read_char();	116	ch=read_char();
118	while(quote!=ch) {	117	while(quote!=ch) {
119	if (i<DEF_STR_LEN) { temp[i++] = ch; }	118	if (i<DEF_STR_LEN-1) { temp[i++] = ch; }
120	ch=read_char();	119	ch=read_char();
121	}	120	} /* post cond: i<=DEF_STR_LEN-1 */
122	if (i<DEF_STR_LEN) { temp[i] = '\0'; }	121	temp[i] = '\0';
123	else { temp[DEF_STR_LEN] = '\0'; }
124	ch=read_char();	122	ch=read_char();
125	}	123	}
126	else	124	else
Lines 131-139 Link Here
131	while ((ch!='>') && (!isspace(ch))) {	129	while ((ch!='>') && (!isspace(ch))) {
132	ch=read_char();	130	ch=read_char();
133	if (i<DEF_STR_LEN) { temp[i++] = ch; }	131	if (i<DEF_STR_LEN) { temp[i++] = ch; }
134	}	132	} /* post cond: i<=DEF_STR_LEN */
135	if (i<DEF_STR_LEN) { temp[i-1] = '\0'; }	133	temp[i-1] = '\0';
136	else { temp[DEF_STR_LEN-1] = '\0'; }
137	}	134	}
138		135
139	uppercase_str(attr_name);	136	uppercase_str(attr_name);

Lines 1-9 Link Here

(-)vilistextum-2.6.7/CHANGES (-2 / +8 lines)
		1	2.6.7-gentoo: (02.01.2005)
		2
		3	- configure fixed to correctly process --disable-multibyte
		4	- configure falls back to standard iconv() if no libiconv is found
		5	- BUGFIX: three off-by-one error in get_attr found by Ewald Dieterich
		6
1	2.6.7: (19.12.2004)	7	2.6.7: (19.12.2004)
2		8
3	- BUGFIX: buffer overflow in get_attr found by Ariel Berkman	9	- BUGFIX: buffer overflow in get_attr() found by Ariel Berkman
4	- BUGFIX: compilation fix for Solaris by Fredrik Roubert	10	- BUGFIX: compilation fix for Solaris by Fredrik Roubert
5	- more robust behaviour when encountering invalid byte sequences	11	- more robust behaviour when encountering invalid byte sequences
6	- added RPM-spec file by Joshua Jensen.	12	- added RPM-spec file by Joshua Jensen
7		13
8	2.6.6: (24.08.2004)	14	2.6.6: (24.08.2004)
9		15

Lines 846-852 Link Here

(-)vilistextum-2.6.7/configure (-12 / +159 lines)
846	--enable-FEATURE[=ARG] include FEATURE [ARG=yes]	846	--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
847	--disable-dependency-tracking Speeds up one-time builds	847	--disable-dependency-tracking Speeds up one-time builds
848	--enable-dependency-tracking Do not reject slow dependency extractors	848	--enable-dependency-tracking Do not reject slow dependency extractors
849	--enable-multibyte Enable multibyte support. Needs libiconv.	849	--enable-multibyte Enable multibyte support.
850		850
851	Optional Packages:	851	Optional Packages:
852	--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]	852	--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
Lines 1541-1547 Link Here
1541		1541
1542	# Define the identity of the package.	1542	# Define the identity of the package.
1543	PACKAGE=vilistextum	1543	PACKAGE=vilistextum
1544	VERSION=2.6.7	1544	VERSION=2.6.7-gentoo
1545		1545
1546		1546
1547	cat >>confdefs.h <<_ACEOF	1547	cat >>confdefs.h <<_ACEOF
Lines 1673-1679 Link Here
1673		1673
1674		1674
1675	cat >>confdefs.h <<_ACEOF	1675	cat >>confdefs.h <<_ACEOF
1676	#define RELEASEDATE "19.12.2004"	1676	#define RELEASEDATE "02.01.2005"
1677	_ACEOF	1677	_ACEOF
1678		1678
1679		1679
Lines 3615-3627 Link Here
3615	# Check whether --enable-multibyte or --disable-multibyte was given.	3615	# Check whether --enable-multibyte or --disable-multibyte was given.
3616	if test "${enable_multibyte+set}" = set; then	3616	if test "${enable_multibyte+set}" = set; then
3617	enableval="$enable_multibyte"	3617	enableval="$enable_multibyte"
3618	multibyte="yes"	3618	use_multibyte=$enableval
3619	else	3619	else
3620	multibyte="no"	3620	use_multibyte=no
3621	fi;	3621	fi;
3622	echo "$as_me:$LINENO: result: $multibyte" >&5	3622	echo "$as_me:$LINENO: result: $use_multibyte" >&5
3623	echo "${ECHO_T}$multibyte" >&6	3623	echo "${ECHO_T}$use_multibyte" >&6
3624	if test "$multibyte" = "yes"; then	3624
		3625	if test "$use_multibyte" = "yes"; then
3625		3626
3626	cat >>confdefs.h <<\_ACEOF	3627	cat >>confdefs.h <<\_ACEOF
3627	#define MULTIBYTE 1	3628	#define MULTIBYTE 1
Lines 3629-3635 Link Here
3629		3630
3630	fi	3631	fi
3631		3632
3632	if test "$multibyte" = "yes"; then	3633	if test "$use_multibyte" = "yes"; then
		3634
		3635	for ac_header in iconv.h
		3636	do
		3637	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
		3638	if eval "test \"\${$as_ac_Header+set}\" = set"; then
		3639	echo "$as_me:$LINENO: checking for $ac_header" >&5
		3640	echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
		3641	if eval "test \"\${$as_ac_Header+set}\" = set"; then
		3642	echo $ECHO_N "(cached) $ECHO_C" >&6
		3643	fi
		3644	echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
		3645	echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
		3646	else
		3647	# Is the header compilable?
		3648	echo "$as_me:$LINENO: checking $ac_header usability" >&5
		3649	echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
		3650	cat >conftest.$ac_ext <<_ACEOF
		3651	#line $LINENO "configure"
		3652	/* confdefs.h. */
		3653	_ACEOF
		3654	cat confdefs.h >>conftest.$ac_ext
		3655	cat >>conftest.$ac_ext <<_ACEOF
		3656	/* end confdefs.h. */
		3657	$ac_includes_default
		3658	#include <$ac_header>
		3659	_ACEOF
		3660	rm -f conftest.$ac_objext
		3661	if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
		3662	(eval $ac_compile) 2>&5
		3663	ac_status=$?
		3664	echo "$as_me:$LINENO: \$? = $ac_status" >&5
		3665	(exit $ac_status); } &&
		3666	{ ac_try='test -s conftest.$ac_objext'
		3667	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
		3668	(eval $ac_try) 2>&5
		3669	ac_status=$?
		3670	echo "$as_me:$LINENO: \$? = $ac_status" >&5
		3671	(exit $ac_status); }; }; then
		3672	ac_header_compiler=yes
		3673	else
		3674	echo "$as_me: failed program was:" >&5
		3675	sed 's/^/\| /' conftest.$ac_ext >&5
		3676
		3677	ac_header_compiler=no
		3678	fi
		3679	rm -f conftest.$ac_objext conftest.$ac_ext
		3680	echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
		3681	echo "${ECHO_T}$ac_header_compiler" >&6
		3682
		3683	# Is the header present?
		3684	echo "$as_me:$LINENO: checking $ac_header presence" >&5
		3685	echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
		3686	cat >conftest.$ac_ext <<_ACEOF
		3687	#line $LINENO "configure"
		3688	/* confdefs.h. */
		3689	_ACEOF
		3690	cat confdefs.h >>conftest.$ac_ext
		3691	cat >>conftest.$ac_ext <<_ACEOF
		3692	/* end confdefs.h. */
		3693	#include <$ac_header>
		3694	_ACEOF
		3695	if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
		3696	(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
		3697	ac_status=$?
3698	grep -v '^ *+' conftest.er1 >conftest.err
3699	rm -f conftest.er1
3700	cat conftest.err >&5
3701	echo "$as_me:$LINENO: \$? = $ac_status" >&5
3702	(exit $ac_status); } >/dev/null; then
3703	if test -s conftest.err; then
3704	ac_cpp_err=$ac_c_preproc_warn_flag
3705	else
3706	ac_cpp_err=
3707	fi
3708	else
3709	ac_cpp_err=yes
3710	fi
3711	if test -z "$ac_cpp_err"; then
3712	ac_header_preproc=yes
3713	else
3714	echo "$as_me: failed program was:" >&5
3715	sed 's/^/\| /' conftest.$ac_ext >&5
3716
3717	ac_header_preproc=no
3718	fi
3719	rm -f conftest.err conftest.$ac_ext
3720	echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
3721	echo "${ECHO_T}$ac_header_preproc" >&6
3722
3723	# So? What about this header?
3724	case $ac_header_compiler:$ac_header_preproc in
3725	yes:no )
3726	{ echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
3727	echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
3728	{ echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
3729	echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
3730	(
3731	cat <<\_ASBOX
3732	## ------------------------------------ ##
3733	## Report this to bug-autoconf@gnu.org. ##
3734	## ------------------------------------ ##
3735	_ASBOX
3736	) \|
3737	sed "s/^/$as_me: WARNING: /" >&2
3738	;;
3739	no:yes )
3740	{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
3741	echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
3742	{ echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
3743	echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
3744	{ echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
3745	echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
3746	(
3747	cat <<\_ASBOX
3748	## ------------------------------------ ##
3749	## Report this to bug-autoconf@gnu.org. ##
3750	## ------------------------------------ ##
3751	_ASBOX
3752	) \|
3753	sed "s/^/$as_me: WARNING: /" >&2
3754	;;
3755	esac
3756	echo "$as_me:$LINENO: checking for $ac_header" >&5
3757	echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
3758	if eval "test \"\${$as_ac_Header+set}\" = set"; then
3759	echo $ECHO_N "(cached) $ECHO_C" >&6
3760	else
3761	eval "$as_ac_Header=$ac_header_preproc"
3762	fi
3763	echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
3764	echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
3765
3766	fi
3767	if test `eval echo '${'$as_ac_Header'}'` = yes; then
3768	cat >>confdefs.h <<_ACEOF
3769	#define `echo "HAVE_$ac_header" \| $as_tr_cpp` 1
3770	_ACEOF
3771
3772	else
3773	{ { echo "$as_me:$LINENO: error: Need libiconv or iconv.h for multibyte support" >&5
3774	echo "$as_me: error: Need libiconv or iconv.h for multibyte support" >&2;}
3775	{ (exit 1); exit 1; }; }
3776	fi
3777
3778	done
3779
3780
3633		3781
3634	echo "$as_me:$LINENO: checking for iconv in -liconv" >&5	3782	echo "$as_me:$LINENO: checking for iconv in -liconv" >&5
3635	echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6	3783	echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6
Lines 3693-3701 Link Here
3693	LIBS="-liconv $LIBS"	3841	LIBS="-liconv $LIBS"
3694		3842
3695	else	3843	else
3696	{ { echo "$as_me:$LINENO: error: Need libiconv for multibyte support" >&5	3844	{ echo "$as_me:$LINENO: WARNING: only generic iconv has been found not libiconv" >&5
3697	echo "$as_me: error: Need libiconv for multibyte support" >&2;}	3845	echo "$as_me: WARNING: only generic iconv has been found not libiconv" >&2;}
3698	{ (exit 1); exit 1; }; }
3699	fi	3846	fi
3700		3847
3701		3848

Lines 1-11 Link Here

(-)vilistextum-2.6.7/configure.in (-8 / +12 lines)
1	dnl Process this file with autoconf to produce a configure script.	1	dnl Process this file with autoconf to produce a configure script.
2	AC_INIT(src/debug.h)	2	AC_INIT(src/debug.h)
3	AM_INIT_AUTOMAKE(vilistextum, 2.6.7)	3	AM_INIT_AUTOMAKE(vilistextum, 2.6.7-gentoo)
4		4
5	AM_CONFIG_HEADER(config.h)	5	AM_CONFIG_HEADER(config.h)
6		6
7	dnl Set current date	7	dnl Set current date
8	AC_DEFINE_UNQUOTED(RELEASEDATE, "19.12.2004", "Release date of the program")	8	AC_DEFINE_UNQUOTED(RELEASEDATE, "02.01.2005", "Release date of the program")
9		9
10	dnl Checks for programs.	10	dnl Checks for programs.
11	AC_PROG_CC	11	AC_PROG_CC
Lines 27-43 Link Here
27	dnl checking for options	27	dnl checking for options
28	AC_MSG_CHECKING(if --enable-multibyte specified)	28	AC_MSG_CHECKING(if --enable-multibyte specified)
29	AC_ARG_ENABLE(multibyte,	29	AC_ARG_ENABLE(multibyte,
30	[ --enable-multibyte Enable multibyte support. Needs libiconv.],	30	AC_HELP_STRING([--enable-multibyte], [Enable multibyte support.]),
31	[multibyte="yes"], [multibyte="no"])	31	[use_multibyte=$enableval], [use_multibyte=no])
32	AC_MSG_RESULT($multibyte)	32	AC_MSG_RESULT($use_multibyte)
33	if test "$multibyte" = "yes"; then	33
		34	if test "$use_multibyte" = "yes"; then
34	AC_DEFINE(MULTIBYTE, 1, "Enable multibyte support (e.g. unicode, shift_jis)")	35	AC_DEFINE(MULTIBYTE, 1, "Enable multibyte support (e.g. unicode, shift_jis)")
35	fi	36	fi
36		37
37	dnl Checks for libraries.	38	dnl Checks for libraries.
38	if test "$multibyte" = "yes"; then	39	if test "$use_multibyte" = "yes"; then
		40	AC_CHECK_HEADERS(iconv.h,,
		41	AC_MSG_ERROR(Need libiconv or iconv.h for multibyte support))
		42
39	AC_CHECK_LIB(iconv, iconv,,	43	AC_CHECK_LIB(iconv, iconv,,
40	AC_MSG_ERROR(Need libiconv for multibyte support))	44	AC_MSG_WARN(only generic iconv has been found not libiconv))
41		45
42	dnl setting INTERNAL_LOCALE	46	dnl setting INTERNAL_LOCALE
43	AC_MSG_CHECKING(for unicode locale)	47	AC_MSG_CHECKING(for unicode locale)

Lines 52-63 Link Here

(-)vilistextum-2.6.7/src/html_tag.c (-5 / +5 lines)
52	/* read html tag */	52	/* read html tag */
53	while ((ch!='>') && (ch!=' ') && (ch!=13) && (ch!=10))	53	while ((ch!='>') && (ch!=' ') && (ch!=13) && (ch!=10))
54	{	54	{
55	if (i<DEF_STR_LEN) { str[i] = ch; }	55	if (i<DEF_STR_LEN-1) { str[i++] = ch; }
56	i++;
57	ch = uppercase(read_char());	56	ch = uppercase(read_char());
58	}	57	} /* post cond: i<=DEF_STR_LEN-1 */
59	if (i>=DEF_STR_LEN) { str[DEF_STR_LEN] = '\0'; }	58	str[i] = '\0';
60	else { str[i] = '\0';}
61		59
62	#ifdef debug	60	#ifdef debug
63	fprintf(stderr, "html_tag: %ls\n",str);	61	fprintf(stderr, "html_tag: %ls\n",str);
Lines 332-337 Link Here
332	else if CMP("/SCRIPT", str) {}	330	else if CMP("/SCRIPT", str) {}
333	else if CMP("STYLE", str) {}	331	else if CMP("STYLE", str) {}
334	else if CMP("/STYLE", str) {}	332	else if CMP("/STYLE", str) {}
		333	else if CMP("TITLE", str) {}
		334	else if CMP("/TITLE", str) {}
335	else { if (errorlevel>=2) { print_error("tag ignored: ", str);} }	335	else { if (errorlevel>=2) { print_error("tag ignored: ", str);} }
336	}	336	}
337		337

Lines 249-258 Link Here

(-)vilistextum-2.6.7/src/text.c (+4 lines)
249		249
250	if (!palm)	250	if (!palm)
251	{	251	{
		252	if (wort_pos+len<DEF_STR_LEN) {
252	while (i<wort_pos+len) { wort[i] = s[j]; j++; i++; }	253	while (i<wort_pos+len) { wort[i] = s[j]; j++; i++; }
253	wort[i] = '\0';	254	wort[i] = '\0';
254	wort_pos += len;	255	wort_pos += len;
255	}	256	}
		257	}
256		258
257	#ifdef proc_debug	259	#ifdef proc_debug
258	printf("wort_plus_string_nocount() ende\n");	260	printf("wort_plus_string_nocount() ende\n");
Lines 273-281 Link Here
273	printf("s: %ls len: %d\n", s,len);	275	printf("s: %ls len: %d\n", s,len);
274	#endif	276	#endif
275		277
		278	if (wort_pos+len<DEF_STR_LEN) {
276	while (i<wort_pos+len) { wort[i] = s[j]; j++; i++; }	279	while (i<wort_pos+len) { wort[i] = s[j]; j++; i++; }
277	wort[i] = '\0';	280	wort[i] = '\0';
278	wort_pos += len; wort_len += len;	281	wort_pos += len; wort_len += len;
		282	}
279		283
280	#ifdef proc_debug	284	#ifdef proc_debug
281	printf("wort_plus_string() ende\n");	285	printf("wort_plus_string() ende\n");