Skip to content
This repository
Browse code

make the 'mongrel2' string into a variable, so other programs like

procer can set it to a different string (wrong name showed
up on commandline error and in the log file).
  • Loading branch information...
commit 48db19cd5e747c238111e67bbc039e7e48336439 1 parent b1be2dd
Anthon van der Neut authored

Showing 3 changed files with 4 additions and 2 deletions. Show diff stats Hide diff stats

  1. +1 1  src/mongrel2.c
  2. +1 1  src/unixy.c
  3. +2 0  src/unixy.h
2  src/mongrel2.c
@@ -373,7 +373,7 @@ void taskmain(int argc, char **argv)
373 373 dbg_set_log(stderr);
374 374 int rc = 0;
375 375
376   - check(argc == 3 || argc == 4, "usage: mongrel2 config.sqlite server_uuid [config_module.so]");
  376 + check(argc == 3 || argc == 4, "usage: %s config.sqlite server_uuid [config_module.so]", m2program);
377 377
378 378 if(argc == 4) {
379 379 log_info("Using configuration module %s to load configs.", argv[3]);
2  src/unixy.c
@@ -42,7 +42,7 @@
42 42 #include <limits.h>
43 43 #include <stdlib.h>
44 44
45   -
  45 +char *m2program = "mongrel2";
46 46
47 47 int Unixy_chroot(bstring path)
48 48 {
2  src/unixy.h
@@ -38,6 +38,8 @@
38 38 #include <bstring.h>
39 39 #include <unistd.h>
40 40
  41 +char *m2program;
  42 +
41 43 int Unixy_chroot(bstring path);
42 44
43 45 int Unixy_drop_priv(bstring path);

0 comments on commit 48db19c

Please sign in to comment.
Something went wrong with that request. Please try again.