bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

relocatable-prog-wrapper fixes


From: Bruno Haible
Subject: relocatable-prog-wrapper fixes
Date: Wed, 26 Dec 2007 16:25:46 +0100
User-agent: KMail/1.5.4

Hi,

It was reported in [1] that the relocatable-prog-wrapper fails to compile
due to an undefined xalloc_die() symbol. It is caused by the use of xreadlink().
Since the wrapper is compiled with NO_XMALLOC defined, xreadlink should be
avoided.

2007-12-24  Bruno Haible  <address@hidden>

        Fix link error due to xalloc_die().
        * lib/progreloc.c: When NO_XMALLOC is defined, use areadlink instead
        of xreadlink.
        * lib/relocwrapper.c: Update comments.
        * build-aux/install-reloc: Remove xreadlink.c from file list.
        * modules/relocatable-prog-wrapper (Files): Remove xreadlink.h and
        xreadlink.c.
        Reported by Левашев Иван <address@hidden>.

*** build-aux/install-reloc.orig        2007-12-24 23:12:22.000000000 +0100
--- build-aux/install-reloc     2007-12-24 23:07:24.000000000 +0100
***************
*** 131,137 ****
               "$srcdir"/relocwrapper.c \
               "$srcdir"/progname.c \
               "$srcdir"/progreloc.c \
-              "$srcdir"/xreadlink.c \
               "$srcdir"/areadlink.c \
               "$srcdir"/readlink.c \
               "$srcdir"/canonicalize-lgpl.c \
--- 131,136 ----
*** lib/progreloc.c.orig        2007-12-24 23:12:22.000000000 +0100
--- lib/progreloc.c     2007-12-24 23:04:19.000000000 +0100
***************
*** 1,5 ****
  /* Provide relocatable programs.
!    Copyright (C) 2003-2006 Free Software Foundation, Inc.
     Written by Bruno Haible <address@hidden>, 2003.
  
     This program is free software: you can redistribute it and/or modify
--- 1,5 ----
  /* Provide relocatable programs.
!    Copyright (C) 2003-2007 Free Software Foundation, Inc.
     Written by Bruno Haible <address@hidden>, 2003.
  
     This program is free software: you can redistribute it and/or modify
***************
*** 43,53 ****
  # include <windows.h>
  #endif
  
- #include "xreadlink.h"
  #include "canonicalize.h"
  #include "relocatable.h"
  
  #ifdef NO_XMALLOC
  # define xmalloc malloc
  # define xstrdup strdup
  #else
--- 43,59 ----
  # include <windows.h>
  #endif
  
  #include "canonicalize.h"
  #include "relocatable.h"
  
  #ifdef NO_XMALLOC
+ # include "areadlink.h"
+ # define xreadlink areadlink
+ #else
+ # include "xreadlink.h"
+ #endif
+ 
+ #ifdef NO_XMALLOC
  # define xmalloc malloc
  # define xstrdup strdup
  #else
*** lib/relocwrapper.c.orig     2007-12-24 23:12:22.000000000 +0100
--- lib/relocwrapper.c  2007-12-24 23:06:49.000000000 +0100
***************
*** 19,29 ****
     relocwrapper
      -> progname
      -> progreloc
!         -> xreadlink
!            -> areadlink
!               -> readlink
          -> canonicalize-lgpl
             -> malloca
      -> relocatable
      -> setenv
         -> malloca
--- 19,29 ----
     relocwrapper
      -> progname
      -> progreloc
!         -> areadlink
!            -> readlink
          -> canonicalize-lgpl
             -> malloca
+            -> readlink
      -> relocatable
      -> setenv
         -> malloca
*** modules/relocatable-prog-wrapper.orig       2007-12-24 23:12:22.000000000 
+0100
--- modules/relocatable-prog-wrapper    2007-12-24 23:07:05.000000000 +0100
***************
*** 8,15 ****
  lib/progname.h
  lib/progname.c
  lib/progreloc.c
- lib/xreadlink.h
- lib/xreadlink.c
  lib/areadlink.h
  lib/areadlink.c
  lib/readlink.c
--- 8,13 ----


[1] http://lists.gnu.org/archive/html/bug-gnu-utils/2007-12/msg00001.html





reply via email to

[Prev in Thread] Current Thread [Next in Thread]