Avoid warnings.

[openssl.git] / crypto / dso / dso_dl.c

diff --git a/crypto/dso/dso_dl.c b/crypto/dso/dso_dl.c
index a831877c07fa31cfa3afbd19d0813ce00e1db11d..fd1c7582608c52c63de1854abf82fbaa9c4c2952 100644 (file)
--- a/crypto/dso/dso_dl.c
+++ b/crypto/dso/dso_dl.c
@@ -1,5 +1,5 @@
-/* dso_dl.c */
-/* Written by Richard Levitte (levitte@openssl.org) for the OpenSSL
+/* dso_dl.c -*- mode:C; c-file-style: "eay" -*- */
+/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2000.
  */
 /* ====================================================================
@@ -84,6 +84,7 @@ static int dl_finish(DSO *dso);
 static int dl_ctrl(DSO *dso, int cmd, long larg, void *parg);
 #endif
 static char *dl_name_converter(DSO *dso, const char *filename);
+static char *dl_merger(DSO *dso, const char *filespec1, const char *filespec2);
 
 static DSO_METHOD dso_meth_dl = {
        "OpenSSL 'dl' shared library method",
@@ -98,6 +99,7 @@ static DSO_METHOD dso_meth_dl = {
 #endif
        NULL, /* ctrl */
        dl_name_converter,
+       dl_merger,
        NULL, /* init */
        NULL  /* finish */
        };
@@ -126,11 +128,12 @@ static int dl_load(DSO *dso)
                DSOerr(DSO_F_DL_LOAD,DSO_R_NO_FILENAME);
                goto err;
                }
-       ptr = shl_load(filename, BIND_IMMEDIATE|DYNAMIC_PATH, NULL);
+       ptr = shl_load(filename, BIND_IMMEDIATE|DYNAMIC_PATH, 0L);
        if(ptr == NULL)
                {
                DSOerr(DSO_F_DL_LOAD,DSO_R_LOAD_FAILED);
-               ERR_add_error_data(3, "filename(", filename, ")");
+               ERR_add_error_data(4, "filename(", filename, "): ",
+                       strerror(errno));
                goto err;
                }
        if(!sk_push(dso->meth_data, (char *)ptr))
@@ -199,7 +202,8 @@ static void *dl_bind_var(DSO *dso, const char *symname)
        if (shl_findsym(&ptr, symname, TYPE_UNDEFINED, &sym) < 0)
                {
                DSOerr(DSO_F_DL_BIND_VAR,DSO_R_SYM_FAILURE);
-               ERR_add_error_data(3, "symname(", symname, ")");
+               ERR_add_error_data(4, "symname(", symname, "): ",
+                       strerror(errno));
                return(NULL);
                }
        return(sym);
@@ -229,12 +233,79 @@ static DSO_FUNC_TYPE dl_bind_func(DSO *dso, const char *symname)
        if (shl_findsym(&ptr, symname, TYPE_UNDEFINED, &sym) < 0)
                {
                DSOerr(DSO_F_DL_BIND_FUNC,DSO_R_SYM_FAILURE);
-               ERR_add_error_data(3, "symname(", symname, ")");
+               ERR_add_error_data(4, "symname(", symname, "): ",
+                       strerror(errno));
                return(NULL);
                }
        return((DSO_FUNC_TYPE)sym);
        }
 
+static char *dl_merger(DSO *dso, const char *filespec1, const char *filespec2)
+       {
+       char *merged;
+
+       if(!filespec1 && !filespec2)
+               {
+               DSOerr(DSO_F_DL_MERGER,
+                               ERR_R_PASSED_NULL_PARAMETER);
+               return(NULL);
+               }
+       /* If the first file specification is a rooted path, it rules.
+          same goes if the second file specification is missing. */
+       if (!filespec2 || filespec1[0] == '/')
+               {
+               merged = OPENSSL_malloc(strlen(filespec1) + 1);
+               if(!merged)
+                       {
+                       DSOerr(DSO_F_DL_MERGER,
+                               ERR_R_MALLOC_FAILURE);
+                       return(NULL);
+                       }
+               strcpy(merged, filespec1);
+               }
+       /* If the first file specification is missing, the second one rules. */
+       else if (!filespec1)
+               {
+               merged = OPENSSL_malloc(strlen(filespec2) + 1);
+               if(!merged)
+                       {
+                       DSOerr(DSO_F_DL_MERGER,
+                               ERR_R_MALLOC_FAILURE);
+                       return(NULL);
+                       }
+               strcpy(merged, filespec2);
+               }
+       else
+               /* This part isn't as trivial as it looks.  It assumes that
+                  the second file specification really is a directory, and
+                  makes no checks whatsoever.  Therefore, the result becomes
+                  the concatenation of filespec2 followed by a slash followed
+                  by filespec1. */
+               {
+               int spec2len, len;
+
+               spec2len = (filespec2 ? strlen(filespec2) : 0);
+               len = spec2len + (filespec1 ? strlen(filespec1) : 0);
+
+               if(filespec2 && filespec2[spec2len - 1] == '/')
+                       {
+                       spec2len--;
+                       len--;
+                       }
+               merged = OPENSSL_malloc(len + 2);
+               if(!merged)
+                       {
+                       DSOerr(DSO_F_DL_MERGER,
+                               ERR_R_MALLOC_FAILURE);
+                       return(NULL);
+                       }
+               strcpy(merged, filespec2);
+               merged[spec2len] = '/';
+               strcpy(&merged[spec2len + 1], filespec1);
+               }
+       return(merged);
+       }
+
 /* This function is identical to the one in dso_dlfcn.c, but as it is highly
  * unlikely that both the "dl" *and* "dlfcn" variants are being compiled at the
  * same time, there's no great duplicating the code. Figuring out an elegant