[BACK]Return to relocatable.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / libiconv / srclib

Diff for /embedaddon/libiconv/srclib/relocatable.c between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2012/05/29 09:29:43 version 1.1.1.3, 2021/03/17 13:38:46
Line 1 Line 1
 /* Provide relocatable packages.  /* Provide relocatable packages.
   Copyright (C) 2003-2006, 2008-2011 Free Software Foundation, Inc.   Copyright (C) 2003-2006, 2008-2019 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.     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
Line 13 Line 13
    GNU General Public License for more details.     GNU General Public License for more details.
   
    You should have received a copy of the GNU General Public License     You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
   
   
 /* Tell glibc's <stdio.h> to provide a prototype for getline().  /* Tell glibc's <stdio.h> to provide a prototype for getline().
Line 42 Line 42
 # include "xalloc.h"  # include "xalloc.h"
 #endif  #endif
   
#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__#if defined _WIN32 && !defined __CYGWIN__
 # define WIN32_LEAN_AND_MEAN  # define WIN32_LEAN_AND_MEAN
 # include <windows.h>  # include <windows.h>
 #endif  #endif
   
   #ifdef __EMX__
   # define INCL_DOS
   # include <os2.h>
   
   # define strcmp  stricmp
   # define strncmp strnicmp
   #endif
   
 #if DEPENDS_ON_LIBCHARSET  #if DEPENDS_ON_LIBCHARSET
 # include <libcharset.h>  # include <libcharset.h>
 #endif  #endif
Line 69 Line 77
    ISSLASH(C)           tests whether C is a directory separator character.     ISSLASH(C)           tests whether C is a directory separator character.
    IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.     IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
  */   */
#if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__#if (defined _WIN32 && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__
  /* Win32, OS/2, DOS */  /* Native Windows, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')  # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 # define HAS_DEVICE(P) \  # define HAS_DEVICE(P) \
     ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \      ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
Line 85 Line 93
 # define FILE_SYSTEM_PREFIX_LEN(P) 0  # define FILE_SYSTEM_PREFIX_LEN(P) 0
 #endif  #endif
   
   /* Whether to enable the more costly support for relocatable libraries.
      It allows libraries to be have been installed with a different original
      prefix than the program.  But it is quite costly, especially on Cygwin
      platforms, see below.  Therefore we enable it by default only on native
      Windows platforms.  */
   #ifndef ENABLE_COSTLY_RELOCATABLE
   # if defined _WIN32 && !defined __CYGWIN__
   #  define ENABLE_COSTLY_RELOCATABLE 1
   # else
   #  define ENABLE_COSTLY_RELOCATABLE 0
   # endif
   #endif
   
 /* Original installation prefix.  */  /* Original installation prefix.  */
 static char *orig_prefix;  static char *orig_prefix;
 static size_t orig_prefix_len;  static size_t orig_prefix_len;
Line 154  set_relocation_prefix (const char *orig_prefix_arg, co Line 175  set_relocation_prefix (const char *orig_prefix_arg, co
 #endif  #endif
 }  }
   
#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE)
   
 /* Convenience function:  /* Convenience function:
    Computes the current installation prefix, based on the original     Computes the current installation prefix, based on the original
Line 235  compute_curr_prefix (const char *orig_installprefix, Line 256  compute_curr_prefix (const char *orig_installprefix,
             /* Do case-insensitive comparison if the file system is always or              /* Do case-insensitive comparison if the file system is always or
                often case-insensitive.  It's better to accept the comparison                 often case-insensitive.  It's better to accept the comparison
                if the difference is only in case, rather than to fail.  */                 if the difference is only in case, rather than to fail.  */
#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__#if defined _WIN32 || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
            /* Win32, Cygwin, OS/2, DOS - case insignificant file system */            /* Native Windows, Cygwin, OS/2, DOS - case insignificant file system */
             if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)              if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
                 != (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))                  != (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
               break;                break;
Line 247  compute_curr_prefix (const char *orig_installprefix, Line 268  compute_curr_prefix (const char *orig_installprefix,
           }            }
         if (!same)          if (!same)
           break;            break;
        /* The last pathname component was the same.  opi and cpi now point        /* The last pathname component was the same.  rpi and cpi now point
            to the slash before it.  */             to the slash before it.  */
         rp = rpi;          rp = rpi;
         cp = cpi;          cp = cpi;
Line 261  compute_curr_prefix (const char *orig_installprefix, Line 282  compute_curr_prefix (const char *orig_installprefix,
       }        }
   
     {      {
      size_t curr_prefix_len = cp - curr_installdir;      size_t computed_curr_prefix_len = cp - curr_installdir;
      char *curr_prefix;      char *computed_curr_prefix;
   
      curr_prefix = (char *) xmalloc (curr_prefix_len + 1);      computed_curr_prefix = (char *) xmalloc (computed_curr_prefix_len + 1);
 #ifdef NO_XMALLOC  #ifdef NO_XMALLOC
      if (curr_prefix == NULL)      if (computed_curr_prefix == NULL)
         {          {
           free (curr_installdir);            free (curr_installdir);
           return NULL;            return NULL;
         }          }
 #endif  #endif
      memcpy (curr_prefix, curr_installdir, curr_prefix_len);      memcpy (computed_curr_prefix, curr_installdir, computed_curr_prefix_len);
      curr_prefix[curr_prefix_len] = '\0';      computed_curr_prefix[computed_curr_prefix_len] = '\0';
   
       free (curr_installdir);        free (curr_installdir);
   
      return curr_prefix;      return computed_curr_prefix;
     }      }
   }    }
 }  }
   
 #endif /* !IN_LIBRARY || PIC */  #endif /* !IN_LIBRARY || PIC */
   
