X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Frelocwrapper.c;h=42c64cfb9a1b08020acf7b7deef0862191c6955f;hb=a5bd4a560247e63db562041f9d136ba83a8b95fb;hp=c303803a8256cec8fa4cfda8331c737976618e8c;hpb=86f544b2e68eefe1410f8c7db3be1819a18dbfb9;p=gnulib.git

diff --git a/lib/relocwrapper.c b/lib/relocwrapper.c
index c303803a8..42c64cfb9 100644
--- a/lib/relocwrapper.c
+++ b/lib/relocwrapper.c
@@ -1,11 +1,11 @@
 /* Relocating wrapper program.
-   Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,21 +13,22 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Dependencies:
    relocwrapper
     -> progname
     -> progreloc
-        -> xreadlink
+        -> areadlink
+           -> readlink
+        -> canonicalize-lgpl
+           -> malloca
            -> readlink
-        -> canonicalize
-           -> allocsa
     -> relocatable
     -> setenv
-       -> allocsa
+       -> malloca
     -> strerror
+    -> c-ctype
 
    Macros that need to be set while compiling this file:
      - ENABLE_RELOCATABLE 1
@@ -47,14 +48,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <errno.h>
 
 #include "progname.h"
 #include "relocatable.h"
-#include "setenv.h"
+#include "c-ctype.h"
 
 /* Return a copy of the filename, with an extra ".bin" at the end.
    More generally, it replaces "${EXEEXT}" at the end with ".bin${EXEEXT}".  */
@@ -83,8 +82,7 @@ add_dotbin (const char *filename)
 		{
 		  unsigned char c1 = *s1;
 		  unsigned char c2 = *s2;
-		  if ((c1 >= 'A' && c1 <= 'Z' ? c1 - 'A' + 'a' : c1)
-		      != (c2 >= 'A' && c2 <= 'Z' ? c2 - 'A' + 'a' : c2))
+		  if (c_tolower (c1) != c_tolower (c2))
 		    goto simple_append;
 		}
 	      /* Insert ".bin" before EXEEXT or its equivalent.  */