commit ispell

31 May 2007

Hello community,

here is the log from the commit of package ispell
checked in at Thu May 31 20:55:15 CEST 2007.

--------

--- ispell/ispell.changes	2007-03-29 17:52:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/ispell/ispell.changes	2007-05-31 16:02:56.807491000 +0200
@@ -1,0 +2,5 @@
+Thu May 31 16:02:11 CEST 2007 - werner@suse.de
+
+- Fix sq/unsq, hint from Thomas Rachel
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ispell.spec ++++++
--- /var/tmp/diff_new_pack.Mn4539/_old	2007-05-31 20:54:41.000000000 +0200
+++ /var/tmp/diff_new_pack.Mn4539/_new	2007-05-31 20:54:41.000000000 +0200
@@ -20,7 +20,7 @@
 Requires:       words ispell_english_dictionary ispell_dictionary
 Autoreqprov:    on
 Version:        3.2.06
-Release:        508
+Release:        519
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        A Spell Checker
 Source:         ispell-3.2.06.tar.bz2
@@ -206,6 +206,8 @@
 /usr/lib/ispell/british.aff
 
 %changelog
+* Thu May 31 2007 - werner@suse.de
+- Fix sq/unsq, hint from Thomas Rachel
 * Thu Mar 29 2007 - rguenther@suse.de
 - Add bison and ncurses-devel BuildRequires.
 * Mon May 22 2006 - schwab@suse.de

++++++ ispell-3.2.06-sq.patch ++++++
--- /var/tmp/diff_new_pack.Mn4539/_old	2007-05-31 20:54:41.000000000 +0200
+++ /var/tmp/diff_new_pack.Mn4539/_new	2007-05-31 20:54:41.000000000 +0200
@@ -1,6 +1,6 @@
 --- Makefile
-+++ Makefile	Thu Dec 13 14:44:12 2001
-@@ -213,7 +213,7 @@
++++ Makefile	2001-12-13 14:44:12.000000000 +0100
+@@ -213,7 +213,7 @@ all:	all-languages
  
  programs: buildhash findaffix tryaffix ispell
  programs: icombine ijoin munchlist
@@ -9,7 +9,7 @@
  
  deformatter-programs:
  	cd deformatters; $(MAKE) all
-@@ -267,7 +267,9 @@
+@@ -267,7 +267,9 @@ install-basic:
  	@. ./config.sh; \
  	  set -x; \
  	  $$INSTALL ispell.1 $$MAN1DIR/ispell$$MAN1EXT; \
@@ -20,7 +20,7 @@
  	@. ./config.sh; \
  	  set -x; \
  	  cd $$MAN1DIR; \
-@@ -288,7 +290,7 @@
+@@ -288,7 +290,7 @@ install-dictbuild:
  	  rm -f $$LIBDIR/icombine
  	@. ./config.sh; \
  	  set -x; \
@@ -29,7 +29,7 @@
  	    $$BINDIR
  	@. ./config.sh; \
  	  set -x; \
-@@ -299,9 +301,7 @@
+@@ -299,9 +301,7 @@ install-dictbuild:
  	@. ./config.sh; \
  	  set -x; \
  	  [ -d $$MAN1DIR ]  ||  (mkdir $$MAN1DIR; chmod 755 $$MAN1DIR); \
@@ -41,7 +41,7 @@
  	  set -x; \
  	  for m in buildhash munchlist findaffix tryaffix; do \
 --- sq.1
-+++ sq.1	Thu Dec 13 14:44:12 2001
++++ sq.1	2001-12-13 14:44:12.000000000 +0100
 @@ -0,0 +1,82 @@
 +.\"
 +.\" $Id: sq.1,v 1.6 1994/01/25 07:12:07 geoff Exp $
@@ -126,10 +126,10 @@
 +.SH SEE ALSO
 +gzip(1), sort(1).
 --- sq.c
-+++ sq.c	Thu Dec 13 14:57:20 2001
++++ sq.c	2007-05-31 15:53:21.574485913 +0200
 @@ -0,0 +1,117 @@
 +#ifndef lint
-+static char Rcs_Id[] =
++static char Rcs_Id[] __attribute__ ((unused)) =
 +    "$Id: sq.c,v 1.12 1994/01/25 07:12:09 geoff Exp $";
 +#endif
 +
@@ -188,7 +188,7 @@
 +#endif /* __STDC__ */
 +
 +int		main P ((int argc, char * argv[]));
