From e7101a7ac6f532dfa92c574ff42ce8d1ae737396 Mon Sep 17 00:00:00 2001 From: H.G. Muller Date: Tue, 12 Feb 2013 11:15:36 +0100 Subject: [PATCH] version 1.4.70b --- ChangeLog | 2 ++ book_merge.c | 8 ++++---- config.h | 24 ++++++++++++------------ configure | 20 ++++++++++---------- configure.ac | 2 +- debian/changelog | 6 ++++++ main.c | 2 +- polyglot.spec | 2 +- 8 files changed, 37 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24e0ec0..3d3ac8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +========1.4.70b================= +- merge-book did not work correctly on Windows. ========1.4.69b================= - Adapt to latest version of header format. ========1.4.68b================= diff --git a/book_merge.c b/book_merge.c index c35e8af..738d8e3 100644 --- a/book_merge.c +++ b/book_merge.c @@ -69,7 +69,7 @@ static void variants_merge(char ** variants, char *variants1, char *variants2){ // Step 1: Initial malloc - *variants=malloc(strlen(variants1)+strlen(variants2)+1); + *variants=malloc(strlen(variants1)+strlen(variants2)+1+1); (*variants)[0]='\0'; // Step 2: Loop through the variant names @@ -79,17 +79,17 @@ static void variants_merge(char ** variants, char *variants1, char *variants2){ for(i=0;i<2;i++){ variants_list=(i==0)?variants1_dup:variants2_dup; - variant=strtok(variants_list,"\n"); + variant=strtok(variants_list,"\x0a"); while(variant){ // TODO: this does not take into account that one variant name // may be contained in another. if(!strstr(*variants,variant)){ if((*variants)[0]!=0){ - strcat(*variants,"\n"); + strcat(*variants,"\x0a"); } strcat(*variants,variant); } - variant=strtok(NULL,"\n"); + variant=strtok(NULL,"\x0a"); } } free(variants1_dup); diff --git a/config.h b/config.h index f48a008..65aedbd 100644 --- a/config.h +++ b/config.h @@ -11,7 +11,7 @@ #define HAVE_FLOOR 1 /* Define to 1 if you have the `fork' function. */ -#define HAVE_FORK 1 +/* #undef HAVE_FORK */ /* Define to 1 if you have the `gettimeofday' function. */ #define HAVE_GETTIMEOFDAY 1 @@ -40,7 +40,7 @@ #define HAVE_REALLOC 1 /* Define to 1 if you have the `select' function. */ -#define HAVE_SELECT 1 +/* #undef HAVE_SELECT */ /* Define to 1 if stdbool.h conforms to C99. */ #define HAVE_STDBOOL_H 1 @@ -70,10 +70,10 @@ #define HAVE_STRSTR 1 /* Define to 1 if you have the header file. */ -#define HAVE_SYS_SELECT_H 1 +/* #undef HAVE_SYS_SELECT_H */ /* Define to 1 if you have the header file. */ -#define HAVE_SYS_SOCKET_H 1 +/* #undef HAVE_SYS_SOCKET_H */ /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 @@ -88,7 +88,7 @@ #define HAVE_UNISTD_H 1 /* Define to 1 if you have the `vfork' function. */ -#define HAVE_VFORK 1 +/* #undef HAVE_VFORK */ /* Define to 1 if you have the header file. */ /* #undef HAVE_VFORK_H */ @@ -97,10 +97,10 @@ #define HAVE_VPRINTF 1 /* Define to 1 if `fork' works. */ -#define HAVE_WORKING_FORK 1 +/* #undef HAVE_WORKING_FORK */ /* Define to 1 if `vfork' works. */ -#define HAVE_WORKING_VFORK 1 +/* #undef HAVE_WORKING_VFORK */ /* Define to 1 if the system has the type `_Bool'. */ #define HAVE__BOOL 1 @@ -115,13 +115,13 @@ #define PACKAGE_NAME "polyglot" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "polyglot 1.4.69b" +#define PACKAGE_STRING "polyglot 1.4.70b" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "polyglot" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.4.69b" +#define PACKAGE_VERSION "1.4.70b" /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void @@ -130,7 +130,7 @@ #define SELECT_TYPE_ARG1 int /* Define to the type of args 2, 3 and 4 for `select'. */ -#define SELECT_TYPE_ARG234 (fd_set *) +#define SELECT_TYPE_ARG234 (int *) /* Define to the type of arg 5 for `select'. */ #define SELECT_TYPE_ARG5 (struct timeval *) @@ -142,7 +142,7 @@ #define TIME_WITH_SYS_TIME 1 /* Version number of package */ -#define VERSION "1.4.69b" +#define VERSION "1.4.70b" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ @@ -166,4 +166,4 @@ /* #undef size_t */ /* Define as `fork' if `vfork' does not work. */ -/* #undef vfork */ +#define vfork fork diff --git a/configure b/configure index 755c38e..9daca4a 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for polyglot 1.4.69b. +# Generated by GNU Autoconf 2.63 for polyglot 1.4.70b. # # Report bugs to . # @@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='polyglot' PACKAGE_TARNAME='polyglot' -PACKAGE_VERSION='1.4.69b' -PACKAGE_STRING='polyglot 1.4.69b' +PACKAGE_VERSION='1.4.70b' +PACKAGE_STRING='polyglot 1.4.70b' PACKAGE_BUGREPORT='michel.vandenbergh@uhasselt.be' ac_unique_file="mainloop.c" @@ -1286,7 +1286,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures polyglot 1.4.69b to adapt to many kinds of systems. +\`configure' configures polyglot 1.4.70b to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1352,7 +1352,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of polyglot 1.4.69b:";; + short | recursive ) echo "Configuration of polyglot 1.4.70b:";; esac cat <<\_ACEOF @@ -1439,7 +1439,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -polyglot configure 1.4.69b +polyglot configure 1.4.70b generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1453,7 +1453,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by polyglot $as_me 1.4.69b, which was +It was created by polyglot $as_me 1.4.70b, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2302,7 +2302,7 @@ fi # Define the identity of the package. PACKAGE='polyglot' - VERSION='1.4.69b' + VERSION='1.4.70b' cat >>confdefs.h <<_ACEOF @@ -7055,7 +7055,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by polyglot $as_me 1.4.69b, which was +This file was extended by polyglot $as_me 1.4.70b, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7118,7 +7118,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -polyglot config.status 1.4.69b +polyglot config.status 1.4.70b configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 550ce34..ed8e1ec 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([polyglot], [1.4.69b], [michel.vandenbergh@uhasselt.be]) +AC_INIT([polyglot], [1.4.70b], [michel.vandenbergh@uhasselt.be]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([mainloop.c]) AC_CONFIG_HEADER([config.h]) diff --git a/debian/changelog b/debian/changelog index a84af27..a065606 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +polyglot (1.4.70b) unstable; urgency=low + + * Previous version did not work correctly on Windows. + + -- Michel Van den Bergh Wed, 20 Sept 2012 21:00:00 +0100 + polyglot (1.4.69b) unstable; urgency=low * Adapt to latest version of header format. diff --git a/main.c b/main.c index 2a77cae..e06d59c 100644 --- a/main.c +++ b/main.c @@ -39,7 +39,7 @@ // constants -static const char * const Version = "1.4.69b"; +static const char * const Version = "1.4.70b"; static const char * const HelpMessage = "\ SYNTAX\n\ * polyglot [configfile] [-noini] [-ec engine] [-ed enginedirectory] [-en enginename] [-log true/false] [-lf logfile] [-pg =]* [-uci =]*\n\ diff --git a/polyglot.spec b/polyglot.spec index 0c52581..53318dd 100644 --- a/polyglot.spec +++ b/polyglot.spec @@ -1,6 +1,6 @@ Summary: A Winboard protocol to UCI protocol adapter Name: polyglot -Version: 1.4.69b +Version: 1.4.70b Release: 1 License: GPL Group: Amusement/Games -- 1.7.0.4