Make input stream entirely opaque.

CVS patchset: 7266
CVS date: 2004/05/28 02:41:00

diff --git a/rpmio/sexp/sexp-input.c b/rpmio/sexp/sexp-input.c
index 5f92c51..9225c2c 100644 (file)
--- a/rpmio/sexp/sexp-input.c
+++ b/rpmio/sexp/sexp-input.c
@@ -8,6 +8,16 @@
 #include "sexp.h"
 
 /*@access sexpInputStream @*/
+struct sexpInputStream_s {
+  int nextChar;        /* character currently being scanned */
+  int byteSize;        /* 4 or 6 or 8 == currently scanning mode */
+  int bits;            /* Bits waiting to be used */
+  int nBits;           /* number of such bits waiting to be used */
+  void (*getChar)();
+  int count;           /* number of 8-bit characters output by getChar */
+/*@shared@*/ /*@relnull@*/
+  FILE *inputFile;     /* where to get input, if not stdin */
+};
 
 /*@access sexpList @*/
 /*@access sexpString @*/
@@ -143,73 +153,103 @@ void changeInputByteSize(sexpInputStream is, int newByteSize)
  * This code handles 4-bit/6-bit/8-bit channels.
  */
 void getChar(sexpInputStream is)
-{ int c;
-  if (is->nextChar == EOF)
-    { is->byteSize = 8;
-      return;
+{
+    int c;
+
+    if (is->nextChar == EOF) {
+       is->byteSize = 8;
+       return;
     }
-  while (TRUE)
-    { c = is->nextChar = fgetc(is->inputFile);
-      if (c == EOF) return;
-      if ((is->byteSize == 6 && (c == '|' || c == '}'))
-         || (is->byteSize == 4 && (c == '#')))
-       /* end of region reached; return terminating character, after
-          checking for unused bits */
-       { if (is->nBits>0 && (((1<<is->nBits)-1) & is->bits) != 0)
-           ErrorMessage(WARNING,
+
+    while (TRUE) {
+       c = is->nextChar = fgetc(is->inputFile);
+       if (c == EOF) return;
+       if ((is->byteSize == 6 && (c == '|' || c == '}'))
+        || (is->byteSize == 4 && (c == '#')))
+       {
+           /* end of region reached; return terminating character, after
+              checking for unused bits */
+           if (is->nBits>0 && (((1<<is->nBits)-1) & is->bits) != 0)
+               ErrorMessage(WARNING,
                         "%d-bit region ended with %d unused bits left-over",
                         is->byteSize,is->nBits);
-         changeInputByteSize(is,8);
-         return;
+           changeInputByteSize(is,8);
+           return;
        }
-      else if (is->byteSize != 8 && isWhiteSpace(c))
-       {} /* ignore white space in hex and base64 regions */
-      else if (is->byteSize == 6 && c == '=')
-       {} /* ignore equals signs in base64 regions */
-      else if (is->byteSize==8)
-       {
-         is->count++;
-         return;
+       else if (is->byteSize != 8 && isWhiteSpace(c))
+           {} /* ignore white space in hex and base64 regions */
+       else if (is->byteSize == 6 && c == '=')
+           {} /* ignore equals signs in base64 regions */
+       else if (is->byteSize==8) {
+           is->count++;
+           return;
        }
-      else if (is->byteSize<8)
-       { is->bits = is->bits << is->byteSize;
-         is->nBits += is->byteSize;
-         if (is->byteSize == 6 && isBase64Digit(c))
-           is->bits = is->bits | base64value[c];
-         else if (is->byteSize == 4 && isHexDigit(c))
-           is->bits = is->bits | hexvalue[c];
-         else
-           ErrorMessage(ERROR, "character %c found in %d-bit coding region",
-                (int) is->nextChar, is->byteSize);
-         if (is->nBits >= 8)
-           { is->nextChar = (is->bits >> (is->nBits-8)) & 0xFF;
-             is->nBits -= 8;
-             is->count++;
-             return;
+       else if (is->byteSize<8) {
+           is->bits = is->bits << is->byteSize;
+           is->nBits += is->byteSize;
+           if (is->byteSize == 6 && isBase64Digit(c))
+               is->bits = is->bits | base64value[c];
+           else if (is->byteSize == 4 && isHexDigit(c))
+               is->bits = is->bits | hexvalue[c];
+           else
+               ErrorMessage(ERROR, "character %c found in %d-bit coding region",
+                       (int) is->nextChar, is->byteSize);
+           if (is->nBits >= 8) {
+               is->nextChar = (is->bits >> (is->nBits-8)) & 0xFF;
+               is->nBits -= 8;
+               is->count++;
+               return;
            }
        }
     }
 }
 
+void sexpIFgetc(sexpInputStream is)
+{
+    is->getChar(is);
+}
+
+int sexpIFpeek(sexpInputStream is)
+{
+    return is->nextChar;
+}
+
+int sexpIFeof(sexpInputStream is)
+{
+    return (is->nextChar == EOF ? 1 : 0);
+}
+
+void sexpIFpoke(sexpInputStream is, int c)
+{
+    is->nextChar = c;
+}
+
 /* newSexpInputStream()
  * Creates and initializes a new sexpInputStream object.
  * (Prefixes stream with one blank, and initializes stream
  *  so that it reads from standard input.)
  */
-sexpInputStream newSexpInputStream(void)
+sexpInputStream newSexpInputStream(const char * ifn, const char * fmode)
 {
-  sexpInputStream is;
-  is = (sexpInputStream) sexpAlloc(sizeof(*is));
-  is->nextChar = ' ';
-  is->getChar = getChar;
-  is->count = -1;
-  is->byteSize = 8;
-  is->bits = 0;
-  is->nBits = 0;
+    sexpInputStream is;
+    is = (sexpInputStream) sexpAlloc(sizeof(*is));
+    is->nextChar = ' ';
+    is->getChar = getChar;
+    is->count = -1;
+    is->byteSize = 8;
+    is->bits = 0;
+    is->nBits = 0;
+
+    if (ifn == NULL) {
 /*@-assignexpose@*/
-  is->inputFile = stdin;
+       is->inputFile = stdin;
 /*@=assignexpose@*/
-  return is;
+    } else {
+        is->inputFile = fopen(ifn, fmode);
+        if (is->inputFile == NULL)
+            ErrorMessage(ERROR, "Can't open input file %s.", ifn);
+    }
+    return is;
 }
 
 /*****************************************/

diff --git a/rpmio/sexp/sexp-main.c b/rpmio/sexp/sexp-main.c
index 2b893e2..ec6cdbd 100644 (file)
--- a/rpmio/sexp/sexp-main.c
+++ b/rpmio/sexp/sexp-main.c
@@ -110,7 +110,6 @@ int main(int argc, char **argv)
 
     initializeCharacterTables();
     initializeMemory();
-    is = newSexpInputStream();
     os = newSexpOutputStream();
     /* process switches */
     if (argc>1)
@@ -132,11 +131,8 @@ int main(int argc, char **argv)
        goto exit;
     }
 
-    if (ifn != NULL) {
-       is->inputFile = fopen(ifn, "r");
-       if (is->inputFile == NULL)
-           ErrorMessage(ERROR, "Can't open input file %s.", ifn);
-    }
+    is = newSexpInputStream(ifn, "r");
+
     if (ofn != NULL) {
        os->outputFile = fopen(ofn, "w");
        if (os->outputFile == NULL)
@@ -150,17 +146,17 @@ int main(int argc, char **argv)
        swc = TRUE;  /* must have some output format! */
 
     /* main loop */
-    if (swp == 0) is->getChar(is);
-    else is->nextChar = -2;  /* this is not EOF */
+    if (swp == 0) sexpIFgetc(is);
+    else sexpIFpoke(is, -2);  /* this is not EOF */
 
-    while (is->nextChar != EOF) {
+    while (!sexpIFeof(is)) {
        if (swp) { fprintf(stdout, "Input:\n"); (void) fflush(stdout); }
 
-       changeInputByteSize(is,8);
-       if (is->nextChar == -2) is->getChar(is);
+       changeInputByteSize(is, 8);
+       if (sexpIFpeek(is) == -2) sexpIFgetc(is);
 
        skipWhiteSpace(is);
-       if (is->nextChar == EOF) break;
+       if (sexpIFeof(is)) break;
 
        if (sws == FALSE)
            object = scanObject(is);

diff --git a/rpmio/sexp/sexp.h b/rpmio/sexp/sexp.h
index a033932..271c1c5 100644 (file)
--- a/rpmio/sexp/sexp.h
+++ b/rpmio/sexp/sexp.h
@@ -75,17 +75,6 @@ union sexpObject_u {
 /* In this implementation, it is the same as a list */
 typedef /*@abstract@*/ sexpList * sexpIter;
 
-struct sexpInputStream_s {
-  int nextChar;        /* character currently being scanned */
-  int byteSize;        /* 4 or 6 or 8 == currently scanning mode */
-  int bits;            /* Bits waiting to be used */
-  int nBits;           /* number of such bits waiting to be used */
-  void (*getChar)();
-  int count;           /* number of 8-bit characters output by getChar */
-/*@shared@*/ /*@relnull@*/
-  FILE *inputFile;     /* where to get input, if not stdin */
-};
-
 struct sexpOutputStream_s {
   long int column;          /* column where next character will go */
   long int maxcolumn;       /* max usable column, or -1 if no maximum */
@@ -188,7 +177,19 @@ void changeInputByteSize(sexpInputStream is, int newByteSize)
 void getChar(sexpInputStream is)
        /*@globals fileSystem @*/
        /*@modifies is, fileSystem @*/;
-sexpInputStream newSexpInputStream(void)
+
+/*@-globuse@*/
+void sexpIFgetc(sexpInputStream is)
+       /*@globals fileSystem @*/
+       /*@modifies is, fileSystem @*/;
+/*@=globuse@*/
+int sexpIFpeek(sexpInputStream is)
+       /*@*/;
+int sexpIFeof(sexpInputStream is)
+       /*@*/;
+void sexpIFpoke(sexpInputStream is, int c)
+       /*@modifies is @*/;
+sexpInputStream newSexpInputStream(/*@null@*/ const char * ifn, const char * fmode)
        /*@globals fileSystem @*/
        /*@modifies fileSystem @*/;
 void skipWhiteSpace(sexpInputStream is)