PAM module works

[pam_pcsc_cr.git] / serial.c

diff --git a/serial.c b/serial.c
index 0719746a52eb7c001a6605c716e1de62df7c1d11..d773440df4c3d35d473f0ad6a77f078b9e0cd74e 100644 (file)
--- a/serial.c
+++ b/serial.c
@@ -4,13 +4,13 @@
 #include <string.h>
 #include "serial.h"
 
 #include <string.h>
 #include "serial.h"
 

-int serial_init(serializer_t *srl, void *buffer, int size)
+void serial_init(serializer_t *srl, void *buffer, int size)

 {
        srl->buffer = srl->cursor = buffer;
        srl->bufsize = size;
 }
 
 {
        srl->buffer = srl->cursor = buffer;
        srl->bufsize = size;
 }
 

-int serial_switch(serializer_t *srl, void *buffer, int size)
+void serial_switch(serializer_t *srl, void *buffer, int size)

 {
        int used = srl->cursor - srl->buffer;
 
 {
        int used = srl->cursor - srl->buffer;
 


@@ -20,25 +20,31 @@ int serial_switch(serializer_t *srl, void *buffer, int size)
        srl->cursor = buffer + used;
 }
 
        srl->cursor = buffer + used;
 }
 

-int serial_put(serializer_t *srl, void *item, int size)
+/* returns 'size' on success, or remainging space if it was insufficient */
+int serial_put(serializer_t *srl, const void *item, int size)

 {
        int left = srl->bufsize - (srl->cursor - srl->buffer);
 {
        int left = srl->bufsize - (srl->cursor - srl->buffer);

+

        if (left < size + sizeof(short)) return left - sizeof(short);
        *((short *)srl->cursor) = size;
        if (left < size + sizeof(short)) return left - sizeof(short);
        *((short *)srl->cursor) = size;

-       srl->cursor += 2;
+       srl->cursor += sizeof(short);

        if (size) memcpy(srl->cursor, item, size);
        srl->cursor += size;
        return size;
 }
 
        if (size) memcpy(srl->cursor, item, size);
        srl->cursor += size;
        return size;
 }
 

-int serial_get(serializer_t *srl, void *item, int bufsize)
+/* return 0 on success, -1 on wrong encoding (item longer than space left) */
+int serial_get(serializer_t *srl, void **item, int *size)

 {
 {

+       int left = srl->bufsize - (srl->cursor - srl->buffer);

        short isize = *((short *)srl->cursor);
        short isize = *((short *)srl->cursor);

-       if (isize > bufsize || isize == 0) return isize;
+
+       if (isize + sizeof(short) > left) return -1;

        srl->cursor += sizeof(short);
        srl->cursor += sizeof(short);

-       memcpy(item, srl->cursor, isize);
+       *item = srl->cursor;
+       *size = isize;

        srl->cursor += isize;
        srl->cursor += isize;

-       return isize;
+       return 0;

 }
 
 int serial_size(serializer_t *srl)
 }
 
 int serial_size(serializer_t *srl)