DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

test

Browse Source
This commit is contained in:
jl777
2016-10-27 20:46:21 -03:00
parent f82834d805
commit 2845c3efb8
1 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/komodo_utils.h
View File

@@ -1115,45 +1115,42 @@ void komodo_configfile(char *symbol,uint16_t port)
printf("Created (%s)\n",fname); printf("Created (%s)\n",fname);
} else printf("Couldnt create (%s)\n",fname); } else printf("Couldnt create (%s)\n",fname);
} }
else else fclose(fp);
{ strcpy(fname,GetDataDir(false).string().c_str());
fclose(fp);
strcpy(fname,GetDataDir(false).string().c_str());
#ifdef WIN32 #ifdef WIN32
while ( fname[strlen(fname)-1] != '\\' ) while ( fname[strlen(fname)-1] != '\\' )
fname[strlen(fname)-1] = 0; fname[strlen(fname)-1] = 0;
strcat(fname,".komodo/komodo.conf"); strcat(fname,".komodo/komodo.conf");
#else #else
while ( fname[strlen(fname)-1] != '/' ) while ( fname[strlen(fname)-1] != '/' )
fname[strlen(fname)-1] = 0; fname[strlen(fname)-1] = 0;
strcat(fname,".komodo/komodo.conf"); strcat(fname,".komodo/komodo.conf");
#endif #endif
printf("KOMODO.(%s)\n",fname); printf("KOMODO.(%s)\n",fname);
if ( (fp= fopen(fname,"rb")) != 0 ) if ( (fp= fopen(fname,"rb")) != 0 )
{
rpcuser = rpcpassword = 0;
while ( fgets(line,sizeof(line),fp) != 0 )
{ {
rpcuser = rpcpassword = 0; if ( line[0] == '#' )
while ( fgets(line,sizeof(line),fp) != 0 ) continue;
{ //printf("line.(%s) %p %p\n",line,strstr(line,(char *)"rpcuser"),strstr(line,(char *)"rpcpassword"));
if ( line[0] == '#' ) if ( (str= strstr(line,(char *)"rpcuser")) != 0 )
continue; rpcuser = parse_conf_line(str,(char *)"rpcuser");
//printf("line.(%s) %p %p\n",line,strstr(line,(char *)"rpcuser"),strstr(line,(char *)"rpcpassword")); else if ( (str= strstr(line,(char *)"rpcpassword")) != 0 )
if ( (str= strstr(line,(char *)"rpcuser")) != 0 ) rpcpassword = parse_conf_line(str,(char *)"rpcpassword");
rpcuser = parse_conf_line(str,(char *)"rpcuser"); }
else if ( (str= strstr(line,(char *)"rpcpassword")) != 0 ) if ( rpcuser != 0 && rpcpassword != 0 )
rpcpassword = parse_conf_line(str,(char *)"rpcpassword"); {
} sprintf(KMDUSERPASS,"%s:%s",rpcuser,rpcpassword);
if ( rpcuser != 0 && rpcpassword != 0 ) }
{ //printf("rpcuser.(%s) rpcpassword.(%s) KMDUSERPASS.(%s) %u\n",rpcuser,rpcpassword,KMDUSERPASS,port);
sprintf(KMDUSERPASS,"%s:%s",rpcuser,rpcpassword); if ( rpcuser != 0 )
} free(rpcuser);
//printf("rpcuser.(%s) rpcpassword.(%s) KMDUSERPASS.(%s) %u\n",rpcuser,rpcpassword,KMDUSERPASS,port); if ( rpcpassword != 0 )
if ( rpcuser != 0 ) free(rpcpassword);
free(rpcuser); fclose(fp);
if ( rpcpassword != 0 ) } else printf("couldnt open.(%s)\n",fname);
free(rpcpassword);
fclose(fp);
} else printf("couldnt open.(%s)\n",fname);
}
} }
void lock_queue(queue_t *queue) void lock_queue(queue_t *queue)