35eab8
diff --git a/backend/beh.c b/backend/beh.c
35eab8
index 225fd27..5e9cee0 100644
35eab8
--- a/backend/beh.c
35eab8
+++ b/backend/beh.c
35eab8
@@ -22,6 +22,7 @@
35eab8
 #include "backend-private.h"
35eab8
 #include <cups/array.h>
35eab8
 #include <ctype.h>
35eab8
+#include <sys/wait.h>
35eab8
 
35eab8
 /*
35eab8
  * Local globals...
35eab8
@@ -213,10 +214,14 @@ call_backend(char *uri,                 /* I - URI of final destination */
35eab8
 	     char **argv,		/* I - Command-line arguments */
35eab8
 	     char *filename) {          /* I - File name of input data */
35eab8
   const char	*cups_serverbin;	/* Location of programs */
35eab8
+  char          *backend_argv[8];       // Arguments for called CUPS backend
35eab8
   char		scheme[1024],           /* Scheme from URI */
35eab8
                 *ptr,			/* Pointer into scheme */
35eab8
-		cmdline[65536];		/* Backend command line */
35eab8
-  int           retval;
35eab8
+		backend_path[2048];	// Backend path
35eab8
+  int           pid,
35eab8
+                wait_pid,
35eab8
+                wait_status,
35eab8
+                retval = 0;
35eab8
 
35eab8
  /*
35eab8
   * Build the backend command line...
35eab8
@@ -235,16 +240,19 @@ call_backend(char *uri,                 /* I - URI of final destination */
35eab8
     fprintf(stderr,
35eab8
 	    "ERROR: beh: Direct output into a file not supported.\n");
35eab8
     exit (CUPS_BACKEND_FAILED);
35eab8
-  } else
35eab8
-    snprintf(cmdline, sizeof(cmdline),
35eab8
-	     "%s/backend/%s '%s' '%s' '%s' '%s' '%s' %s",
35eab8
-	     cups_serverbin, scheme, argv[1], argv[2], argv[3],
35eab8
-	     /* Apply number of copies only if beh was called with a
35eab8
-		file name and not with the print data in stdin, as
35eab8
-	        backends should handle copies only if they are called
35eab8
-	        with a file name */
35eab8
-	     (argc == 6 ? "1" : argv[4]),
35eab8
-	     argv[5], filename);
35eab8
+  }
35eab8
+
35eab8
+  backend_argv[0] = uri;
35eab8
+  backend_argv[1] = argv[1];
35eab8
+  backend_argv[2] = argv[2];
35eab8
+  backend_argv[3] = argv[3];
35eab8
+  backend_argv[4] = (argc == 6 ? "1" : argv[4]);
35eab8
+  backend_argv[5] = argv[5];
35eab8
+  backend_argv[6] = filename;
35eab8
+  backend_argv[7] = NULL;
35eab8
+
35eab8
+  snprintf(backend_path, sizeof(backend_path),
35eab8
+	   "%s/backend/%s", cups_serverbin, scheme);
35eab8
 
35eab8
  /*
35eab8
   * Overwrite the device URI and run the actual backend...
35eab8
@@ -253,17 +261,41 @@ call_backend(char *uri,                 /* I - URI of final destination */
35eab8
   setenv("DEVICE_URI", uri, 1);
35eab8
 
35eab8
   fprintf(stderr,
35eab8
-	  "DEBUG: beh: Executing backend command line \"%s\"...\n",
35eab8
-	  cmdline);
35eab8
+	  "DEBUG: beh: Executing backend command line \"%s '%s' '%s' '%s' '%s' '%s'%s%s\"...\n",
35eab8
+	  backend_path, backend_argv[1], backend_argv[2], backend_argv[3],
35eab8
+	  backend_argv[4], backend_argv[5],
35eab8
+	  (backend_argv[6] && backend_argv[6][0] ? " " : ""),
35eab8
+	  (backend_argv[6] && backend_argv[6][0] ? backend_argv[6] : ""));
35eab8
   fprintf(stderr,
35eab8
 	  "DEBUG: beh: Using device URI: %s\n",
35eab8
 	  uri);
35eab8
 
35eab8
-  retval = system(cmdline) >> 8;
35eab8
+  if ((pid = fork()) == 0)
35eab8
+  {
35eab8
+    retval = execv(backend_path, backend_argv);
35eab8
+
35eab8
+    if (retval == -1)
35eab8
+      fprintf(stderr, "ERROR: Unable to execute backend: %s\n",
35eab8
+	      strerror(errno));
35eab8
+    exit (CUPS_BACKEND_FAILED);
35eab8
+  }
35eab8
+  else if (pid < 0)
35eab8
+  {
35eab8
+    fprintf(stderr, "ERROR: Unable to fork for backend\n");
35eab8
+    return (CUPS_BACKEND_FAILED);
35eab8
+  }
35eab8
+
35eab8
+  while ((wait_pid = wait(&wait_status)) < 0 && errno == EINTR);
35eab8
 
35eab8
-  if (retval == -1)
35eab8
-    fprintf(stderr, "ERROR: Unable to execute backend command line: %s\n",
35eab8
-	    strerror(errno));
35eab8
+  if (wait_pid >= 0 && wait_status)
35eab8
+  {
35eab8
+    if (WIFEXITED(wait_status))
35eab8
+      retval = WEXITSTATUS(wait_status);
35eab8
+    else if (WTERMSIG(wait_status) != SIGTERM)
35eab8
+      retval = WTERMSIG(wait_status);
35eab8
+    else
35eab8
+      retval = 0;
35eab8
+  }
35eab8
 
35eab8
   return (retval);
35eab8
 }