X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=serial.c;h=2b81bebca52f1048a1ac1b08263e846abc4b226d;hp=809ea7ce108a41e0d0e942ce58980291870ea6b8;hb=eaaae6374b2e8949fd2d13b45e3b9cbdb95f5299;hpb=1fb61b04544488148032c06475042aec167d6097 diff --git a/serial.c b/serial.c index 809ea7c..2b81beb 100644 --- a/serial.c +++ b/serial.c @@ -1,3 +1,26 @@ +/* +Copyright (c) 2013 Eugene Crosser + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation + would be appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. +*/ + #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -20,6 +43,7 @@ void serial_switch(serializer_t *srl, void *buffer, int size) srl->cursor = buffer + used; } +/* 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); @@ -32,17 +56,18 @@ int serial_put(serializer_t *srl, const void *item, int 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); - if (isize > bufsize) return isize; if (isize + sizeof(short) > left) return -1; srl->cursor += sizeof(short); - if (isize) memcpy(item, srl->cursor, isize); + *item = srl->cursor; + *size = isize; srl->cursor += isize; - return isize; + return 0; } int serial_size(serializer_t *srl)