Merge branch 'master' of github.com:dopefishh/sws1

diff --git a/.gitignore b/.gitignore
index 10d00b5..0524e5d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.gz
+*.out

diff --git a/ass2/chris/exercise1a.txt b/ass2/chris/sws1-s4109503-s4202015/exercise1a.txt
similarity index 100%
rename from ass2/chris/exercise1a.txt
rename to ass2/chris/sws1-s4109503-s4202015/exercise1a.txt

diff --git a/ass2/chris/sws1-s4109503-s4202015/exercise1b.c b/ass2/chris/sws1-s4109503-s4202015/exercise1b.c
new file mode 100644 (file)
index 0000000..f1c9f23
--- /dev/null
+++ b/ass2/chris/sws1-s4109503-s4202015/exercise1b.c
@@ -0,0 +1,12 @@
+#include<stdio.h>
+
+int main(){
+       FILE *fp;
+       fp = fopen("/dev/urandom","r");
+       char buffer = 0;
+       do{
+               fread(&buffer, 1, 1, fp);
+               printf("%i %u %#x \n",buffer, buffer, buffer);
+       } while(buffer != 42);
+       return 0;
+}