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

diff --git a/ass2/chris/sws1-s4109503-s4202015/exercise1b.c b/ass2/chris/sws1-s4109503-s4202015/exercise1b.c
index f1c9f23..4a844dc 100644 (file)
--- a/ass2/chris/sws1-s4109503-s4202015/exercise1b.c
+++ b/ass2/chris/sws1-s4109503-s4202015/exercise1b.c
@@ -1,12 +1,12 @@
 #include<stdio.h>
 
 int main(){
-       FILE *fp;
-       fp = fopen("/dev/urandom","r");
+       FILE *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);
+       fclose(fp);
        return 0;
 }

diff --git a/ass2/chris/sws1-s4109503-s4202015/exercise1c b/ass2/chris/sws1-s4109503-s4202015/exercise1c
new file mode 100644 (file)
index 0000000..0fa3f81
--- /dev/null
+++ b/ass2/chris/sws1-s4109503-s4202015/exercise1c
@@ -0,0 +1,3 @@
+-41 4294967255 0xffffffd7 
+73 73 0x49 
+42 42 0x2a 

diff --git a/ass2/chris/sws1-s4109503-s4202015/exercise1d.c b/ass2/chris/sws1-s4109503-s4202015/exercise1d.c
new file mode 100644 (file)
index 0000000..545dd2a
--- /dev/null
+++ b/ass2/chris/sws1-s4109503-s4202015/exercise1d.c
@@ -0,0 +1,15 @@
+#include<stdio.h>
+#include<stdint.h>
+
+int main(){
+       FILE *fp = fopen("/dev/urandom","r");
+       unsigned char buffer[2];
+       uint16_t read = 0;
+       do{
+               fread(buffer, 2, 1, fp);
+               read = 256*buffer[0] + buffer[1];
+               printf("%x \n", read);
+       }while(read != 42);
+       fclose(fp);
+       return 0;
+}