From c8e47f83dbd8657af31804dadc6f64022afa56f2 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 25 Apr 2016 15:21:54 -0500 Subject: [PATCH] test --- iguana/databases/cdb-0.75/auto-str.c | 3 +- iguana/databases/cdb-0.75/cdb_make.c | 63 ++++++++++++++++ iguana/databases/cdb-0.75/cdbdump | Bin 19148 -> 19204 bytes iguana/databases/cdb-0.75/cdbdump.c | 1 + iguana/databases/cdb-0.75/cdbget | Bin 19360 -> 19416 bytes iguana/databases/cdb-0.75/cdbget.c | 1 + iguana/databases/cdb-0.75/cdbmake | Bin 24172 -> 24300 bytes iguana/databases/cdb-0.75/cdbmake.c | 4 +- iguana/databases/cdb-0.75/cdbstats | Bin 20128 -> 20248 bytes iguana/databases/cdb-0.75/cdbstats.c | 2 + iguana/databases/cdb-0.75/cdbtest | Bin 20312 -> 20408 bytes iguana/databases/cdb-0.75/conf-ld | 2 +- iguana/databases/cdb-0.75/hier.c | 103 +++++++++++++++++++++++--- iguana/databases/cdb-0.75/install | Bin 19428 -> 19356 bytes iguana/databases/cdb-0.75/install.c | 94 ++--------------------- iguana/databases/cdb-0.75/instcheck | Bin 14420 -> 19492 bytes iguana/databases/cdb-0.75/instcheck.c | 1 + iguana/databases/cdb-0.75/load | 2 +- iguana/databases/cdb-0.75/testzero | Bin 19196 -> 19308 bytes iguana/databases/cdb-0.75/testzero.c | 3 +- iguana/iguana_bundles.c | 4 +- iguana/m_unix | 4 +- 22 files changed, 180 insertions(+), 107 deletions(-) diff --git a/iguana/databases/cdb-0.75/auto-str.c b/iguana/databases/cdb-0.75/auto-str.c index c6f185e92..f1063ed25 100644 --- a/iguana/databases/cdb-0.75/auto-str.c +++ b/iguana/databases/cdb-0.75/auto-str.c @@ -29,7 +29,8 @@ char **argv; puts(name); puts("[] = \"\\\n"); - while (ch = *value++) { + while ( (ch= *value++) != 0 ) + { puts("\\"); octal[3] = 0; octal[2] = '0' + (ch & 7); ch >>= 3; diff --git a/iguana/databases/cdb-0.75/cdb_make.c b/iguana/databases/cdb-0.75/cdb_make.c index 6d1bd0369..91a7e60b5 100644 --- a/iguana/databases/cdb-0.75/cdb_make.c +++ b/iguana/databases/cdb-0.75/cdb_make.c @@ -5,6 +5,8 @@ #include "error.h" #include "alloc.h" #include "cdb.h" +#include "str.h" +#include "open.h" #include "cdb_make.h" int cdb_make_start(struct cdb_make *c,int fd) @@ -151,3 +153,64 @@ int cdb_make_finish(struct cdb_make *c) if (seek_begin(c->fd) == -1) return -1; return buffer_putflush(&c->b,c->final,sizeof c->final); } + +#include "../../../includes/cJSON.h" +int32_t cdb_jsonmake(struct cdb_make c,cJSON *array,char *dest,char *tmpname) +{ + uint32_t klen,dlen,i,n,h; char *field,*value; int32_t fd; cJSON *item; + if ( (fd= open_trunc(tmpname)) == -1 ) + return(-1); + if ( cdb_make_start(&c,fd) == -1 ) + { + close(fd); + return(-2); + } + if ( (n= cJSON_GetArraySize(array)) > 0 ) + { + for (i=0; i 0) + { + value = jprint(item,0); + if ( (dlen= str_len(value)) > 0 ) + { + if ( klen > 429496720 || dlen > 429496720 || cdb_make_addbegin(&c,klen,dlen) == -1 ) + { + close(fd); + free(value); + return(-3); + } + h = CDB_HASHSTART; + for (i=0; i6y%6u|NGo{57k^|dZm#Z*nyMM%JEA<;f30p9CWCPgGgNh4mx^n&i{erl9RmOz2~0$?#*pK^cEj^&7TQB zF;L%5T+W0dGFTM(>x&HNb4kOs9mItG=Ib|-DX&| z?IhD@qoG|Q$Fm}yX7AK+E@6G_c>xcpcYA?;TmE6^L6P93`Ixg#dQ5)KSqpbH(bW%~ zHGg`_ToQ?T6Ut1u7AKsxgjr`TSY*5skDs#fMQ5#?9W&p*P#=xC&^Kmkj}T*RFb^F`bZ z%vYWDggTtiZTt?;ObD3poP_LAdw~|7#v5wguzsv<_W5(4 jzxMgZe?H+#omgs# delta 1120 zcmZA0KWGzi6u|L!A#tc;PYY82V5=tLc!Sj_tp*j$q7(-U4ql`L16AmdLbj`*;usoQ z94cgR5D6G)2Ma8C_?>ix8i|F66v-?)_-^E!=tne+b2>h9S;wfyrJ*>JPEK6ibs zm&u-shCM%?ZlT)Lel!2*%A1aDB|YgcnE6&BRB{E!^V=Zeag_<=<6q7?3dd|gf62cjpV8Cm7T7XJ zGD4t3LC#qxwb`-&3tKjU7e}nYR8o&GI_n`84snruVGlcuo3Zu%&k&fWVF^!j= gF=>x1B(ZS`!@HHRTr1BmRLfyy?L=`qm3Bq{0OHYVJ^%m! diff --git a/iguana/databases/cdb-0.75/cdbdump.c b/iguana/databases/cdb-0.75/cdbdump.c index d51a8bf59..75a4e413c 100644 --- a/iguana/databases/cdb-0.75/cdbdump.c +++ b/iguana/databases/cdb-0.75/cdbdump.c @@ -1,3 +1,4 @@ +#include #include "uint32.h" #include "fmt.h" #include "buffer.h" diff --git a/iguana/databases/cdb-0.75/cdbget b/iguana/databases/cdb-0.75/cdbget index 219126c1ce764a2c7d4eead7337a882e41d248ef..8acd7e906e50ac50ba72efea5d1ff5f585aa8fc5 100755 GIT binary patch delta 1242 zcmaLXF=!J}7zgn08j_*b^uR(2X>A&sf>Uo$niy@bb}7X|pn~1*pcY!F5X7MldL6|@ zAxIX73=SC-sukLy&`=#L6q^~qs&gVvMC1a_3kY+7?YN5H$Azrp++k)S<+lhqFQOb5(VPpTi#{;>K9T^Le7r(2iR71~az-*)mN>V4W}{si^g z1&d?ap~()#jQTt6@Pf|h+MwqD&~8E<$Hki)u<1eC=lC>TpeKS(0|(^j7ClSXE@^=U z+8l7 zHyc{)VD;z{w$gfsea5(>8uLl|1AT@5Oy`X;XN4;=L;vKKF3@g!%d!7=*-+;*;CCiS z>jkVEo2Q%)=?3#JxQ9<^e^mRwq-_>_O}q3CjO)V(2kOgVcLUrE`CG_8LOu`Ky#4GG!(V@^vE8cKOhjQE?*nmTaikSo#aZm?ce80SJASCpaetz%${^a*dI`102t}(2b zMz2#fZx-uB)NT@;PZ6Eq-z|>#RbrGnZ_QQ1?)YY14eEbu>Gs;icSGaT{qnWJD1X%2 z@-l`BI~n|ah9i?EQruO0N&7fa&lX=m-mZ%E3Ut1W{M9I5k^CKP9%#k`>G2-G?uz&c zkrx)UmZjk-3WA*YC9Lw|S5badJcb?Q58y|Z{XxPZx7Dfoo~Co4|z zvh^J(_$2INfGpgCt;ndq1P5>ho}7~L8y*_m)6#GQR`6|Y-r_m7_#XTbehlx!;dop> zg){sV|F;8?;c;S$eL=HLyWO@5VWgX0QE ZjpH)MI>#0VUrxL@S(_h?o0guP{sZmEVYC1M diff --git a/iguana/databases/cdb-0.75/cdbget.c b/iguana/databases/cdb-0.75/cdbget.c index 771cad1fe..2823e8f98 100644 --- a/iguana/databases/cdb-0.75/cdbget.c +++ b/iguana/databases/cdb-0.75/cdbget.c @@ -1,3 +1,4 @@ +#include #include "exit.h" #include "scan.h" diff --git a/iguana/databases/cdb-0.75/cdbmake b/iguana/databases/cdb-0.75/cdbmake index 043f9b288c7571b422268b6014d309c7df438201..057beb0072ac59ba20977a47a13bd9fa2d9053a2 100755 GIT binary patch delta 1844 zcmb8wZAepL6bJCL^s1%Vv@D5atJLg$%Onk|C1vxiER|9UH$>>g=so&kcN9@FMuQQ4 zh#=}iFJHQ$^~FLhK?))BLkLAk5RDkIpg=0J^X&X@)}=39IJ^5j=RD_m?)I?79@%1# zZAPhPi$%(``hrFx`qE4^kwlcv@9Q|!m4fi_y&`g7bJ#9LUTT}{KLbO>8R_ei0)q!X z#qRyc>vpER$j5=$s5x4Fua{x^3%LS$@$!g$4WkPsW+7K zoo_WEEoB~2-x1Dibw7(vpG6ex7>-WnB)a`>ll6}_cco2_YNLm=KED6%^CXj(2o_fc zJ1F`Vy*AVY)3K|kycOA1NV}-obSCHX#?&+L#thXlr1hE&qbIqWdotR_jlzFkjo!}p zhlUoq_a{Zk6^=JVf#|4w{dUPpNhoUItIea zWMDDezg+Ax^KdyFha2E=Ea*4$#WKGgu3IZU1Cvv%pED;oWZ*LFTqM2*UtcITU;_;X zU^{=={FX*x7xM35-)zapU_-3a4-AZCOF`;1`H1Y8kgd#T!nIlQ4mclP0ndTU;016s zOz>{lo-lv^ehjQd!7(@uJ_{$qL3jn+1sB0L;ZoR8wh{T($OH5upR4k`K0U`k1}2Qb zPWYoTpL!oo?I(CY{8gD3h~pFc4tua*D*sBVe1EZQAj>qL33dKxJ_hP=>I;>5!J}AU z4f0N$@^aX|QX1}nsYJZjtcMS?c^$P>;yOL$$oZxm{pyqx`5PABvDmQqp~a6a9<+G) zZ|gMr_W+GqJZ|v^iz|5B+c+vYsyJ#mYB{!Z?BG!UPdhnwadJ;Mo8G delta 1679 zcma*nUr1AN6bJBgbt_48>yPO}vRSjt%4SosBD$K^%vqyR(mz}e(H}&6$%jgo1%Zs= zUmNi>y7l+Dk6j=wLRp~nWS4y`2i!Me|WEjRJ)-q)(WuJNIZ z$+GtQgU)4N3PSEgvUwfRt@%Z7q%crSbY*u#xQVv4v+yUvy69ksYrV{fGL2bX#y zc?*2=MXZ*5qLFsa)R&JXm)nTKo$t8c&%AWMKaE!YqtRn&)E|56u(hb^uX4F_*wYa1 zByKT<7JGf+Y;0$k_aNJeSi98hZi|a|6p%(wWk=8Xmflgajr)}^CR@1C;CDx$GGx>2 z>Lp0y;3~55Lwu9C5Kh5clvfbV>yq~v`Eqfsat=}SocJi}Cs2Rd$k$80l_->M_yh$V zMnRnv+*aldxp#*10LMWNFGmB%A&y24A4e?*|0+=v$6*e>be;eF?|df> K=AZhQsnKt$3%^nT diff --git a/iguana/databases/cdb-0.75/cdbmake.c b/iguana/databases/cdb-0.75/cdbmake.c index 3c1c8bddd..69740000f 100644 --- a/iguana/databases/cdb-0.75/cdbmake.c +++ b/iguana/databases/cdb-0.75/cdbmake.c @@ -1,3 +1,5 @@ +#include +#include #include "error.h" #include "open.h" #include "strerr.h" @@ -36,7 +38,7 @@ inline void get(char *ch) static struct cdb_make c; -main(int argc,char **argv) +int main(int argc,char **argv) { unsigned int klen; unsigned int dlen; diff --git a/iguana/databases/cdb-0.75/cdbstats b/iguana/databases/cdb-0.75/cdbstats index 7738b5dac81397d7edc17b39a10a0ba21e624c1e..69eae852197dd0765e4d2f24e079204bcdd17ec4 100755 GIT binary patch delta 1748 zcmaLXUr19?90%~<(hV(j%QDTfUH_4m)dor`VTC<=O*_##1RJ@}`m`49+2Nq=bcAh!oosIcE}=X-_r(1o*mKj-&5=iGD8ISV~7 z-5)W9%gyVutieiib7311*$xvWB@%7mXAc*-EGP&0-WVJ;+f6gUIdiq`VXLL(PHI)d zP)GOTtMpsTW13~Z#T%{5BytB11PX`_-K=)`Klooqeca#B%IaXLD`0+BLgez-6(qT) z6FG+wDBHDFZW;Z2o4CML&e?kBWW94Xdc($8b^Cw1{ezKcF?T(*l6>iG?aTF?Ra-pe z4(w^?{@j7WZ&}hsPV!#v|dGI734MC^m55AhQ?4UWL+;uNB; zQq?{K9)`EEttK1)s`x%J_cw#~6+~W6Ac|-z!6gZ){AEul%NLghAv8E?#4A<&BH}vY z*Npg86~Bx4WyC{9oJW=khk5+i3)pt3iWic=k-i+|H*nV$<$1$)kqdVI3VjhZo>!!^oe5`*^ePBfW!%lVkSMSEGTdpe0!2b(aRT zPVIprr*bO19nOYR;GOVhxB_0m9;kDIlXe0k6gj$+YSDIbQ4ijRzL*foeOUMNxGHfJx zuuHijIt0eVONU4?uq>f@vV)jJ;SNDNlz52j_w4t5E#5;fJlp$ue!t)IJnx_9z5mb@ zeqf5!n3KYpePUJE_Ql9kt=j+w1lW-w9Xk^3(m&|dBmZu?fwd9$o$MkS$;tM<@WL4Y#(Pu2AXMd>$e_RAl2ZvaIzppE7!D0$C=m=flJ;k6RX(y|s%qWe!C7M8%IQ@8JvY z64xnnei->Jdc0QRml2O6?$zT162DCpNDSad!ib)5QW7SVd1lKY@e|lrB%X%5dF5(> zv%0O~_i#iLe}vAon z#qF^Di19FbZp@ru)%34sDf?qS(xC9@GsPN z!zGAchc(y_+Y{#JKdd@<)!JdXf-xjmP%sInz*BHOJd65uJkxiuop&@3OCMm$5U(in zE}}{{&rhrR0NkkxJ|iJsA>KgThg<#)j>4O8Jtp`KM~bCBjlWmw0`I`taF`dY-ajft zhaKChOqmx`j%|1XaSglV3>+_%2|AEZ$iIYmH(u%eweANFhS0lH( X*X#E9Jy-j0c-&skOl{j*vWflxBMPpK diff --git a/iguana/databases/cdb-0.75/cdbstats.c b/iguana/databases/cdb-0.75/cdbstats.c index 53d2a7a21..6d3588da0 100644 --- a/iguana/databases/cdb-0.75/cdbstats.c +++ b/iguana/databases/cdb-0.75/cdbstats.c @@ -1,9 +1,11 @@ +#include #include "uint32.h" #include "fmt.h" #include "buffer.h" #include "strerr.h" #include "seek.h" #include "cdb.h" +#include "str.h" #define FATAL "cdbstats: fatal: " diff --git a/iguana/databases/cdb-0.75/cdbtest b/iguana/databases/cdb-0.75/cdbtest index 9598407fec781c018a1a00a43392e718760a2d72..45f4c33b0042945b44334e7a13d99ef3e59bb16d 100755 GIT binary patch delta 1645 zcmZ|PT}V@57zglYwxh#Lj~|(qwllZHC}>f^7D%I;$PsK>Dl6D(Eey&)7FY&H3c|Z) zyC}M-Ll+@-voOf+R(KIaxP%~rR03gC7rQg6i=KDS|6FX);2H1l{l8!CoY&8f9g9yK zxq#+a%m%fgJ!gq%CQRga5^d#ngiC!i6h{=vzR=uSh?_05(bjBH>(fu&U;21!xqssB z*JbP5^Wyk|QJX$yHr5l3`iUGosg_H58s=u%b8sVEfLoLsh!Tfo{&segL+5YtUS(e7 z9mXG0RvURFKTc#)(>5YKCLM#AU}3^JWtAV5{0j0C@+mvNDR~C@B=Sdg9+Z4unGX=! zEq=xOmpiO(=~%*mOuKl+wp+XkuN&eYu+bsjg!LU_7jLFEv^vF|aABvo*R%(qBLLGb z8885su;GZEdnLaBC*W~=yif8Qw)xp`lkULNtzvT)9mEe)4Y1%svv?jh@Qb{Jb@+{K z%zqDC@FzIIZz?xw4bF*8`mQ?oCFwgT12*9<*jXca1KbR^!Cv?mp7{aTg**uFhfl&( zHb4Jibo|8vN!W)8*I)ylg8lG}G9NnPkv|}dTu1&CcEUNhLz(xdw^%^OGy4GN`D*dH zv;t@NCMbVV=5`*}ZVh>f@2AQ)kmrz>;6?a1Y_Zk*M|E3d!8r_QgCD{kI0N@8tBE+^ zJ~#m%feScrKfK-}2Rs4idiegSb)xnJuMCL630%ud%Dh-HAo&FH2wuY5u+b&?J&ey| z`~&0}{KC)Rysu6syv{}k+~z8G^KsOP%AbuY|E%(#D%UtG=ew$`SGm2?CUsYKl>f62 z@=;E6o#7hh8sQq{igFEc#klwrityL}#u^mAoUW`S#p74U;;G40@_ITIA4{FTxDXE4 GJO2UbQoe3J4D!1z zf0BHG{9us3Zuy%c$>IXnD7X_8bXvivvo_FOXMTz^o6O@lrJcJzCj-};-{U#oJd6EW z^Stg~+`wCB1B(=7)|<<9RoB4u26Gf=a0`}=mfwX7Y`8DTH(9<9C-CWHFrnEB&IMj$ zzJ!OO=37{5%y;qhD)T7zIgv5!;TM6KpUg3kVc<1R=$oatGKI7FgR?&K*6o&`$1(g3 zSK>c-HTIU-{Gay7lM-WKIR%^XR=g7n-iv?n&ctyu`7_wZgSZV}an`2d4ekr*^B^h;rTAWb3_fHxbn5N?`c&^bpZpT@?C#Y|-`~jTcXF1@kYb|tG z{w(=8FX2V($7Fx;h;A?;&xBzLQXFv_=kYVOHtu>aUb*y0PknNxWb|W+7fSrK#ET{V wUE;Fv(p@W-x<}j}?_rHTjkrd?#!-y{jYAqoG>&QL)&0L(f8t?pEUdfBUoYl>eE +#include #include "auto_home.h" +#include "strerr.h" +#include "error.h" +#include "open.h" +#include "readwrite.h" +#include "exit.h" +#include "buffer.h" +#define FATAL "install: fatal: " -void hier() +static void h(char *home,int uid,int gid,int mode) +{ + if (mkdir(home,0700) == -1) + if (errno != error_exist) + strerr_die4sys(111,FATAL,"unable to mkdir ",home,": "); + if (chown(home,uid,gid) == -1) + strerr_die4sys(111,FATAL,"unable to chown ",home,": "); + if (chmod(home,mode) == -1) + strerr_die4sys(111,FATAL,"unable to chmod ",home,": "); +} + +static void d(char *home,char *subdir,int uid,int gid,int mode) { - h(auto_home,-1,-1,02755); - d(auto_home,"bin",-1,-1,02755); + if (chdir(home) == -1) + strerr_die4sys(111,FATAL,"unable to switch to ",home,": "); + if (mkdir(subdir,0700) == -1) + if (errno != error_exist) + strerr_die6sys(111,FATAL,"unable to mkdir ",home,"/",subdir,": "); + if (chown(subdir,uid,gid) == -1) + strerr_die6sys(111,FATAL,"unable to chown ",home,"/",subdir,": "); + if (chmod(subdir,mode) == -1) + strerr_die6sys(111,FATAL,"unable to chmod ",home,"/",subdir,": "); +} + +static char inbuf[BUFFER_INSIZE]; +static char outbuf[BUFFER_OUTSIZE]; +static buffer ssin; +static buffer ssout; +int fdsourcedir = -1; - c(auto_home,"bin","cdbget",-1,-1,0755); - c(auto_home,"bin","cdbmake",-1,-1,0755); - c(auto_home,"bin","cdbdump",-1,-1,0755); - c(auto_home,"bin","cdbstats",-1,-1,0755); - c(auto_home,"bin","cdbtest",-1,-1,0755); - c(auto_home,"bin","cdbmake-12",-1,-1,0755); - c(auto_home,"bin","cdbmake-sv",-1,-1,0755); +static void c(char *home,char *subdir,char *file,int uid,int gid,int mode) +{ + int fdin; + int fdout; + + if (fchdir(fdsourcedir) == -1) + strerr_die2sys(111,FATAL,"unable to switch back to source directory: "); + + fdin = open_read(file); + if (fdin == -1) + strerr_die4sys(111,FATAL,"unable to read ",file,": "); + buffer_init(&ssin,read,fdin,inbuf,sizeof inbuf); + + if (chdir(home) == -1) + strerr_die4sys(111,FATAL,"unable to switch to ",home,": "); + if (chdir(subdir) == -1) + strerr_die6sys(111,FATAL,"unable to switch to ",home,"/",subdir,": "); + + fdout = open_trunc(file); + if (fdout == -1) + strerr_die6sys(111,FATAL,"unable to write .../",subdir,"/",file,": "); + buffer_init(&ssout,write,fdout,outbuf,sizeof outbuf); + + switch(buffer_copy(&ssout,&ssin)) { + case -2: + strerr_die4sys(111,FATAL,"unable to read ",file,": "); + case -3: + strerr_die6sys(111,FATAL,"unable to write .../",subdir,"/",file,": "); + } + + close(fdin); + if (buffer_flush(&ssout) == -1) + strerr_die6sys(111,FATAL,"unable to write .../",subdir,"/",file,": "); + if (fsync(fdout) == -1) + strerr_die6sys(111,FATAL,"unable to write .../",subdir,"/",file,": "); + if (close(fdout) == -1) /* NFS silliness */ + strerr_die6sys(111,FATAL,"unable to write .../",subdir,"/",file,": "); + + if (chown(file,uid,gid) == -1) + strerr_die6sys(111,FATAL,"unable to chown .../",subdir,"/",file,": "); + if (chmod(file,mode) == -1) + strerr_die6sys(111,FATAL,"unable to chmod .../",subdir,"/",file,": "); +} + +void hier() +{ + h(auto_home,-1,-1,02755); + d(auto_home,"bin",-1,-1,02755); + + c(auto_home,"bin","cdbget",-1,-1,0755); + c(auto_home,"bin","cdbmake",-1,-1,0755); + c(auto_home,"bin","cdbdump",-1,-1,0755); + c(auto_home,"bin","cdbstats",-1,-1,0755); + c(auto_home,"bin","cdbtest",-1,-1,0755); + c(auto_home,"bin","cdbmake-12",-1,-1,0755); + c(auto_home,"bin","cdbmake-sv",-1,-1,0755); } diff --git a/iguana/databases/cdb-0.75/install b/iguana/databases/cdb-0.75/install index 84ead68124bcab9f393c31b28dc2d2c552c6906a..920b308c530a038a13f3db34627f4a36d45e6303 100755 GIT binary patch delta 5128 zcmZvg3vd)g8ppqx-6cTSypHANBg-qNr6$26qGCt_$+>8v@d${Avg9!#3(4-f4*^j( z7!cPOjW?8>o{z{Kicexi4+O>NQ3|Erg}PLo9F_z`9X!#%d4SK{|Lg7~TU$)g)ARqj zzh8g-bwU!3Mv~)O4kAXF>ORmI1FJ1?US`-<{#`iW`o^5I=D$P+!{

`Gezz=^fy4_!pz_;62cMU4k;GCv;`b{IkQX zOdVy8$~rG*twkU$X9uEJdDDlXf`j|$ckKNk}*u0B3mgT`J4Sc}y z%|v`J+=ph7vNneueR#4WLGbzec#i0+^7zS$cwa^Qd#eI*Z8#Kr9@s2kt)@|!KS<^A zA1mT##C+d@50Y0Uu*1n)FU+oOOl)&JjcRZe=Eo0Or_(X1yL+vkadIs=ajPXLH3>9Z zg1i#6D3(NeS&`Nzkn$wy-3>gu;gC+D3pU0$NpdEE>HsQjjb?b_hg+i`wl3_krX(Og z5x&mA2FyQ^`LtvnM1^VYLX|kpOfXB*cbo>(`Ukej;2wEc(xxN@_&W)EM#7qsV0+Ur zbc^YqG%n_8`8oqjau<47FJDKTLSm|muH+fnehqAGl9K)k%pRGj- zv6!>Y5kRdBU5DFOs;m3MXhE;~2oy55UGLCTqJwE=GpeUZ^sB1w3bKu}CRWQ7B+LjOQs~nQl+QKLc|NnR!DD z#&0F8seu)zMc6Z;d`-7d3Q2;y+n^sLSHM)uAn44BzcJ>??xpfe>D~PN2XqZ z#ac)rYtQrZeEGbUp9|$P2W!oc&rk95bou-^KjUCv&SQA?wCv5e?KmG`gWpl!^(8l# zEGns5z?*-5{HNB!;05qX$2?+#ui4G(;G48_TEzS4x&c@b@X%}a!)W9PCy&k_h4_0V zEx*V!EbAPQITBI;2v%OS~6iN)rBNoX4uS6i$nT*)*Qobd9Dg||T6E;iY z1G06FByNJjCixDPT*|NTq2Y{V;R93>f4`(o&XG|BP^Xa%hvy)LV`D<5(p0b z2sU47{EW37n*%F*bSV=3Gd=^nY{dxaX6gFXJseqVm^?|?U2|mf6R1GWMKwgeUyui^ z8juHRqh={QdG_xCF}^)5Nx)9#RjZV3ADFl|H>p$_jmJ@hl9L0UA+IUTG{*}DonXBk-J%OPauI-RRVIX^m#4` z`7dp#h~K{Qnf=C)6Lx+gEgx0; z2y)$(uRfqg^Sg-RLbWA7R=l4Zui$=Q~@Xdu=w7%Ye<6GJq#8?{$ zuAzfA8Y#M+(CX=w7Nq<1n&n1>zR~&qUp;IXE9qxl^u5=1Ii0rIsE1LF(QpH;(+#7J zj_Wq+UnKYuGGSUtXEAzpqi?yNI&|8~?Rgyf<$AsF`>P(N-LN(nfF%3jFRG8&G7J4W zXKAwEzjgDLxp}b=vPplmMM6=3Ej`H*l%iLEDgM6VjP}}mwBGIy&{lhd-m@F4ec=dw zW?vPEHrCZN25MK*DSI`Yu?OivPDB~|UaN)ZD3d%;-Scrfy9~FV__nQD^M-@fwFY%N zNcYoC57`6sshxC;)nN~Y0?R`N{(wATN2JwQoF=1*-n1M32)$#kGw$%gu@eKmRt?rp zbkJ8vYQjjh-PdFUq7ky}rf=T#DH|QNwMLj;MAu%%_<{yK<1j)^^sFNkhy>_$vvc00 z@pkIprjwo8pXZ&>H=%Pxu;0-!(sY(i)yTZ8G&`225%uE~LPhu;M`_s6_vcHEPcWt7 zt;m=uHNH4P=PQjrcBHP7?H4LtsWksMVE@X9Y`;|Lpwct>mtVTZSlPjYIvoMrr2<%> z^fsk$V~xY5eUt3p#2S&iv!%XM>AuNQZ&bP&k?{oKCi(~QrwZ#W7+)IP((sDvP^miX zR=QgO_bE;It;2v`rTbO?&y{YTB->9b-HC&f``d8ifSZ+e#gw5>8GfyF&t&N^Q|bPx zQWq&*i4PPW>3Y`4Sf9$!Vx@bPHk970bV%tBm5!}fhE8Q@SGrs2$CW;&^b1PwRCTZNi9Z&ro|{z0!nV zw>;n@N)P_O)Fx=yxrwL_0c_{d_@>P5eU(Y$6-Q=w$FOC~; r7zY_D+-jorEOGpKeSRep+PY47CTixG>%OqzY%~Y1%Qk;={Y(D`m3p># delta 5467 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 G!}C9X=B70O diff --git a/iguana/databases/cdb-0.75/install.c b/iguana/databases/cdb-0.75/install.c index 9b81f4938..fe0cbd097 100644 --- a/iguana/databases/cdb-0.75/install.c +++ b/iguana/databases/cdb-0.75/install.c @@ -1,3 +1,5 @@ +#include +#include #include "buffer.h" #include "strerr.h" #include "error.h" @@ -9,95 +11,9 @@ extern void hier(); #define FATAL "install: fatal: " -int fdsourcedir = -1; - -void h(home,uid,gid,mode) -char *home; -int uid; -int gid; -int mode; -{ - if (mkdir(home,0700) == -1) - if (errno != error_exist) - strerr_die4sys(111,FATAL,"unable to mkdir ",home,": "); - if (chown(home,uid,gid) == -1) - strerr_die4sys(111,FATAL,"unable to chown ",home,": "); - if (chmod(home,mode) == -1) - strerr_die4sys(111,FATAL,"unable to chmod ",home,": "); -} - -void d(home,subdir,uid,gid,mode) -char *home; -char *subdir; -int uid; -int gid; -int mode; -{ - if (chdir(home) == -1) - strerr_die4sys(111,FATAL,"unable to switch to ",home,": "); - if (mkdir(subdir,0700) == -1) - if (errno != error_exist) - strerr_die6sys(111,FATAL,"unable to mkdir ",home,"/",subdir,": "); - if (chown(subdir,uid,gid) == -1) - strerr_die6sys(111,FATAL,"unable to chown ",home,"/",subdir,": "); - if (chmod(subdir,mode) == -1) - strerr_die6sys(111,FATAL,"unable to chmod ",home,"/",subdir,": "); -} - -char inbuf[BUFFER_INSIZE]; -char outbuf[BUFFER_OUTSIZE]; -buffer ssin; -buffer ssout; - -void c(home,subdir,file,uid,gid,mode) -char *home; -char *subdir; -char *file; -int uid; -int gid; -int mode; -{ - int fdin; - int fdout; - - if (fchdir(fdsourcedir) == -1) - strerr_die2sys(111,FATAL,"unable to switch back to source directory: "); - - fdin = open_read(file); - if (fdin == -1) - strerr_die4sys(111,FATAL,"unable to read ",file,": "); - buffer_init(&ssin,read,fdin,inbuf,sizeof inbuf); - - if (chdir(home) == -1) - strerr_die4sys(111,FATAL,"unable to switch to ",home,": "); - if (chdir(subdir) == -1) - strerr_die6sys(111,FATAL,"unable to switch to ",home,"/",subdir,": "); - - fdout = open_trunc(file); - if (fdout == -1) - strerr_die6sys(111,FATAL,"unable to write .../",subdir,"/",file,": "); - buffer_init(&ssout,write,fdout,outbuf,sizeof outbuf); - - switch(buffer_copy(&ssout,&ssin)) { - case -2: - strerr_die4sys(111,FATAL,"unable to read ",file,": "); - case -3: - strerr_die6sys(111,FATAL,"unable to write .../",subdir,"/",file,": "); - } - - close(fdin); - if (buffer_flush(&ssout) == -1) - strerr_die6sys(111,FATAL,"unable to write .../",subdir,"/",file,": "); - if (fsync(fdout) == -1) - strerr_die6sys(111,FATAL,"unable to write .../",subdir,"/",file,": "); - if (close(fdout) == -1) /* NFS silliness */ - strerr_die6sys(111,FATAL,"unable to write .../",subdir,"/",file,": "); - - if (chown(file,uid,gid) == -1) - strerr_die6sys(111,FATAL,"unable to chown .../",subdir,"/",file,": "); - if (chmod(file,mode) == -1) - strerr_die6sys(111,FATAL,"unable to chmod .../",subdir,"/",file,": "); -} +extern int fdsourcedir; +static buffer ssout; +static char outbuf[BUFFER_OUTSIZE]; void z(home,subdir,file,len,uid,gid,mode) char *home; diff --git a/iguana/databases/cdb-0.75/instcheck b/iguana/databases/cdb-0.75/instcheck index 9d76c0d5c3b14d9cd90d982e9f6f404bfc494f22..093984b77fb4b67f81bd05c828426aa564c8afe8 100755 GIT binary patch literal 19492 zcmeHPe|%KMwV&N=G-5)6ijAVO`hpUz5PV_@KQtG2Wm7jA1=K3>vf14v+a$Z|?p;Ex zwxKbV>oqp5t=d;>V{5I?YKyJ5sahKZO$3yvsRCMvt)+{R8np`YBm2H*X729Y1$_PV z&-d65_ntXtX1;Ug%$b>U=iab+-|q2a8MEav)?sIimEh_aKayjtlb#KYH)_@iN4$^FEoEKw}Q;13+4R?19& zDG@yR3E>i@pQ<)SOdAXS@OY)XG;YAN>P6!T*Gd0WHQb`c+gs}+EoxMY0Y4kB6!l3z zsSYDP7q2LdM*6k*J`ZoY#H*Ech_~WVKZ~>Q0zS=`5#;K(QsS95A>N9YsVP#b>W_ru zW@*wlyT4-+&nZEOcjSUtcvY>BXJ*-WaH zI@NJnDt;bbW}Wj^UvatHRlP(acSyf0k$jb)Wrc#$I9QrsXJH+MDHy8~zEA>+f9YQ> zm>zH=pfmt>5c0tamsn>{szyD?kB6)l7yZZ=>4J&aTwD`z9qG3Qi?v+(vWie0CoWQZ zW+EP&*%GRs8E9__fT!OST%<=w&+(IXe`{{TZ};x0_b;C?u?#Za_2V!baGh)Np!A!L zDpW6Obw=>i&Kz8nM}4%}9*6mDnYPjX;`X=}Y@M-i2J{HkqY!>) zW856t)t0IYMb$MqRY%J`-T4UYn2DS0JY@vK@; zHorkxrqn4nDr()j2K;6ePrZ!{$Y^{#o$r?@`iCBUukI}?&`%=RY7R8+(f4`uwMrkW zVk}uPjuGozUjm4%`kC?Ve81GKzo6)w6h5jReSdQE7sOarLhWxfl6J1Lf=oAOzk^-E z(>-}Nh_^fcTOfa=xYwg^r5?PD9=P5 zdRjb{_wRG{n`zN+N5i4|DWb(15a_oPrLFp%pQGOiqV$DU{ZNGT`{=;GsNc(OeZ5{Y zT&=(9(Lb)%$CG!SoH612!>ITGl!6H#1%Zl}nkvG*$%J>nD?R#-T*c=dUed1v|ecoVD8%k)O>b7 zt{0l^;H2m~sDSJc4FcP%~IzQcu$@X`CeNL%1^!gKHPK_X*refjiTR z+b(d=Al%*gQ2zo8$Q`vlruRH0fg8Eh;a3jUlpybhQMOxGT9`-e~2_xU5gOdI$Q1&@G}JbX6S_xoGajo2>9a# zd^y2$Yp*{+*oTns708V_$QKLbzj0EO5Xd7a3&n{Div6oVrKT;YiJ*A&Rny>D=3LvoV4}AT^?u~5%`?RrOaT?ch*aCQ`(0I6|esHq#etNqQ9tgj;9i|In*BpWVQfl27zru zXp&=j^>=83tN{`f-{k}`W^X%3}Y7m!H)D32GpfHZbvpQosTX3i(eArf)O2g^F4(J&675Ss4gpc(&b6M!cOz+Vc$Q@~*u ziHKo*?>J$P6R>nC`he1zN+qfQ`ZWQ1c@F4V0<=khzJ@~3a=oc#js8yZ2LSYRpZ?J$ zAja&Ccyfepjw%p+hfCilEz@Zy`RvCqD`moeq-uJz^gfMDp?O;8ZrVqU4ZSrk$RcYay=JM zo*=+90oGszn&|2F0#nC!0b88| z>lCnG6R^}aI{Z9H+LHH5*xj&Ra)|};9D%r}F1y#SaPj1e1>)BQBApnd5#2zf#esq= z9z>d(BJGEZYvFD`CCmX#HxMJ=jYY+nlf03ZDE-m`7<@0(K(Yi^DUb?os9Q%Ed_UET z^=pyQRywc<)+H}kR4B4}emZ`ubs231?ygU@8d=a|Om!LGDDfJNrQYuIJJ6_0$3w+- zEC3b#N@|!ac{0@bE#fhwppQ0CWnK-_wvHBg{DU6bMy344#HLyOTp??Oe8l*6y8gOH z{|L*VR}c0n2Ifb#F~7`X8*m$1Ss~z*%I(FSYtRWO^Z^e8mk#Q6!!G?(gcZMpJ!bVQ z#xex7wvQDZRI798iS^0=kf`f5#)V~W9ZCTyWeUE{r%RhD@x;K`h!yEMe9DQAt9~a+#EexY?hk`{=P_aQR zZjoQ%f zHcmrVwXzbJa*%h|+r8jfbj|vFf(3z(=X+@blwv%0A{0p*pjg|s>s6>`j_3=C4Y0u= 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 literal 14420 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 LH5j)oK+yajNj?9w diff --git a/iguana/databases/cdb-0.75/instcheck.c b/iguana/databases/cdb-0.75/instcheck.c index 5c20b64e4..b77ed1012 100644 --- a/iguana/databases/cdb-0.75/instcheck.c +++ b/iguana/databases/cdb-0.75/instcheck.c @@ -1,3 +1,4 @@ +#include #include #include #include "strerr.h" diff --git a/iguana/databases/cdb-0.75/load b/iguana/databases/cdb-0.75/load index 951c9763b..0cbeba18d 100755 --- a/iguana/databases/cdb-0.75/load +++ b/iguana/databases/cdb-0.75/load @@ -1,4 +1,4 @@ #!/bin/sh # WARNING: This file was auto-generated. Do not edit! main="$1"; shift -exec gcc -s -o "$main" "$main".o ${1+"$@"} +exec gcc -o "$main" "$main".o ${1+"$@"} diff --git a/iguana/databases/cdb-0.75/testzero b/iguana/databases/cdb-0.75/testzero index cb66a8b5891d8ed18dec613d0048c1bba518a7df..7fe9dffad13de15a2dba4a290f87d57892f528d0 100755 GIT binary patch delta 1214 zcmZA1%WKq76bA4!QzEuin>zTyN29jdm5iu$TCEKTR#c=FtKy=WV6&(WGSpHK7wJk0 zx=^Dc(#0%9Tv$k{3n>co2Pn+ig?3|67(o<7M62JO^I3)jPLkif=jPnpJbph&RUf9} zoRuy#M?Kb=4p&4@9T#yLM4E9vfH0fI*o$LVG;6h4E0NWDcQ6xuvO4Wb<=*L|!~3n7 z&W}I$yk5FE=d7sqhHIKcE@VYg7}SU`&eN-nvC9YAzm_i28<(A`jo%5kq-^Xp|6t7` z<<06Nw7o@rLL`(H6r5zivnF8`3XW(34!EF5i37&yNjjvn+cf_c?QB&~({Y=6hF);g z^Qd1d5VPS86YTAp@Sb)%)Srzp!LR$&RrWjU)Ia`@ryDSNa|7-M?Qf;a>(%Wc8!8-d zfX-rVaVp2?0rsDx^BL{;jj@6+xq?^e=kyJFnx3Mc(BWe?OtIl9{fLg~S9F=aL%*eO z)9>gP^dcS8-{`VBl)t6{5##N_L7LKfM6yB(nmYH^m-?0n~!ja zF4c_ZKg@$8x!tA4fAbwBMyn2m%}*eMdT1Y2=k%#A+WiLTdF5Z>kx_Bf0xG&yV;1{kH{Y$~zpZ=xvKX!I=djJ3c delta 1091 zcmZwGODIHP6bJBgM|Tz|SDxiD7mctQ??GzH0t@AljfE^c%0jY}a;21oLW77h3k$_! zG!_(^4JjLxg_PF{Sy)IGlbr9K|CDZSbMDOVoO8eX-S2+$zM{pJwXk1z#S(+{dZ)L6 zh+@rrN+3$&uXc{VM>(TBxTkyc1MW&)>_`i~=q1M2&DGtc<$su7e*0WMiws6g_j{w2 zq8awJ8lN*cQus$She$aOHgd(K%85i%K5?aTGErZ@xC#9s^mo8ha4+o3m;PZQ%f6w> zcTzW;KttFgo`WAv@mjnN@4!ZZ)Q{nSSA4F_6a3(rs_`#SH#5XHe1Cfa1`^Nl0kWjw z1CH|2r~wlAq*mw>{pqkTTk2l89rbFsFHPzJWnRGptYDjk#4Zv&@CG~tZ^7g6EIb3R z!t?MEya_MByYL)r9U`%h#3>wxuiz+rugnoHk|%maJ%suY!w zB+OzNunacv4y)i0+z5|i0}k5p^QHUKicDU@fJjaFo6X&Pmn)y ztU0{n@QK5x!SQB~b?wOBI{f7Di^J+qT)|PrQNvNo;pgC;Ow}B99Q7Q01peuD+s$TV Jq~*t@(JxuFWmo_J diff --git a/iguana/databases/cdb-0.75/testzero.c b/iguana/databases/cdb-0.75/testzero.c index ba0786590..683877172 100644 --- a/iguana/databases/cdb-0.75/testzero.c +++ b/iguana/databases/cdb-0.75/testzero.c @@ -1,3 +1,4 @@ +#include #include "uint32.h" #include "scan.h" #include "strerr.h" @@ -14,7 +15,7 @@ static char key[4]; static char data[65536]; struct cdb_make c; -main(int argc,char **argv) +int main(int argc,char **argv) { int fd; unsigned long loop; diff --git a/iguana/iguana_bundles.c b/iguana/iguana_bundles.c index 9fe17b029..6900c0f6e 100755 --- a/iguana/iguana_bundles.c +++ b/iguana/iguana_bundles.c @@ -419,7 +419,7 @@ struct iguana_txid *iguana_bundletx(struct iguana_info *coin,struct iguana_bundl void iguana_bundlepurgefiles(struct iguana_info *coin,struct iguana_bundle *bp) { static const bits256 zero; - char fname[1024],dirname[1024]; FILE *fp; int32_t hdrsi,m,j; uint32_t ipbits; + char fname[1024]; FILE *fp; int32_t hdrsi,m,j; uint32_t ipbits; if ( bp->purgetime == 0 && time(NULL) > bp->emitfinish+30 ) { //printf("purged hdrsi.[%d] lag.%ld\n",bp->hdrsi,time(NULL) - bp->emitfinish); @@ -440,7 +440,7 @@ void iguana_bundlepurgefiles(struct iguana_info *coin,struct iguana_bundle *bp) else printf("error removing.(%s)\n",fname); } } - sprintf(dirname,"%s/%s/%d",GLOBAL_TMPDIR,coin->symbol,bp->bundleheight), OS_remove_directory(dirname); + //sprintf(dirname,"%s/%s/%d",GLOBAL_TMPDIR,coin->symbol,bp->bundleheight), OS_remove_directory(dirname); bp->purgetime = (uint32_t)time(NULL); } } diff --git a/iguana/m_unix b/iguana/m_unix index 59f3c04d2..7e15872e0 100755 --- a/iguana/m_unix +++ b/iguana/m_unix @@ -1,6 +1,8 @@ #./configure --enable-endomorphism --enable-module-ecdh --enable-module-schnorr --enable-module-rangeproof --enable-experimental +include iguana.sources + rm ../agents/iguana git pull -gcc -g -Wno-deprecated -c -O2 *.c +gcc -g -Wno-deprecated -c -O2 $SOURCES gcc -g -Wno-deprecated -c main.c iguana777.c iguana_bundles.c gcc -g -o ../agents/iguana *.o ../agents/libcrypto777.a -lcurl -lssl -lcrypto -lpthread -lm ../includes/libsecp256k1.a -lgmp