Re: [PATCH v3 0/1] mke2fs: the -d option can now handle tarball input

[Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>]

[-- Attachment #1: Type: text/plain, Size: 1450 bytes --]

Quoting Johannes Schauer Marin Rodrigues (2023-08-15 19:57:16)
> > Rather than having an inline #ifdef here, this could be structured like the
> > following in create_file_libarchive.c:
> 
> I now see that you already tried to tell me how you'd like to see this in an
> earlier mail but I didn't understand what you wanted to tell me. Thank you for
> spelling it out for me. I hope my changes now look as you expected. I agree
> that it looks much better now.

whoops, my refactoring accidentally killed the ability to build without
archive.h. Please imagine my latest patch with the following on top. The github
pull request contains the fixed version and the github actions succeed now.
Sorry for the noise!

diff --git a/misc/create_inode_libarchive.c b/misc/create_inode_libarchive.c
index c147828f..deed65e8 100644
--- a/misc/create_inode_libarchive.c
+++ b/misc/create_inode_libarchive.c
@@ -20,6 +20,8 @@
 #include "create_inode.h"
 #include "support/nls-enable.h"
 
+#ifdef HAVE_ARCHIVE_H
+
 /* 64KiB is the minimum blksize to best minimize system call overhead. */
 //#define COPY_FILE_BUFLEN 65536
 //#define COPY_FILE_BUFLEN 1048576
@@ -536,6 +538,7 @@ static errcode_t handle_entry(ext2_filsys fs, ext2_ino_t root_ino,
        }
        return 0;
 }
+#endif
 
 errcode_t __populate_fs_from_tar(ext2_filsys fs, ext2_ino_t root_ino,
                                 const char *source_tar, ext2_ino_t root,

[-- Attachment #2: signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEElFhU6KL81LF4wVq58sulx4+9g+EFAmTbyrgACgkQ8sulx4+9
g+HtZA/+Kq7s5K6wRdpgnYrJ/X9mWcCmHCxTkIbtzVj3B6bJK4q+ryxdjN83bb2R
BhIBSHm7eL+SEvNBE2QAI2vwfORl7jzwYGj6GNE1/LYLX7twBohpcXM2h9ZweKgp
40B1i3InKk1h3+wo3UwqGboycZVsYYqgFfQ5MXjCZpuwvF6zgU1LlbEd38AXCpN/
MlHBDvix+JymvC6lB7/gwwd9ACjWrVtEbfuAl10R0BCAYj7+R1DQajiYwjLCUMTh
YEO+eS9/+/XNLkDwYBR1UdDPDqp1Gwu5DsWHfL2MnJkHZ7q3jsW0CEoqDqhbZ/D7
1KJuj7A0660nrVEbyI0KtZaf6B970+yNtN6qwdaGjFODduWJreV4MS/MMQR4YTb1
KcT30/2eQxHKzQsbVwt/dwtqCW4i+k7IsCmfMKDt99b0iZ2zY+WJZ8fn5565DhUk
wda3oJ4xvsBzQnVdTyeyN5MJLldHeQGu9X4RzevMblhASpgRII/xWtMR4/JeXZwG
LYbuMGKRrQoK78XrKg4N+hf6bAwH44S8ZL3T9LpECAeucH4W2X363FS1MSnia8f/
VEUQrHhs6t03DwWXbPnCubR4d789AR0KB3LRyJtIVmbBd/spHd+LwzeVYFE1ciIu
NT2US+F6uS6H9PuTMmFoa7C8fXEZc4fs4P9VD6FqFWSjPMxNoBA=
=gVZm
-----END PGP SIGNATURE-----