Browse Source

Removed YAMLize, replaced EscapedString with smaller C version of the same utility, updated RSAPair, changed makefiles to use musl-gcc

Getty Ritter 9 years ago
parent
commit
fb88aa3b1f

+ 0 - 15
EscapedString/EscapedString.cabal

@@ -1,22 +0,0 @@
-
-name:                EscapedString
-version:             0.1.0.0
-license-file:        LICENSE
-author:              Getty Ritter
-maintainer:          gdritter@galois.com
-category:            Codec
-build-type:          Simple
-cabal-version:       >=1.10
-
-executable ToJSString
-  main-is:             EscapedString.hs
-  build-depends:       base >=4.6 && <4.7, aeson, text, bytestring
-  hs-source-dirs:      src
-  default-language:    Haskell2010

+ 0 - 14
EscapedString/LICENSE

@@ -1,14 +0,0 @@
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    Version 2, December 2004
-
- Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
-
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
-
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. You just DO WHAT THE FUCK YOU WANT TO.
-

+ 0 - 2
EscapedString/Setup.hs

@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain

+ 0 - 8
EscapedString/src/EscapedString.hs

@@ -1,8 +0,0 @@
-module Main where
-
-import Data.Aeson (Value(String), encode)
-import Data.ByteString.Lazy.Char8 (putStrLn)
-import Data.Text.IO (getContents)
-import Prelude hiding (getContents, putStrLn)
-
-main = getContents >>= putStrLn . encode . String

+ 0 - 8
EscapedString/src/ToJSString.hs~

@@ -1,8 +0,0 @@
-module Main where
-
-import Control.Monad ((>=>))
-import Data.Aeson (Value(String))
-import Data.Text.IO (getContents)
-import Prelude hiding (getContents)
-
-main = getContents >>= putStrLn . show . String

+ 3 - 6
RSAPair/RSAPair.cabal

@@ -1,23 +1,16 @@
-
 name:                RSAPair
-version:             0.1.0.0
+version:             0.1.0.1
 license:             OtherLicense
 license-file:        LICENSE
 author:              Getty Ritter
 maintainer:          gdritter@galois.com
 category:            Codec
 build-type:          Simple
 cabal-version:       >=1.10
 
-executable RSAPair
+executable rsa-pair
   main-is:             RSAPair.hs
-  -- other-modules:
-  -- other-extensions:
-  build-depends:       base >=4.6 && <4.7,
+  build-depends:       base >=4.6 && <4.8,
                        bytestring, binary, DRBG, crypto-api, RSA
   hs-source-dirs:      src
   default-language:    Haskell2010

+ 0 - 14
YAMLize/LICENSE

@@ -1,14 +0,0 @@
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    Version 2, December 2004
-
- Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
-
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
-
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. You just DO WHAT THE FUCK YOU WANT TO.
-

+ 0 - 2
YAMLize/Setup.hs

@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain

+ 0 - 21
YAMLize/YAMLize.cabal

@@ -1,21 +0,0 @@
-name:                YAMLize
-version:             0.1.0.0
-license:             OtherLicense
-license-file:        LICENSE
-author:              Getty Ritter
-maintainer:          gdritter@galois.com
-category:            Data
-build-type:          Simple
-cabal-version:       >=1.10
-
-executable ToYAML
-  main-is:             ToYAML.hs
-  build-depends:       base >=4.6 && <4.7, yaml, aeson, bytestring
-  hs-source-dirs:      src
-  default-language:    Haskell2010
-
-executable FromYAML
-  main-is:             FromYAML.hs
-  build-depends:       base >=4.6 && <4.7, yaml, aeson, bytestring
-  hs-source-dirs:      src
-  default-language:    Haskell2010

+ 0 - 15
YAMLize/src/FromYAML.hs

@@ -1,15 +0,0 @@
-{-# LANGUAGE ScopedTypeVariables #-}
-
-module Main where
-
-import Control.Monad ((>=>))
-import qualified Data.Aeson as Json
-import qualified Data.ByteString as BS
-import qualified Data.ByteString.Lazy.Char8 as BSL
-import Data.Maybe (fromJust)
-import qualified Data.Yaml as Yaml
-
-main = do
-  contents <- BS.getContents
-  let value :: Yaml.Value = fromJust (Yaml.decode contents)
-  BSL.putStrLn (Json.encode value)

+ 0 - 15
YAMLize/src/ToYAML.hs

@@ -1,15 +0,0 @@
-{-# LANGUAGE ScopedTypeVariables #-}
-
-module Main where
-
-import Control.Monad ((>=>))
-import qualified Data.Aeson as Json
-import qualified Data.ByteString.Char8 as BS
-import qualified Data.ByteString.Lazy.Char8 as BSL
-import Data.Maybe (fromJust)
-import qualified Data.Yaml as Yaml
-
-main = do
-  contents <- BSL.getContents
-  let value :: Yaml.Value = fromJust (Json.decode contents)
-  BS.putStrLn (Yaml.encode value)

+ 10 - 0
escaped-string/Makefile

@@ -0,0 +1,10 @@
+CC      = musl-gcc
+LDFLAGS = -lm
+
+all: escstring
+
+escstring:
+	$(CC) $(LDFLAGS) escstring.c -o $@
+
+clean:
+	rm -f escstring escstring.o

+ 64 - 0
escaped-string/escstring.c

@@ -0,0 +1,64 @@
+#include <stdio.h>
+
+int main(int argc, char* argv[])
+{
+    char c;
+    putchar('"');
+    while ((c = getchar()) != EOF) {
+        switch (c) {
+        case 0x08:
+            putchar('\\');
+            putchar('b');
+            break;
+        case 0x0a:
+            putchar('\\');
+            putchar('n');
+            break;
+        case 0x0c:
+            putchar('\\');
+            putchar('f');
+            break;
+        case 0x0d:
+            putchar('\\');
+            putchar('r');
+            break;
+        case 0x09:
+            putchar('\\');
+            putchar('t');
+            break;
+        case '"':
+        case '\\':
+        case 0x00:
+        case 0x01:
+        case 0x02:
+        case 0x03:
+        case 0x04:
+        case 0x05:
+        case 0x06:
+        case 0x07:
+        case 0x0b:
+        case 0x0e:
+        case 0x0f:
+        case 0x10:
+        case 0x11:
+        case 0x12:
+        case 0x13:
+        case 0x14:
+        case 0x15:
+        case 0x16:
+        case 0x17:
+        case 0x18:
+        case 0x19:
+        case 0x1a:
+        case 0x1b:
+        case 0x1c:
+        case 0x1d:
+        case 0x1e:
+        case 0x1f:
+            putchar('\\');
+        default:
+            putchar(c);
+        }
+    }
+    putchar('"');
+}

+ 1 - 1
expseq/Makefile

@@ -1,4 +1,4 @@
-CC      = gcc
+CC      = musl-gcc
 LDFLAGS = -lm
 
 all: expseq