Browse Source

Support null username in path creation

etomic
jl777 8 years ago
parent
commit
dddccd26fd
  1. 2
      basilisk/basilisk_MSG.c
  2. 4
      iguana/iguana_chains.c

2
basilisk/basilisk_MSG.c

@ -98,7 +98,7 @@ char *basilisk_iterate_MSG(struct supernet_info *myinfo,uint32_t channel,uint32_
// char str[65],str2[65]; printf("MSGiterate (%s) -> (%s)\n",bits256_str(str,srchash),bits256_str(str2,desthash)); // char str[65],str2[65]; printf("MSGiterate (%s) -> (%s)\n",bits256_str(str,srchash),bits256_str(str2,desthash));
array = cJSON_CreateArray(); array = cJSON_CreateArray();
portable_mutex_lock(&myinfo->messagemutex); portable_mutex_lock(&myinfo->messagemutex);
printf("iterate_MSG width.%d channel.%d msgid.%d src.%llx -> %llx\n",origwidth,channel,msgid,(long long)srchash.txid,(long long)desthash.txid); //printf("iterate_MSG width.%d channel.%d msgid.%d src.%llx -> %llx\n",origwidth,channel,msgid,(long long)srchash.txid,(long long)desthash.txid);
for (i=0; i<width; i++) for (i=0; i<width; i++)
{ {
keylen = basilisk_messagekey(key,channel,msgid,srchash,desthash); keylen = basilisk_messagekey(key,channel,msgid,srchash,desthash);

4
iguana/iguana_chains.c

@ -232,7 +232,9 @@ void set_coinconfname(char *fname,char *coinstr,char *userhome,char *coindir,cha
sprintf(confname,"%s.conf",buf); sprintf(confname,"%s.conf",buf);
} }
printf("userhome.(%s) coindir.(%s) confname.(%s)\n",userhome,coindir,confname); printf("userhome.(%s) coindir.(%s) confname.(%s)\n",userhome,coindir,confname);
sprintf(fname,"%s/%s/%s",userhome,coindir,confname); if ( userhome != 0 && userhome[0] != 0 )
sprintf(fname,"%s/%s/%s",userhome,coindir,confname);
else sprintf(fname,"%s/%s",coindir,confname);
} }
uint16_t extract_userpass(char *serverport,char *userpass,char *coinstr,char *userhome,char *coindir,char *confname) uint16_t extract_userpass(char *serverport,char *userpass,char *coinstr,char *userhome,char *coindir,char *confname)

Loading…
Cancel
Save