*
* Version $Id$
*/
-
/*
- Copyright (C) 2002-2004 Kern Sibbald and John Walker
+ Copyright (C) 2002-2005 Kern Sibbald
This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
+ modify it under the terms of the GNU General Public License
+ version 2 as amended with additional clauses defined in the
+ file LICENSE in the main source directory.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public
- License along with this program; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ the file LICENSE for additional details.
*/
+
#include "bacula.h"
#include "jcr.h"
int execvp_errors[] = {EACCES, ENOEXEC, EFAULT, EINTR, E2BIG,
- ENAMETOOLONG, ENOMEM, ETXTBSY, ENOENT};
+ ENAMETOOLONG, ENOMEM, ETXTBSY, ENOENT};
int num_execvp_errors = (int)(sizeof(execvp_errors)/sizeof(int));
tprog = get_pool_memory(PM_FNAME);
pm_strcpy(tprog, prog);
build_argc_argv(tprog, &bargc, bargv, MAX_ARGV);
-#ifdef xxxxxx
+#ifdef xxxxxx
printf("argc=%d\n", bargc);
for (i=0; i<bargc; i++) {
printf("argc=%d argv=%s:\n", i, bargv[i]);
if (mode_read && pipe(readp) == -1) {
save_errno = errno;
if (mode_write) {
- close(writep[0]);
- close(writep[1]);
+ close(writep[0]);
+ close(writep[1]);
}
free(bpipe);
errno = save_errno;
}
/* Start worker process */
switch (bpipe->worker_pid = fork()) {
- case -1: /* error */
+ case -1: /* error */
save_errno = errno;
if (mode_write) {
- close(writep[0]);
- close(writep[1]);
+ close(writep[0]);
+ close(writep[1]);
}
if (mode_read) {
- close(readp[0]);
- close(readp[1]);
+ close(readp[0]);
+ close(readp[1]);
}
free(bpipe);
errno = save_errno;
return NULL;
- case 0: /* child */
+ case 0: /* child */
if (mode_write) {
- close(writep[1]);
- dup2(writep[0], 0); /* Dup our write to his stdin */
+ close(writep[1]);
+ dup2(writep[0], 0); /* Dup our write to his stdin */
}
if (mode_read) {
- close(readp[0]); /* Close unused child fds */
- dup2(readp[1], 1); /* dup our read to his stdout */
- dup2(readp[1], 2); /* and his stderr */
+ close(readp[0]); /* Close unused child fds */
+ dup2(readp[1], 1); /* dup our read to his stdout */
+ dup2(readp[1], 2); /* and his stderr */
}
- closelog(); /* close syslog if open */
- for (i=3; i<=32; i++) { /* close any open file descriptors */
- close(i);
+ closelog(); /* close syslog if open */
+ for (i=3; i<=32; i++) { /* close any open file descriptors */
+ close(i);
}
- execvp(bargv[0], bargv); /* call the program */
+ execvp(bargv[0], bargv); /* call the program */
/* Convert errno into an exit code for later analysis */
for (i=0; i< num_execvp_errors; i++) {
- if (execvp_errors[i] == errno) {
- exit(200 + i); /* exit code => errno */
- }
+ if (execvp_errors[i] == errno) {
+ exit(200 + i); /* exit code => errno */
+ }
}
- exit(255); /* unknown errno */
+ exit(255); /* unknown errno */
- default: /* parent */
+ default: /* parent */
break;
}
if (mode_read) {
- close(readp[1]); /* close unused parent fds */
+ close(readp[1]); /* close unused parent fds */
bpipe->rfd = fdopen(readp[0], "r"); /* open file descriptor */
}
if (mode_write) {
if (bpipe->wfd) {
fflush(bpipe->wfd);
if (fclose(bpipe->wfd) != 0) {
- stat = 0;
+ stat = 0;
}
bpipe->wfd = NULL;
}
* Close both pipes and free resources
*
* Returns: 0 on success
- * berrno on failure
+ * berrno on failure
*/
int close_bpipe(BPIPE *bpipe)
{
}
if (bpipe->wait == 0) {
- wait_option = 0; /* wait indefinitely */
+ wait_option = 0; /* wait indefinitely */
} else {
wait_option = WNOHANG; /* don't hang */
}
for ( ;; ) {
Dmsg2(800, "Wait for %d opt=%d\n", bpipe->worker_pid, wait_option);
do {
- wpid = waitpid(bpipe->worker_pid, &chldstatus, wait_option);
+ wpid = waitpid(bpipe->worker_pid, &chldstatus, wait_option);
} while (wpid == -1 && (errno == EINTR || errno == EAGAIN));
if (wpid == bpipe->worker_pid || wpid == -1) {
- stat = errno;
+ stat = errno;
Dmsg3(800, "Got break wpid=%d status=%d ERR=%s\n", wpid, chldstatus,
wpid==-1?strerror(errno):"none");
- break;
+ break;
}
Dmsg3(800, "Got wpid=%d status=%d ERR=%s\n", wpid, chldstatus,
wpid==-1?strerror(errno):"none");
if (remaining_wait > 0) {
- bmicrosleep(1, 0); /* wait one second */
- remaining_wait--;
+ bmicrosleep(1, 0); /* wait one second */
+ remaining_wait--;
} else {
- stat = ETIME; /* set error status */
- wpid = -1;
+ stat = ETIME; /* set error status */
+ wpid = -1;
break; /* don't wait any longer */
}
}
if (wpid > 0) {
if (WIFEXITED(chldstatus)) { /* process exit()ed */
- stat = WEXITSTATUS(chldstatus);
- if (stat != 0) {
+ stat = WEXITSTATUS(chldstatus);
+ if (stat != 0) {
Dmsg1(800, "Non-zero status %d returned from child.\n", stat);
- stat |= b_errno_exit; /* exit status returned */
- }
+ stat |= b_errno_exit; /* exit status returned */
+ }
Dmsg1(800, "child status=%d\n", stat & ~b_errno_exit);
} else if (WIFSIGNALED(chldstatus)) { /* process died */
- stat = WTERMSIG(chldstatus);
+ stat = WTERMSIG(chldstatus);
Dmsg1(800, "Child died from signale %d\n", stat);
- stat |= b_errno_signal; /* exit signal returned */
+ stat |= b_errno_signal; /* exit signal returned */
}
}
if (bpipe->timer_id) {
* of seconds. Program killed if wait exceeded. Optionally
* return the output from the program (normally a single line).
*
+ * If the watchdog kills the program, fgets returns, and ferror is set
+ * to 1 (=>SUCCESS), so we check if the watchdog killed the program.
+ *
* Contrary to my normal calling conventions, this program
*
* Returns: 0 on success
- * non-zero on error == berrno status
+ * non-zero on error == berrno status
*/
int run_program(char *prog, int wait, POOLMEM *results)
{
}
if (results) {
results[0] = 0;
- fgets(results, sizeof_pool_memory(results), bpipe->rfd);
+ int len = sizeof_pool_memory(results) - 1;
+ fgets(results, len, bpipe->rfd);
+ results[len] = 0;
if (feof(bpipe->rfd)) {
- stat1 = 0;
+ stat1 = 0;
} else {
- stat1 = ferror(bpipe->rfd);
+ stat1 = ferror(bpipe->rfd);
}
if (stat1 < 0) {
Dmsg2(100, "Run program fgets stat=%d ERR=%s\n", stat1, strerror(errno));
} else if (stat1 != 0) {
Dmsg1(100, "Run program fgets stat=%d\n", stat1);
+ if (bpipe->timer_id) {
+ Dmsg1(100, "Run program fgets killed=%d\n", bpipe->timer_id->killed);
+ /* NB: I'm not sure it is really useful for run_program. Without the
+ * following lines run_program would not detect if the program was killed
+ * by the watchdog. */
+ if (bpipe->timer_id->killed) {
+ stat1 = ETIME;
+ pm_strcat(results, _("Program killed by Bacula watchdog (timeout)\n"));
+ }
+ }
}
} else {
stat1 = 0;
* Run an external program. Optionally wait a specified number
* of seconds. Program killed if wait exceeded (it is done by the
* watchdog, as fgets is a blocking function).
+ *
+ * If the watchdog kills the program, fgets returns, and ferror is set
+ * to 1 (=>SUCCESS), so we check if the watchdog killed the program.
+ *
* Return the full output from the program (not only the first line).
*
* Contrary to my normal calling conventions, this program
*
* Returns: 0 on success
- * non-zero on error == berrno status
+ * non-zero on error == berrno status
*
*/
int run_program_full_output(char *prog, int wait, POOLMEM *results)
return run_program(prog, wait, NULL);
}
+ sm_check(__FILE__, __LINE__, false);
+
tmp = get_pool_memory(PM_MESSAGE);
mode = (char *)"r";
bpipe = open_bpipe(prog, wait, mode);
if (!bpipe) {
+ if (results) {
+ results[0] = 0;
+ }
return ENOENT;
}
- results[0] = 0;
-
+ sm_check(__FILE__, __LINE__, false);
+ tmp[0] = 0;
while (1) {
- fgets(tmp, sizeof_pool_memory(tmp), bpipe->rfd);
- Dmsg1(800, "Run program fgets=%s", tmp);
- pm_strcat(results, tmp);
+ char buf[1000];
+ fgets(buf, sizeof(buf), bpipe->rfd);
+ pm_strcat(tmp, buf);
if (feof(bpipe->rfd)) {
- stat1 = 0;
- Dmsg1(100, "Run program fgets stat=%d\n", stat1);
- break;
+ stat1 = 0;
+ Dmsg1(900, "Run program fgets stat=%d\n", stat1);
+ break;
} else {
- stat1 = ferror(bpipe->rfd);
+ stat1 = ferror(bpipe->rfd);
}
if (stat1 < 0) {
- Dmsg2(100, "Run program fgets stat=%d ERR=%s\n", stat1, strerror(errno));
- break;
+ berrno be;
+ Dmsg2(200, "Run program fgets stat=%d ERR=%s\n", stat1, be.strerror());
+ break;
} else if (stat1 != 0) {
- Dmsg1(100, "Run program fgets stat=%d\n", stat1);
+ Dmsg1(900, "Run program fgets stat=%d\n", stat1);
+ 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 = ETIME;
+ break;
+ }
+ }
}
}
-
+ int len = sizeof_pool_memory(results) - 1;
+ bstrncpy(results, tmp, len);
+ Dmsg3(1900, "resadr=0x%x reslen=%d res=%s\n", results, strlen(results), results);
stat2 = close_bpipe(bpipe);
stat1 = stat2 != 0 ? stat2 : stat1;
- Dmsg1(100, "Run program returning %d\n", stat);
+ Dmsg1(900, "Run program returning %d\n", stat);
free_pool_memory(tmp);
return stat1;
}
}
if (*p) {
while (*p && argc < MAX_ARGV) {
- q = p;
- if (quote) {
- while (*q && *q != quote)
- q++;
- quote = 0;
- } else {
+ q = p;
+ if (quote) {
+ while (*q && *q != quote)
+ q++;
+ quote = 0;
+ } else {
while (*q && *q != ' ')
- q++;
- }
- if (*q)
+ q++;
+ }
+ if (*q)
*(q++) = '\0';
- bargv[argc++] = p;
- p = q;
+ bargv[argc++] = p;
+ p = q;
while (*p && (*p == ' ' || *p == '\t'))
- p++;
+ p++;
if (*p == '\"' || *p == '\'') {
- quote = *p;
- p++;
- }
+ quote = *p;
+ p++;
+ }
}
}
*bargc = argc;