Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Nov 2010 15:08:56 +0000 (UTC)
From:      Nathan Whitehorn <nwhitehorn@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r215752 - head/usr.bin/locate/locate
Message-ID:  <201011231508.oANF8ulx034277@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nwhitehorn
Date: Tue Nov 23 15:08:56 2010
New Revision: 215752
URL: http://svn.freebsd.org/changeset/base/215752

Log:
  Properly use SCHAR_MAX instead of CHAR_MAX for 0x7f. This fixes operation
  of locate(1) on systems on which char is unsigned by default (ARM and
  PowerPC).
  
  Reported by:	Paul Mather
  MFC after:	4 days

Modified:
  head/usr.bin/locate/locate/locate.h

Modified: head/usr.bin/locate/locate/locate.h
==============================================================================
--- head/usr.bin/locate/locate/locate.h	Tue Nov 23 14:36:14 2010	(r215751)
+++ head/usr.bin/locate/locate/locate.h	Tue Nov 23 15:08:56 2010	(r215752)
@@ -48,15 +48,15 @@
 #define LDC_MAX        28
 
 /*	128-255 bigram codes (128 most common, as determined by 'updatedb') */
-#define BIGRAM_MIN    (UCHAR_MAX - CHAR_MAX) 
+#define BIGRAM_MIN    (UCHAR_MAX - SCHAR_MAX) 
 #define BIGRAM_MAX    UCHAR_MAX
 
 /*	32-127  single character (printable) ascii residue (ie, literal) */
 #define ASCII_MIN      32
-#define ASCII_MAX     CHAR_MAX
+#define ASCII_MAX     SCHAR_MAX
 
-/* #define TO7BIT(x)     (x = ( ((u_char)x) & CHAR_MAX )) */
-#define TO7BIT(x)     (x = x & CHAR_MAX )
+/* #define TO7BIT(x)     (x = ( ((u_char)x) & SCHAR_MAX )) */
+#define TO7BIT(x)     (x = x & SCHAR_MAX )
 
 
 #if UCHAR_MAX >= 4096



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011231508.oANF8ulx034277>