Win32 fix -- remove debug O_NONBLOCK code

[bacula/bacula] / bacula / src / lib / bpipe.c

diff --git a/bacula/src/lib/bpipe.c b/bacula/src/lib/bpipe.c
index f2e4dd77fe7ed90d9159d7094261c955977dbdfc..03a1ee1a7f0e766b8dfb5f053d1f7f1ab0205605 100644 (file)
--- a/bacula/src/lib/bpipe.c
+++ b/bacula/src/lib/bpipe.c
@@ -278,8 +278,8 @@ int run_program(char *prog, int wait, POOLMEM *results)
              * following lines run_program would not detect if the program was killed
              * by the watchdog. */
             if (bpipe->timer_id->killed) {
-               stat1 = -EPIPE;
-               pm_strcat(results, "Program killed by Bacula watchdog (timeout)\n");
+               stat1 = ETIME;
+               pm_strcat(results, _("Program killed by Bacula watchdog (timeout)\n"));
             }
          }
       }
@@ -354,8 +354,8 @@ int run_program_full_output(char *prog, int wait, POOLMEM *results)
          if (bpipe->timer_id) {
             Dmsg1(100, "Run program fgets killed=%d\n", bpipe->timer_id->killed);
             if (bpipe->timer_id->killed) {
-               pm_strcat(tmp, "Program killed by Bacula watchdog (timeout)\n");
-               stat1 = -EPIPE;
+               pm_strcat(tmp, _("Program killed by Bacula watchdog (timeout)\n"));
+               stat1 = ETIME;
                break;
             }
          }