-+static void	trunc P ((char * word, char * prev));
++static void	sqtrunc P ((const char * word, char * prev));
 +
 +/*
 + * The following table encodes prefix sizes as a single character.  A
@@ -205,7 +205,7 @@
 +    'y', 'z'						/* 60-61 */
 +    };
 +
-+#define MAX_PREFIX	(sizeof (size_encodings) - 1)
++#define MAX_PREFIX	((sizeof(size_encodings)/sizeof(char)) - 1)
 +#define UNSEQBUFSIZE	257
 +
 +int main (argc, argv)
@@ -221,35 +221,35 @@
 +	    *nl = '\0';
 +	else
 +	    word[UNSEQBUFSIZE - 1] = '\0';
-+	trunc (word, prev);
++	sqtrunc (word, prev);
 +    }
 +    return 0;
 +    }
 +
-+static void trunc (word, prev) 
-+    char *		word;
++static void sqtrunc (word, prev) 
++    const char *	word;
 +    char *		prev;
 +    {
-+    register char *	wordp;
-+    register char *	prevp;
-+    register int	same_count;
++    const register char *	wordp;
++    const register char *	prevp;
++    register int		same_count;
 +
 +    wordp = word;
 +    prevp = prev;
 +    for (same_count = 0;  *wordp == *prevp++;  ++wordp, ++same_count)
-+	__asm__ __volatile__("": : :"memory");
++	;
 +    if (same_count>MAX_PREFIX)
 +	same_count = MAX_PREFIX;
 +    (void) putchar (size_encodings[same_count]);
-+    (void) puts (wordp);
++    (void) puts (&word[same_count]);
 +    (void) strcpy (prev, word);
 +    }
 +
 --- unsq.c
-+++ unsq.c	Thu Dec 13 14:44:12 2001
-@@ -0,0 +1,135 @@
++++ unsq.c	2007-05-31 15:57:31.060946909 +0200
+@@ -0,0 +1,134 @@
 +#ifndef lint
-+static char Rcs_Id[] =
++static char Rcs_Id[] __attribute__ ((unused)) =
 +    "$Id: unsq.c,v 1.14 1994/01/25 07:12:19 geoff Exp $";
 +#endif
 +
@@ -298,6 +298,7 @@
 + *
 + */
 +
++#include <stdlib.h>
 +#include <stdio.h>
 +#include <string.h>
 +#include "msgs.h"
@@ -309,7 +310,7 @@
 +#endif /* __STDC__ */
 +
 +int		main P ((int argc, char * argv[]));
-+static int	expand P ((char * word, char * prev));
++static int	sqexpand P ((char * word, char * prev));
 +
 +/*
 + * The following table encodes prefix sizes as a single character.  A
@@ -326,11 +327,9 @@
 +    'y', 'z'						/* 60-61 */
 +    };
 +
-+#define MAX_PREFIX	(sizeof (size_encodings) - 1)
++#define MAX_PREFIX	((sizeof(size_encodings)/sizeof(char)) - 1)
 +#define UNSEQBUFSIZE	257
 +
-+extern void	exit P ((int status));
-+
 +int main (argc, argv)
 +    int			argc;
 +    char *		argv[];
@@ -338,12 +337,12 @@
 +    char		word[UNSEQBUFSIZE];
 +    static char		prev[UNSEQBUFSIZE] = "";
 +
-+    while (!expand (word, prev))
++    while (!sqexpand (word, prev))
 +        puts (word);
 +    return 0;
 +    }
 +
-+static int expand (word, prev) 
++static int sqexpand (word, prev) 
 +    char *		word;
 +    char *		prev;
 +    {
@@ -352,16 +351,16 @@
 +    register char *	nl;
 +    register int	same_count;
 +    register int	count_char;
-+    register int	size;
++    register off_t	size;
 +
 +    count_char = getchar ();
 +    if (count_char == EOF)
 +	return(1);
 +    for (same_count = 0;
-+      same_count < MAX_PREFIX  &&  size_encodings[same_count] != count_char;
++      same_count <= MAX_PREFIX  &&  size_encodings[same_count] != count_char;
 +      same_count++)
 +	;
-+    if (same_count == MAX_PREFIX)
++    if (same_count > MAX_PREFIX)
 +	{
 +	(void) fprintf (stderr, UNSQ_C_BAD_COUNT, (unsigned int) count_char);
 +	exit (1);





++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)