diff --git a/.objs/crypto/md5.o b/.objs/crypto/md5.o index 9b66c1b..ad52b0c 100644 Binary files a/.objs/crypto/md5.o and b/.objs/crypto/md5.o differ diff --git a/.objs/crypto/sha1.o b/.objs/crypto/sha1.o index 8776557..1ba4215 100644 Binary files a/.objs/crypto/sha1.o and b/.objs/crypto/sha1.o differ diff --git a/.objs/crypto/sha2.o b/.objs/crypto/sha2.o index d9cfbee..b9968c7 100644 Binary files a/.objs/crypto/sha2.o and b/.objs/crypto/sha2.o differ diff --git a/.objs/crypto/sha512.o b/.objs/crypto/sha512.o deleted file mode 100644 index 41dce93..0000000 Binary files a/.objs/crypto/sha512.o and /dev/null differ diff --git a/.objs/sourcescript.o b/.objs/sourcescript.o index ff1b77d..71cdfd7 100644 Binary files a/.objs/sourcescript.o and b/.objs/sourcescript.o differ diff --git a/crypto/hex.h b/crypto/hex.h index e7851ab..efcd7fd 100644 --- a/crypto/hex.h +++ b/crypto/hex.h @@ -6,7 +6,7 @@ //Used namespaces using namespace std; -class crypt +class crypto { public: string char2hex( char dec ) diff --git a/lib/stdprint.hpp b/lib/stdprint.hpp index 0b4ba27..00d829a 100644 --- a/lib/stdprint.hpp +++ b/lib/stdprint.hpp @@ -15,7 +15,7 @@ #define STDPRINT_HPP_INCLUDED #if !(WIN32) //If dont support Windows :: Do Def. Inst. - +#define Sleep(x) #endif #if !(WIN64) //! win64 diff --git a/lib/stdutils.hpp b/lib/stdutils.hpp index accc543..ce56a60 100644 --- a/lib/stdutils.hpp +++ b/lib/stdutils.hpp @@ -28,7 +28,7 @@ using namespace std; //Objects -crypt crypt; +crypto crypto; // ... @@ -87,8 +87,9 @@ class utils #endif } - void hourconvert(long hours) + void hourconvert(string hour) { + int hours = atoi(hour.c_str()); long minute; long seconds; float days, weeks, years; @@ -161,7 +162,7 @@ class utils else { escaped.append("%"); - escaped.append( crypt.char2hex(c[i]) );//converts char 255 to string "ff" + escaped.append( crypto.char2hex(c[i]) );//converts char 255 to string "ff" } } return escaped; diff --git a/sourcescript b/sourcescript new file mode 100644 index 0000000..a427e01 Binary files /dev/null and b/sourcescript differ diff --git a/sourcescript.cpp b/sourcescript.cpp index 0a362a4..1ab99ad 100644 --- a/sourcescript.cpp +++ b/sourcescript.cpp @@ -227,7 +227,7 @@ int main(int argc, char *argv[]) } else if (string(argv[1]) == "--hourconvert") { - utils.hourconvert(int(argv[2])); + utils.hourconvert(string(argv[2])); } else if (string(argv[1]) == "--md5") { diff --git a/sourcescript.depend b/sourcescript.depend index 527f654..3f905c6 100644 --- a/sourcescript.depend +++ b/sourcescript.depend @@ -5,6 +5,8 @@ "stdutils.hpp" "stdfile.hpp" +1442073351 pp" + 1442014540 g:\workspace\projects\sourcescript\libs.hpp @@ -20,6 +22,8 @@ +1442236361 + 1442014540 g:\workspace\projects\sourcescript\pilib.hpp "libs.hpp" @@ -43,6 +47,8 @@ "crypto/sha2.h" "crypto/base64.h" +1443958512 se64.h" + 1442014540 g:\projects\sourcescript\libs.hpp @@ -130,6 +136,8 @@ 1443957957 g:\projects\sourcescript\apps\tperiodic.hpp "../lib/libs.hpp" +1442696015 bs.hpp" + 1443957957 g:\projects\sourcescript\lib\libs.hpp @@ -161,6 +169,8 @@ "libs.hpp" "../crypto/hex.h" +1442700390 /hex.h" + 1443958179 g:\projects\sourcescript\lib\stdfile.hpp "libs.hpp" @@ -268,3 +278,88 @@ 1442696015 c:\users\luís ferreira\workspace\projects\sourcescript\crypto\base64.h "../lib/libs.hpp" +1442682658 source:/media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/crypto/md5.cpp + "md5.h" + + +1442682613 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/crypto/md5.h + + + +1442688999 source:/media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/crypto/sha1.cpp + "../lib/libs.hpp" + "sha1.h" + +1443957957 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/lib/libs.hpp + + + + "TargetConditionals.h" + + + + + + + + + + + + + + + + + + + +1442682982 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/crypto/sha1.h + + + +1442688766 source:/media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/crypto/sha2.cpp + "../lib/libs.hpp" + "sha2.h" + +1442683010 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/crypto/sha2.h + + +1446918272 source:/media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/sourcescript.cpp + "lib/libs.hpp" + "lib/pilib.hpp" + "lib/stdutils.hpp" + "lib/stdfile.hpp" + "lib/stdprint.hpp" + "lib/printdef.hpp" + "apps/tperiodic.hpp" + "crypto/hex.h" + "crypto/md5.h" + "crypto/sha1.h" + "crypto/sha2.h" + "crypto/base64.h" + +1442236400 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/lib/pilib.hpp + "libs.hpp" + +1446918382 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/lib/stdutils.hpp + "libs.hpp" + "../crypto/hex.h" + +1446918073 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/crypto/hex.h + "../lib/libs.hpp" + +1443958179 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/lib/stdfile.hpp + "libs.hpp" + +1446917841 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/lib/stdprint.hpp + "libs.hpp" + +1442237661 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/lib/printdef.hpp + +1443957957 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/apps/tperiodic.hpp + "../lib/libs.hpp" + +1442696015 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/crypto/base64.h + "../lib/libs.hpp" + diff --git a/sourcescript.exe b/sourcescript.exe index 7624045..68b623f 100644 Binary files a/sourcescript.exe and b/sourcescript.exe differ diff --git a/sourcescript.layout b/sourcescript.layout deleted file mode 100644 index 5956c19..0000000 --- a/sourcescript.layout +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -