swaygrab no longer exits

[helaan]

When running the git version of Sway, swaygrab no longer works: it just waits there, doing nothing. I suspect fab5720 is to blame as it is the only commit since 0.14.0, but I have not formally bisected this.

[helaan]

I've tried to fix it myself, but it doesn't quite work yet: convert now exits with the following:

convert: unable to open image `8': No such file or directory @ error/blob.c/OpenBlob/2701.
convert: no decode delegate for this image format `' @ error/constitute.c/ReadImage/504.
convert: unexpected end-of-file `-': No such file or directory @ error/rgb.c/ReadRGBImage/239.

Here is my non-functional patch:

diff --git a/swaygrab/main.c b/swaygrab/main.c
index 6e85189..c5f4922 100644
--- a/swaygrab/main.c
+++ b/swaygrab/main.c
@@ -58,13 +58,15 @@ void grab_and_apply_magick(const char *file, const char *payload,
 	if ((child = fork()) < 0) {
 		sway_log(L_ERROR, "Swaygrab failed to fork.");
 		exit(EXIT_FAILURE);
-	} else if (child == 0) {
+	} else if (child != 0) {
+		close(fd[0]);
+		write(fd[1], pixels, len);
 		close(fd[1]);
-		write(fd[0], pixels, len);
 		free(pixels - 9);
 		waitpid(child, NULL, 0);
 	} else {
-		close(fd[0]);
+		close(fd[1]);
+		dup2(fd[0], 0);
 		execlp("convert", "-depth", "8", "-size", size, "rgba:-", "-flip", file, NULL);
 		sway_log(L_ERROR, "Swaygrab could not run convert.");
 		exit(EXIT_FAILURE);
-- 
2.13.5

[ddevault]

Can you test #1351 please?

[helaan]

#1351 works, swaygrab seems to work fine now.

[ddevault]

Cheers