diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-12-24 06:50:57 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-12-24 06:50:57 +0000 |
| commit | a71a5d4bf219fbe1765e5cc30f1ac98818ff4a9d (patch) | |
| tree | e0a913015b428b7dd743c17aa90716f81a06b0dd /src | |
| parent | bae366eff015dffc2b86eeb89cb7d23c81918eaf (diff) | |
| download | tor-a71a5d4bf219fbe1765e5cc30f1ac98818ff4a9d.tar.gz tor-a71a5d4bf219fbe1765e5cc30f1ac98818ff4a9d.zip | |
r11706@Kushana: nickm | 2006-12-24 01:50:52 -0500
Fix 2 bugs in last patch. (VS has weird ideas about const, and I have weird ideas about block structure.)
svn:r9186
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c index c67dcd7538..588ed97116 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2048,15 +2048,16 @@ nt_service_command_line(void) for (i = 1; i < backup_argc; ++i) { if (!strcmp(backup_argv[i], "--options") || !strcmp(backup_argv[i], "-options")) { - while (++i < backup_argc) + while (++i < backup_argc) { if (!strcmp(backup_argv[i], "-f")) use_default_torrc = 0; smartlist_add(sl, backup_argv[i]); + } } } if (use_default_torrc) { smartlist_add(sl, "-f"); - smartlist_add(sl, torrc); + smartlist_add(sl, (char*)torrc); } tor_assert(smartlist_len(sl)); options = smartlist_join_strings(sl,"\" \"",0,NULL); |