Commit - cross/slibtool - b8d3bb8ec89cc703b939bd7097f931ce4ddc2200

raw patch tree parent

3 files changed. 19 lines added. 8 lines removed.

    library: replace all uses of symlink() with symlinkat().

src/helper/slbt_archive_import.c

file modified

+5 -3

src/helper/slbt_archive_import.c CHANGED

@@ -4,6 +4,7 @@
 /*  Released under the Standard MIT License; see COPYING.SLIBTOOL. */
 /*******************************************************************/
+#include <fcntl.h>
 #include <stdio.h>
 #include <limits.h>
 #include <unistd.h>
@@ -21,6 +22,7 @@
 #include "slibtool_errinfo_impl.h"
 static char * slbt_mri_argument(
+    int    fdat,
     char *    arg,
     char *    buf)
 {
@@ -50,7 +52,7 @@ static char * slbt_mri_argument(
         if (!(tmpnam(buf)))
             return 0;
-        if (!(symlink(target,buf)))
+        if (!(symlinkat(target,fdat,buf)))
             lnk = buf;
     }
@@ -127,8 +129,8 @@ int slbt_archive_import(
     ectx->pid = pid;
-    dst = slbt_mri_argument(dstarchive,mridst);
-    src = slbt_mri_argument(srcarchive,mrisrc);
+    dst = slbt_mri_argument(fdcwd,dstarchive,mridst);
+    src = slbt_mri_argument(fdcwd,srcarchive,mrisrc);
     fmt = "OPEN %s\n"
           "ADDLIB %s\n"
           "SAVE\n"

src/internal/slibtool_symlink_impl.c

file modified

+6 -1

src/internal/slibtool_symlink_impl.c CHANGED

@@ -9,6 +9,7 @@
 #include <stdbool.h>
 #include <unistd.h>
+#include "slibtool_driver_impl.h"
 #include "slibtool_errinfo_impl.h"
 #include "slibtool_symlink_impl.h"
 #include "slibtool_readlink_impl.h"
@@ -24,6 +25,7 @@ int slbt_create_symlink(
     const char *            lnkname,
     bool                flawrapper)
 {
+    int        fdcwd;
     char **        oargv;
     const char *    slash;
     char *        ln[5];
@@ -99,8 +101,11 @@ int slbt_create_symlink(
     /* restore execution context */
     ectx->argv = oargv;
+    /* fdcwd */
+    fdcwd = slbt_driver_fdcwd(dctx);
+            +
     /* create symlink */
-    if (symlink(atarget,tmplnk))
+    if (symlinkat(atarget,fdcwd,tmplnk))
         return SLBT_SYSTEM_ERROR(dctx,tmplnk);
     return rename(tmplnk,lnkname)

src/logic/slbt_exec_link.c

file modified

+8 -4

src/logic/slbt_exec_link.c CHANGED

@@ -1357,8 +1357,8 @@ static int slbt_exec_link_create_archive(
         if (slbt_exec_link_remove_file(dctx,ectx,arlink))
             return SLBT_NESTED_ERROR(dctx);
-        if (symlink(arfile,arlink))
-            return SLBT_SYSTEM_ERROR(dctx,arlink);
+        if (slbt_create_symlink(dctx,ectx,arfile,arlink,0))
+            return SLBT_NESTED_ERROR(dctx);
     }
     return 0;
@@ -1535,8 +1535,12 @@ static int slbt_exec_link_create_library(
         if (slbt_exec_link_remove_file(dctx,ectx,ectx->rpathfilename))
             return SLBT_NESTED_ERROR(dctx);
-        if (symlink(dctx->cctx->host.ldrpath,ectx->rpathfilename))
-            return SLBT_SYSTEM_ERROR(dctx,ectx->rpathfilename);
+        if (slbt_create_symlink(
+                dctx,ectx,
+                dctx->cctx->host.ldrpath,
+                ectx->rpathfilename,
+                0))
+            return SLBT_NESTED_ERROR(dctx);
     }
     /* cwd */