Changeset 332

Timestamp:

01/10/06 18:28:47

Author:

ben

Message:

Add memory reader. Closes #31.

Files:

• openpgpsdk/trunk/Makefile (modified) (1 diff)
• openpgpsdk/trunk/examples/packet-dump.c (modified) (4 diffs)
• openpgpsdk/trunk/include/openpgpsdk/errors.h (modified) (1 diff)
• openpgpsdk/trunk/include/openpgpsdk/util.h (modified) (1 diff)
• openpgpsdk/trunk/src/util.c (modified) (2 diffs)

openpgpsdk/trunk/Makefile

@@ -35 +35 @@
-tags:
-        rm -f TAGS
-*.[ch]
+'*.[ch]'
-
-test::

openpgpsdk/trunk/examples/packet-dump.c

@@ -871 +871 @@
-    fprintf(stderr,"%s [-a] [-b] <file name>\n\n",pname);
-    fprintf(stderr,"-a\tRead armoured data\n"
-
+
+
-    exit(1);
-    }
@@ -882 +883 @@
-    int ch;
-    int fd;
+    ops_boolean_t buffer_read=ops_false;
+    unsigned char buffer[10240];
-
-    pname=argv[0];
-
-
+B
-        switch(ch)
-            {
@@ -895 +898 @@
-            setvbuf(stdout,NULL,_IONBF,0);
-            setvbuf(stderr,NULL,_IONBF,0);
+            break;
+
+        case 'B':
+            buffer_read=ops_true;
-            break;
-
@@ -919 +926 @@
-    ops_parse_cb_set(pinfo,callback,NULL);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if(armour)

openpgpsdk/trunk/include/openpgpsdk/errors.h

@@ -55 +55 @@
-
-#define OPS_SYSTEM_ERROR_1(err,code,syscall,fmt,arg)    do { ops_push_error(err,OPS_E_SYSTEM_ERROR,errno,__FILE__,__LINE__,syscall); ops_push_error(err,code,0,__FILE__,__LINE__,fmt,arg); } while(0)
+#define OPS_ERROR(err,code,fmt) do { ops_push_error(err,code,0,__FILE__,__LINE__,fmt); } while(0)
-#define OPS_ERROR_1(err,code,fmt,arg)   do { ops_push_error(err,code,0,__FILE__,__LINE__,fmt,arg); } while(0)
-

openpgpsdk/trunk/include/openpgpsdk/util.h

@@ -15 +15 @@
-void hexdump(const unsigned char *src,size_t length);
-void ops_reader_set_fd(ops_parse_info_t *pinfo,int fd);
+void ops_reader_set_memory(ops_parse_info_t *pinfo,const void *buffer,
+                           size_t length);
-
-/* typesafe deconstification */

openpgpsdk/trunk/src/util.c

@@ -160 +160 @@
-    }
-
+typedef struct
+    {
+    const unsigned char *buffer;
+    size_t length;
+    size_t offset;
+    } reader_mem_arg_t;
+
+static ops_reader_ret_t reader_mem(unsigned char *dest,unsigned *plength,
+                                   ops_reader_flags_t flags,
+                                   ops_error_t **errors,
+                                   ops_reader_info_t *rinfo,
+                                   ops_parse_cb_info_t *cbinfo)
+    {
+    reader_mem_arg_t *arg=ops_reader_get_arg(rinfo);
+    unsigned n;
+
+    OPS_USED(cbinfo);
+
+    if(arg->offset+*plength > arg->length)
+        n=arg->length-arg->offset;
+    else
+        n=*plength;
+
+    if(n == 0)
+        return OPS_R_EOF;
+
+    memcpy(dest,arg->buffer+arg->offset,n);
+    arg->offset+=n;
+
+    if(n != *plength)
+        {
+        if(flags&OPS_RETURN_LENGTH)
+            {
+            *plength=n;
+            return OPS_R_PARTIAL_READ;
+            }
+        else
+            {
+            OPS_ERROR(errors,OPS_E_R_EARLY_EOF,"memory block");
+            return OPS_R_EARLY_EOF;
+            }
+        }
+
+    return OPS_R_OK;
+    }
+
+// Note that its the caller's responsibility to ensure buffer continues to
+// exist
+void ops_reader_set_memory(ops_parse_info_t *pinfo,const void *buffer,
+                           size_t length)
+    {
+    reader_mem_arg_t *arg=malloc(sizeof *arg);
+
+    arg->buffer=buffer;
+    arg->length=length;
+    ops_reader_set(pinfo,reader_mem,arg);
+    }
+
-void *ops_mallocz(size_t n)
-    {
@@ -168 +226 @@
-    return m;
-    }
+