Attachment 1639725 Details for Bug 1770304 – 0001-ext2-Build-symbolic-links-correctly-RHBZ-1770304.patch

[patch] 0001-ext2-Build-symbolic-links-correctly-RHBZ-1770304.patch

0001-ext2-Build-symbolic-links-correctly-RHBZ-1770304.patch (text/plain), 1.39 KB, created by Richard W.M. Jones on 2019-11-26 09:02:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Richard W.M. Jones

Created: 2019-11-26 09:02:29 UTC

Size: 1.39 KB

patch

obsolete

>From 5da8e801165bae22e54dca707c6ebd8a16ec91ed Mon Sep 17 00:00:00 2001
>From: "Richard W.M. Jones" <rjones@redhat.com>
>Date: Tue, 26 Nov 2019 09:01:21 +0000
>Subject: [PATCH] ext2: Build symbolic links correctly (RHBZ#1770304).
>
>---
> src/ext2fs-c.c | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
>diff --git a/src/ext2fs-c.c b/src/ext2fs-c.c
>index e8ab972..41bb346 100644
>--- a/src/ext2fs-c.c
>+++ b/src/ext2fs-c.c
>@@ -782,12 +782,8 @@ ext2_copy_file (struct ext2_data *data, const char *src, const char *dest)
>   }
>   /* Create a symlink. */
>   else if (S_ISLNK (statbuf.st_mode)) {
>-    ext2_ino_t ino;
>-    ext2_empty_inode (data->fs, dir_ino, dirname, basename,
>-                      statbuf.st_mode, statbuf.st_uid, statbuf.st_gid,
>-                      statbuf.st_ctime, statbuf.st_atime, statbuf.st_mtime,
>-                      0, 0, EXT2_FT_SYMLINK, &ino);
>-
>+    const char *name = strrchr (dest, '/');
>+    if (name) name++; else name = dest;
>     char *buf = malloc (statbuf.st_size+1);
>     if (buf == NULL)
>       caml_raise_out_of_memory ();
>@@ -797,7 +793,7 @@ ext2_copy_file (struct ext2_data *data, const char *src, const char *dest)
>     if (r > statbuf.st_size)
>       r = statbuf.st_size;
>     buf[r] = '\0';
>-    ext2fs_symlink (data->fs, dir_ino, ino, dest, buf);
>+    ext2fs_symlink (data->fs, dir_ino, 0, name, buf);
>     free (buf);
>   }
>   /* Create directory. */
>-- 
>2.23.0
>

Actions: View | Diff

Attachments on bug 1770304: 1639725