From 9f89695c485be433a52637bdb43832bd75eae90c Mon Sep 17 00:00:00 2001
From: dan <dan>
Date: Sat, 6 Nov 2004 20:20:05 +0000
Subject: [PATCH] fixed bug with infinite loop in some circumstances in
 fitText() in WINGs

---
 ChangeLog     | 7 +++----
 WINGs/wmisc.c | 4 ++--
 configure.ac  | 9 +++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index baa5a4fd..40d6a6a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-
-- Removed --with-appsdir option and replaced it with --with-gnustepdir. Also,
-  default installation path (for non GNUstep users) is now $(prefix)/bin
-
 Changes since version 0.91.0:
 .............................
 - fixed crash with info panel and alt-tabbing
@@ -11,6 +7,9 @@ Changes since version 0.91.0:
 - fixed issues with compiling on Solaris with openwin
 - reduced minimum required version number for the Xft library to 2.1.0
 - fixed some compilation issues with gcc-2.9x
+- Removed --with-appsdir option and replaced it with --with-gnustepdir. Also,
+  default installation path (for non GNUstep users) is now $(prefix)/bin
+- fixed bug with infinite loop in some circumstances in fitText() in WINGs
 
 
 Changes since version 0.90.0:
diff --git a/WINGs/wmisc.c b/WINGs/wmisc.c
index f6f48057..861bd9f5 100644
--- a/WINGs/wmisc.c
+++ b/WINGs/wmisc.c
@@ -107,7 +107,7 @@ fitText(char *text, WMFont *font, int width, int wrap)
     int i, w, beforecrlf, word1, word2;
 
     /* text length before first cr/lf */
-    beforecrlf = strcspn(text, "\n\r");
+    beforecrlf = strcspn(text, "\n");
 
     if (!wrap || beforecrlf==0)
         return beforecrlf;
@@ -180,7 +180,7 @@ fitText(char *text, WMFont *font, int width, int wrap)
                 i = j;
         }
     } else {
-        i = strcspn(text, "\n\r");
+        i = strcspn(text, "\n");
     }
     return i;
 }
diff --git a/configure.ac b/configure.ac
index da410467..1633c309 100644
--- a/configure.ac
+++ b/configure.ac
@@ -834,6 +834,7 @@ AC_ARG_WITH(appspath,
 [  --with-gnustepdir=PATH    specify the directory for GNUstep applications], appspath=$withval )
 
 if test "$appspath$GNUSTEP_LOCAL_ROOT" = ""; then
+    wprefs_base_dir=${prefix}
     wprefs_datadir="${datadir}/WPrefs"
     wprefs_bindir="${bindir}"
 else
@@ -844,9 +845,9 @@ else
 	gnustepdir=`echo $gnustepdir | sed -e 's|^prefix|${prefix}|'`
     fi
 
-    xx=$gnustepdir/Applications
-    wprefs_datadir=$xx/WPrefs.app
-    wprefs_bindir=$xx/WPrefs.app
+    wprefs_base_dir=$gnustepdir/Applications
+    wprefs_datadir=$wprefs_base_dir/WPrefs.app
+    wprefs_bindir=$wprefs_base_dir/WPrefs.app
 fi
 
 AC_SUBST(wprefs_datadir)
@@ -1084,7 +1085,7 @@ echo "Window Maker was configured as follows:"
 echo
 echo "Installation path prefix            : $prefix"
 echo "Installation path for binaries      : $_bindir"
-echo "Installation path for WPrefs.app    : $wprefs_bindir" | sed -e 's|\${exec_prefix}|'"$exec_prefix|"  -e 's|\${prefix}|'"$prefix|"
+echo "Installation path for WPrefs.app    : $wprefs_base_dir" | sed -e 's|\${prefix}|'"$prefix|"
 echo "Supported graphic format libraries  : $supported_gfx"
 echo "Use assembly routines for wrlib     : $asm_support"
 echo "Use inline MMX(tm) x86 assembly     : $mmx_support"
-- 
2.11.4.GIT