]> git.ipfire.org Git - thirdparty/rspamd.git/commitdiff
Add workaround for old glib
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 18 Feb 2016 11:11:05 +0000 (11:11 +0000)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 18 Feb 2016 11:11:05 +0000 (11:11 +0000)
src/rspamadm/signtool.c

index 9b19e1b650c74d712fd24ad7d34b70a30c00dc72..998698622a1d717935694512523c8b2b4ab85781 100644 (file)
@@ -23,6 +23,9 @@
 #include "libutil/str_util.h"
 #include "libutil/util.h"
 #include "unix-std.h"
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
 
 static gboolean openssl = FALSE;
 static gboolean verify = FALSE;
@@ -188,12 +191,21 @@ rspamadm_edit_file (const gchar *fname)
                }
        }
 
+#if GLIB_MAJOR_VERSION >= 2 && GLIB_MINOR_VERSION >= 34
        if (!g_spawn_check_exit_status (retcode, &err)) {
                unlink (tmppath);
                rspamd_fprintf (stderr, "%s returned error code: %d - %e\n", editor,
                                retcode, err);
                exit (retcode);
        }
+#else
+       if (retcode != 0) {
+               unlink (tmppath);
+               rspamd_fprintf (stderr, "%s returned error code: %d\n", editor,
+                               retcode);
+               exit (retcode);
+       }
+#endif
 
        map = rspamd_file_xmap (tmppath, PROT_READ, &len);