Changeset 4c0fe8

Timestamp:

09/20/09 17:11:04 (3 years ago)

Author:

J. A. Bezemer <J.A.Bezemer@…>

Branches:

master

Children:

05a23a

Parents:

fb1747

git-author:

J. A. Bezemer <J.A.Bezemer@…> (09/20/09 17:11:04)

git-committer:

Erik Ekman <erik@…> (02/04/12 20:34:03)

Message:

add txt read/write #75

Location:

src

Files:

• read.c (modified) (2 diffs)
• read.h (modified) (2 diffs)

src/read.c

@@ -127 +127 @@
 
 int
+readtxtbin(char *packet, char **src, size_t srcremain, char *dst, size_t dstremain)
+{
+        unsigned char *uc;
+        int tocopy;
+        int dstused = 0;
+
+        while (srcremain > 0)
+        {
+                uc = (unsigned char*) (*src);
+                tocopy = *uc;
+                (*src)++;
+                srcremain--;
+
+                if (tocopy > srcremain)
+                        return 0;       /* illegal, better have nothing */
+                if (tocopy > dstremain)
+                        return 0;       /* doesn't fit, better have nothing */
+
+                memcpy(dst, *src, tocopy);
+                dst += tocopy;
+                (*src) += tocopy;
+                srcremain -= tocopy;
+                dstremain -= tocopy;
+                dstused += tocopy;
+        }
+        return dstused;
+}
+
+int
 putname(char **buf, size_t buflen, const char *host)
 {
@@ -213 +242 @@
 }
 
+int
+puttxtbin(char **buf, size_t bufremain, char *from, size_t fromremain)
+{
+        unsigned char uc;
+        unsigned char *ucp = &uc;
+        char *cp = (char *) ucp;
+        int tocopy;
+        int bufused = 0;
+
+        while (fromremain > 0)
+        {
+                tocopy = fromremain;
+                if (tocopy > 252)
+                        tocopy = 252;   /* allow off-by-1s in caches etc */
+                if (tocopy + 1 > bufremain)
+                        return -1;      /* doesn't fit, better have nothing */
+
+                uc = tocopy;
+                **buf = *cp;
+                (*buf)++;
+                bufremain--;
+                bufused++;
+
+                memcpy(*buf, from, tocopy);
+                (*buf) += tocopy;
+                from += tocopy;
+                bufremain -= tocopy;
+                fromremain -= tocopy;
+                bufused += tocopy;
+        }
+        return bufused;
+}

src/read.h

@@ -22 +22 @@
 int readlong(char *, char **, uint32_t *);
 int readdata(char *, char **, char *, size_t);
+int readtxtbin(char *, char **, size_t, char *, size_t);
 
 int putname(char **, size_t, const char *);
@@ -28 +29 @@
 int putlong(char **, uint32_t);
 int putdata(char **, char *, size_t);
+int puttxtbin(char **, size_t, char *, size_t);
 
 #endif