nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

r11706@Kushana: nickm | 2006-12-24 01:50:52 -0500

Browse Source 
Fix 2 bugs in last patch.  (VS has weird ideas about const, and I have weird ideas about block structure.)


svn:r9186
This commit is contained in:
Nick Mathewson 2006-12-24 06:50:57 +00:00
parent bae366eff0
commit a71a5d4bf2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/or/main.c
View File

@ -2048,15 +2048,16 @@ nt_service_command_line(void)
for (i = 1; i < backup_argc; ++i) { for (i = 1; i < backup_argc; ++i) {
if (!strcmp(backup_argv[i], "--options") || if (!strcmp(backup_argv[i], "--options") ||
!strcmp(backup_argv[i], "-options")) { !strcmp(backup_argv[i], "-options")) {
while (++i < backup_argc) while (++i < backup_argc) {
if (!strcmp(backup_argv[i], "-f")) if (!strcmp(backup_argv[i], "-f"))
use_default_torrc = 0; use_default_torrc = 0;
smartlist_add(sl, backup_argv[i]); smartlist_add(sl, backup_argv[i]);
} }
} }
}
if (use_default_torrc) { if (use_default_torrc) {
smartlist_add(sl, "-f"); smartlist_add(sl, "-f");
smartlist_add(sl, torrc); smartlist_add(sl, (char*)torrc);
} }
tor_assert(smartlist_len(sl)); tor_assert(smartlist_len(sl));
options = smartlist_join_strings(sl,"\" \"",0,NULL); options = smartlist_join_strings(sl,"\" \"",0,NULL);