#if defined PIC && defined INSTALLDIR#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
   
 /* Full pathname of shared library, or NULL.  */  /* Full pathname of shared library, or NULL.  */
 static char *shared_library_fullname;  static char *shared_library_fullname;
   
#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__#if defined _WIN32 && !defined __CYGWIN__
/* Native Win32 only./* Native Windows only.
    On Cygwin, it is better to use the Cygwin provided /proc interface, than     On Cygwin, it is better to use the Cygwin provided /proc interface, than
   to use native Win32 API and cygwin_conv_to_posix_path, because it supports   to use native Windows API and cygwin_conv_to_posix_path, because it
   longer file names   supports longer file names
   (see <http://cygwin.com/ml/cygwin/2011-01/msg00410.html>).  */   (see <https://cygwin.com/ml/cygwin/2011-01/msg00410.html>).  */
   
 /* Determine the full pathname of the shared library when it is loaded.  */  /* Determine the full pathname of the shared library when it is loaded.  */
   
Line 322  DllMain (HINSTANCE module_handle, DWORD event, LPVOID  Line 343  DllMain (HINSTANCE module_handle, DWORD event, LPVOID 
   return TRUE;    return TRUE;
 }  }
   
   #elif defined __EMX__
   
   extern int  _CRT_init (void);
   extern void _CRT_term (void);
   extern void __ctordtorInit (void);
   extern void __ctordtorTerm (void);
   
   unsigned long _System
   _DLL_InitTerm (unsigned long hModule, unsigned long ulFlag)
   {
     static char location[CCHMAXPATH];
   
     switch (ulFlag)
       {
         case 0:
           if (_CRT_init () == -1)
             return 0;
   
           __ctordtorInit();
   
           /* See http://cyberkinetica.homeunix.net/os2tk45/cp1/1247_L2H_DosQueryModuleNameSy.html
              for specification of DosQueryModuleName(). */
           if (DosQueryModuleName (hModule, sizeof (location), location))
             return 0;
   
           _fnslashify (location);
           shared_library_fullname = strdup (location);
           break;
   
         case 1:
           __ctordtorTerm();
   
           _CRT_term ();
           break;
       }
   
     return 1;
   }
   
 #else /* Unix */  #else /* Unix */
   
 static void  static void
Line 330  find_shared_library_fullname () Line 390  find_shared_library_fullname ()
 #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__  #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__
   /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline()    /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline()
      function.       function.
     Cygwin >= 1.5 has /proc/self/maps and the getline() function too.  */     Cygwin >= 1.5 has /proc/self/maps and the getline() function too.
      But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on
      Cygwin 1.7.  */
   FILE *fp;    FILE *fp;
   
   /* Open the current process' maps file.  It describes one VMA per line.  */    /* Open the current process' maps file.  It describes one VMA per line.  */
Line 375  find_shared_library_fullname () Line 437  find_shared_library_fullname ()
 #endif  #endif
 }  }
   
#endif /* WIN32 / Unix */#endif /* Native Windows / EMX / Unix */
   
 /* Return the full pathname of the current shared library.  /* Return the full pathname of the current shared library.
    Return NULL if unknown.     Return NULL if unknown.
   Guaranteed to work only on Linux, Cygwin and Woe32.  */   Guaranteed to work only on Linux, EMX, Cygwin, and native Windows.  */
 static char *  static char *
 get_shared_library_fullname ()  get_shared_library_fullname ()
 {  {
#if !((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__)#if !(defined _WIN32 && !defined __CYGWIN__) && !defined __EMX__
   static bool tried_find_shared_library_fullname;    static bool tried_find_shared_library_fullname;
   if (!tried_find_shared_library_fullname)    if (!tried_find_shared_library_fullname)
     {      {
Line 403  get_shared_library_fullname () Line 465  get_shared_library_fullname ()
 const char *  const char *
 relocate (const char *pathname)  relocate (const char *pathname)
 {  {
#if defined PIC && defined INSTALLDIR#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
   static int initialized;    static int initialized;
   
   /* Initialization code for a shared library.  */    /* Initialization code for a shared library.  */
Line 474  relocate (const char *pathname) Line 536  relocate (const char *pathname)
             }              }
         }          }
     }      }
   
   #ifdef __EMX__
   # ifdef __KLIBC__
   #  undef strncmp
   
     if (strncmp (pathname, "/@unixroot", 10) == 0
         && (pathname[10] == '\0' || ISSLASH (pathname[10])))
       {
         /* kLIBC itself processes /@unixroot prefix */
         return pathname;
       }
     else
   # endif
     if (ISSLASH (pathname[0]))
       {
         const char *unixroot = getenv ("UNIXROOT");
   
         if (unixroot && HAS_DEVICE (unixroot) && unixroot[2] == '\0')
           {
             char *result = (char *) xmalloc (2 + strlen (pathname) + 1);
   #ifdef NO_XMALLOC
             if (result != NULL)
   #endif
               {
                 memcpy (result, unixroot, 2);
                 strcpy (result + 2, pathname);
                 return result;
               }
           }
       }
   #endif
   
   /* Nothing to relocate.  */    /* Nothing to relocate.  */
   return pathname;    return pathname;
   }
   
   /* Returns the pathname, relocated according to the current installation
      directory.
      This function sets *ALLOCATEDP to the allocated memory, or to NULL if
      no memory allocation occurs.  So that, after you're done with the return
      value, to reclaim allocated memory, you can do: free (*ALLOCATEDP).  */
   const char *
   relocate2 (const char *pathname, char **allocatedp)
   {
     const char *result = relocate (pathname);
     *allocatedp = (result != pathname ? (char *) result : NULL);
     return result;
 }  }
   
 #endif  #endif
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>