/*
* bpipe.c bi-directional pipe
- *
+ *
* Kern Sibbald, November MMII
*
* Version $Id$
#include "bacula.h"
#include "jcr.h"
-int execvp_errors[] = {EACCES, ENOEXEC, EFAULT, EINTR, E2BIG,
- ENAMETOOLONG, ENOMEM, ETXTBSY, ENOENT};
+int execvp_errors[] = {EACCES, ENOEXEC, EFAULT, EINTR, E2BIG,
+ ENAMETOOLONG, ENOMEM, ETXTBSY, ENOENT};
int num_execvp_errors = (int)(sizeof(execvp_errors)/sizeof(int));
* Run an external program. Optionally wait a specified number
* of seconds. Program killed if wait exceeded. We open
* a bi-directional pipe so that the user can read from and
- * write to the program.
+ * write to the program.
*/
BPIPE *open_bpipe(char *prog, int wait, const char *mode)
{
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;
}
return stat;
}
-/*
- * Close both pipes and free resources
+/*
+ * Close both pipes and free resources
*
* Returns: 0 on success
- * berrno on failure
+ * berrno on failure
*/
-int close_bpipe(BPIPE *bpipe)
+int close_bpipe(BPIPE *bpipe)
{
int chldstatus = 0;
- int stat = 0;
+ int stat = 0;
int wait_option;
int remaining_wait;
pid_t wpid = 0;
}
if (bpipe->wait == 0) {
- wait_option = 0; /* wait indefinitely */
+ wait_option = 0; /* wait indefinitely */
} else {
wait_option = WNOHANG; /* don't hang */
}
/* wait for worker child to exit */
for ( ;; ) {
- Dmsg2(200, "Wait for %d opt=%d\n", bpipe->worker_pid, wait_option);
+ 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;
- Dmsg3(200, "Got break wpid=%d status=%d ERR=%s\n", wpid, chldstatus,
+ stat = errno;
+ Dmsg3(800, "Got break wpid=%d status=%d ERR=%s\n", wpid, chldstatus,
wpid==-1?strerror(errno):"none");
- break;
+ break;
}
- Dmsg3(200, "Got wpid=%d status=%d ERR=%s\n", wpid, chldstatus,
+ 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) {
- Dmsg1(100, "Non-zero status %s returned from child.\n", stat);
- stat |= b_errno_exit; /* exit status returned */
- }
- Dmsg1(200, "child status=%d\n", stat & ~b_errno_exit);
+ stat = WEXITSTATUS(chldstatus);
+ if (stat != 0) {
+ Dmsg1(800, "Non-zero status %d returned from child.\n", stat);
+ 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);
- Dmsg1(200, "Child died from signale %d\n", stat);
- stat |= b_errno_signal; /* exit signal returned */
+ stat = WTERMSIG(chldstatus);
+ Dmsg1(800, "Child died from signale %d\n", stat);
+ stat |= b_errno_signal; /* exit signal returned */
}
- }
+ }
if (bpipe->timer_id) {
stop_child_timer(bpipe->timer_id);
}
free(bpipe);
- Dmsg1(200, "returning stat = %d\n", stat);
+ Dmsg1(800, "returning stat = %d\n", stat);
return stat;
}
* of seconds. Program killed if wait exceeded. Optionally
* return the output from the program (normally a single line).
*
- * Contrary to my normal calling conventions, this 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)
{
int stat1, stat2;
char *mode;
+ if (results) {
+ results[0] = 0;
+ }
mode = (char *)(results != NULL ? "r" : "");
bpipe = open_bpipe(prog, wait, mode);
if (!bpipe) {
return ENOENT;
}
if (results) {
- results[0] = 0;
- fgets(results, sizeof_pool_memory(results), bpipe->rfd);
+ fgets(results, sizeof_pool_memory(results), bpipe->rfd);
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));
return stat1;
}
+/*
+ * 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).
+ * 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
+ *
+ */
+int run_program_full_output(char *prog, int wait, POOLMEM *results)
+{
+ BPIPE *bpipe;
+ int stat1, stat2;
+ char *mode;
+ POOLMEM* tmp;
+
+ if (results == NULL) {
+ return run_program(prog, wait, NULL);
+ }
+
+ tmp = get_pool_memory(PM_MESSAGE);
+
+ mode = (char *)"r";
+ bpipe = open_bpipe(prog, wait, mode);
+ if (!bpipe) {
+ return ENOENT;
+ }
+
+ results[0] = 0;
+
+ while (1) {
+ tmp[0] = 0;
+ fgets(tmp, sizeof_pool_memory(tmp), bpipe->rfd);
+ Dmsg1(800, "Run program fgets=%s", tmp);
+ /* ***FIXME****
+ * we need to pass POOL_MEM &results as arg to ensure
+ * that change in address of results is passed back
+ */
+ // pm_strcat(results, tmp);
+ bstrncat(results, tmp, sizeof_pool_memory(results));
+ if (feof(bpipe->rfd)) {
+ stat1 = 0;
+ Dmsg1(900, "Run program fgets stat=%d\n", stat1);
+ break;
+ } else {
+ stat1 = ferror(bpipe->rfd);
+ }
+ if (stat1 < 0) {
+ berrno be;
+ Dmsg2(200, "Run program fgets stat=%d ERR=%s\n", stat1, be.strerror());
+ break;
+ } else if (stat1 != 0) {
+ Dmsg1(900, "Run program fgets stat=%d\n", stat1);
+ }
+ }
+
+ stat2 = close_bpipe(bpipe);
+ stat1 = stat2 != 0 ? stat2 : stat1;
+
+ Dmsg1(900, "Run program returning %d\n", stat);
+ free_pool_memory(tmp);
+ return stat1;
+}
/*
* Build argc and argv from a string
*/
static void build_argc_argv(char *cmd, int *bargc, char *bargv[], int max_argv)
{
- int i;
+ int i;
char *p, *q, quote;
int argc = 0;
}
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;
projects / bacula / bacula / blobdiff