diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-28 10:12:47 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-28 10:12:47 -0700 |
| commit | 8960ab02736d7e13a3e8910da4dea7cb03629fbb (patch) | |
| tree | 0bccd86e83c78f1c3a36070dd4fe74f05e5a2c1d /src | |
| parent | 2e676eab9d35e8faf0df8676fc832c3178ff3feb (diff) | |
| parent | 0c938c8f6e3da7ab69ad018d8b3f6604b4506479 (diff) | |
| download | vyatta-cfg-8960ab02736d7e13a3e8910da4dea7cb03629fbb.tar.gz vyatta-cfg-8960ab02736d7e13a3e8910da4dea7cb03629fbb.zip | |
Merge branch 'larkspur' of suva.vyatta.com:/git/vyatta-cfg into larkspur
Diffstat (limited to 'src')
| -rw-r--r-- | src/cli_new.c | 6 | ||||
| -rw-r--r-- | src/commit2.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/cli_new.c b/src/cli_new.c index 19aae1c..b0535d8 100644 --- a/src/cli_new.c +++ b/src/cli_new.c @@ -117,8 +117,6 @@ void bye(const char *msg, ...) fprintf(out_stream, "%s failed\n", (cli_operation_name) ? cli_operation_name : "Operation"); - if (is_silent_msg()) - exit(-1); va_start(ap, msg); if (is_echo()) printf("echo \""); @@ -2447,8 +2445,9 @@ system_out(const char *cmd, const char **outbuf) close( cp[0]); int ret = system(cmd); + close( cp[1]); - exit(ret); + exit(WEXITSTATUS(ret)); } else { //parent @@ -2463,6 +2462,7 @@ system_out(const char *cmd, const char **outbuf) int status; wait(&status); close(cp[0]); + return WEXITSTATUS(status); } } diff --git a/src/commit2.c b/src/commit2.c index e3cc3df..05b3d9d 100644 --- a/src/commit2.c +++ b/src/commit2.c @@ -368,6 +368,7 @@ main(int argc, char** argv) setenv(ENV_COMMIT_STATUS,"FAILURE",1); } struct dirent *dirp = NULL; + restore_output(); while ((dirp = readdir(dp)) != NULL) { if (strcmp(dirp->d_name, ".") != 0 && strcmp(dirp->d_name, "..") != 0) { |