--fbuilder cleanup

src/fbuilder/build_bin.c

@@ -27,7 +27,7 @@ static void process_bin(const char *fname) {
  // process trace file
  FILE *fp = fopen(fname, "r");
  if (!fp) {
- fprintf(stderr, "Error: cannot open %s\n", fname);
+ fprintf(stderr, "Error fbuilder: cannot open %s\n", fname);
  exit(1);
  }
 

src/fbuilder/build_fs.c

@@ -31,7 +31,7 @@ static void process_file(const char *fname, const char *dir, void (*callback)(ch
  // process trace file
  FILE *fp = fopen(fname, "r");
  if (!fp) {
- fprintf(stderr, "Error: cannot open %s\n", fname);
+ fprintf(stderr, "Error fbuilder: cannot open %s\n", fname);
  exit(1);
  }
 

src/fbuilder/build_home.c

@@ -31,7 +31,7 @@ void process_home(const char *fname, char *home, int home_len) {
  // process trace file
  FILE *fp = fopen(fname, "r");
  if (!fp) {
- fprintf(stderr, "Error: cannot open %s\n", fname);
+ fprintf(stderr, "Error fbuilder: cannot open %s\n", fname);
  exit(1);
  }
 

src/fbuilder/build_profile.c

@@ -26,7 +26,7 @@
 void build_profile(int argc, char **argv, int index, FILE *fp) {
  // next index is the application name
  if (index >= argc) {
- fprintf(stderr, "Error: application name missing\n");
+ fprintf(stderr, "Error fbuilder: application name missing\n");
  exit(1);
  }
 
@@ -165,7 +165,7 @@ void build_profile(int argc, char **argv, int index, FILE *fp) {
  unlink(trace_output);
  }
  else {
- fprintf(stderr, "Error: cannot run the sandbox\n");
+ fprintf(stderr, "Error fbuilder: cannot run the sandbox\n");
  exit(1);
  }
 }

src/fbuilder/build_seccomp.c

@@ -27,7 +27,7 @@ void build_seccomp(const char *fname, FILE *fp) {
 
  FILE *fp2 = fopen(fname, "r");
  if (!fp2) {
- fprintf(stderr, "Error: cannot open %s\n", fname);
+ fprintf(stderr, "Error fbuilder: cannot open %s\n", fname);
  exit(1);
  }
 
@@ -54,7 +54,7 @@ void build_seccomp(const char *fname, FILE *fp) {
  }
  else if (line == 2) {
  if (*buf != '-') {
- fprintf(stderr, "Error: invalid strace output\n%s\n", buf);
+ fprintf(stderr, "Error fbuilder: invalid strace output\n%s\n", buf);
  exit(1);
  }
  }
@@ -96,7 +96,7 @@ static void process_protocol(const char *fname) {
  // process trace file
  FILE *fp = fopen(fname, "r");
  if (!fp) {
- fprintf(stderr, "Error: cannot open %s\n", fname);
+ fprintf(stderr, "Error fbuilder: cannot open %s\n", fname);
  exit(1);
  }
 

src/fbuilder/filedb.c

@@ -94,7 +94,7 @@ FileDB *filedb_load_whitelist(FileDB *head, const char *fname, const char *prefi
  errExit("asprintf");
  FILE *fp = fopen(f, "r");
  if (!fp) {
- fprintf(stderr, "Error: cannot open %s\n", f);
+ fprintf(stderr, "Error fbuilder: cannot open %s\n", f);
  free(f);
  exit(1);
  }

src/fbuilder/main.c

@@ -66,21 +66,21 @@ printf("\n");
 
  // don't run if the file exists
  if (access(argv[i] + 8, F_OK) == 0) {
- fprintf(stderr, "Error: the profile file already exists. Please use a different file name.\n");
+ fprintf(stderr, "Error fbuilder: the profile file already exists. Please use a different file name.\n");
  exit(1);
  }
 
  // check file access
  fp = fopen(argv[i] + 8, "w");
  if (!fp) {
- fprintf(stderr, "Error: cannot open profile file.\n");
+ fprintf(stderr, "Error fbuilder: cannot open profile file.\n");
  exit(1);
  }
  prof_file = argv[i] + 8;
  }
  else {
  if (*argv[i] == '-') {
- fprintf(stderr, "Error: invalid program\n");
+ fprintf(stderr, "Error fbuilder: invalid program\n");
  usage();
  exit(1);
  }
@@ -90,7 +90,7 @@ printf("\n");
  }
 
  if (prog_index == 0) {
- fprintf(stderr, "Error : program and arguments required\n");
+ fprintf(stderr, "Error fbuilder: program and arguments required\n");
  usage();
  if (prof_file) {
  fclose(fp);