Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use specified bin dir, instead of FS_BIN_DIR.

  • Loading branch information...
commit 5decf1e0f1216dac79b79d21e4a77e8ca68e8aa3 1 parent a0f4281
@davechallis authored
Showing with 5 additions and 4 deletions.
  1. +3 −3 src/admin/admin_backend.c
  2. +2 −1  tests/admin/run.pl
View
6 src/admin/admin_backend.c
@@ -356,10 +356,10 @@ static int exec_fs_cmd(const char *cmdname, int n_args, char **args,
int *exit_val, unsigned char **output, int *err)
{
/* base command without arguments */
- char *cmdfmt = FS_BIN_DIR "/%s";
+ const char *bin_dir = fsa_get_bin_dir();
/* length of base command, excluding \0 */
- int base_cmdlen = strlen(cmdfmt) - 2 + strlen(cmdname);
+ int base_cmdlen = strlen(bin_dir) + 1 + strlen(cmdname);
int cmdlen = base_cmdlen;
/* work out total length including arguments */
@@ -373,7 +373,7 @@ static int exec_fs_cmd(const char *cmdname, int n_args, char **args,
int n_bytes;
/* write path and command */
- sprintf(p, cmdfmt, cmdname);
+ sprintf(p, "%s/%s", bin_dir, cmdname);
p += base_cmdlen;
/* write arguments */
View
3  tests/admin/run.pl
@@ -66,7 +66,8 @@
}
else {
my @cmd = ("../../src/admin/4s-boss", "-D", "-p", "13580",
- '--config-file=admin_tests.conf');
+ '--config-file=admin_tests.conf',
+ '--bin-dir=../../src/utilities');
if ($valgrind) {
print "Running 4s-boss under valgrind, output in "
. "valgrind.txt\n"
Please sign in to comment.
Something went wrong with that request. Please try again.