sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tor_runner.c: Add a circumlocution and a caveat.

This commit is contained in:
Nick Mathewson 2017-11-01 13:21:11 -04:00
parent 8c49194505
commit 221f5238ae
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/tor_runner.c
View File

@ -19,6 +19,10 @@
* practice. * practice.
*/ */
/* NOTE: This module is supposed to work without the standard Tor utility
* functions. Don't add more dependencies!
*/
#include "tor_api.h" #include "tor_api.h"
#include "tor_api_internal.h" #include "tor_api_internal.h"
@ -73,12 +77,16 @@ tor_run_main(const tor_main_configuration_t *cfg)
return -999988; return -999988;
} }
/* circumlocution to avoid getting warned about calling calloc instead of
* tor_calloc. */
#define real_calloc calloc
static void static void
child(const tor_main_configuration_t *cfg) child(const tor_main_configuration_t *cfg)
{ {
/* XXXX Close unused file descriptors. */ /* XXXX Close unused file descriptors. */
char **args = calloc(cfg->argc+1, sizeof(char *)); char **args = real_calloc(cfg->argc+1, sizeof(char *));
memcpy(args, cfg->argv, cfg->argc * sizeof(char *)); memcpy(args, cfg->argv, cfg->argc * sizeof(char *));
args[cfg->argc] = NULL; args[cfg->argc] = NULL;