Andreas Krennmair:

[apps/madmutt.git] / pgppacket.c

diff --git a/pgppacket.c b/pgppacket.c
index 8a4e11e..3fd6ff3 100644 (file)
--- a/pgppacket.c
+++ b/pgppacket.c
@@ -39,15 +39,13 @@ static size_t plen = 0;
 
 static int read_material (size_t material, size_t * used, FILE * fp)
 {
-  if (*used + material >= plen)
-  {
+  if (*used + material >= plen) {
     unsigned char *p;
     size_t nplen;
 
     nplen = *used + material + CHUNKSIZE;
 
-    if (!(p = realloc (pbuf, nplen)))  /* __MEM_CHECKED__ */
-    {
+    if (!(p = realloc (pbuf, nplen))) { /* __MEM_CHECKED__ */
       perror ("realloc");
       return -1;
     }
@@ -55,8 +53,7 @@ static int read_material (size_t material, size_t * used, FILE * fp)
     pbuf = p;
   }
 
-  if (fread (pbuf + *used, 1, material, fp) < material)
-  {
+  if (fread (pbuf + *used, 1, material, fp) < material) {
     perror ("fread");
     return -1;
   }
@@ -75,82 +72,73 @@ unsigned char *pgp_read_packet (FILE * fp, size_t * len)
 
   startpos = ftell (fp);
 
-  if (!plen)
-  {
+  if (!plen) {
     plen = CHUNKSIZE;
     pbuf = safe_malloc (plen);
   }
 
-  if (fread (&ctb, 1, 1, fp) < 1)
-  {
+  if (fread (&ctb, 1, 1, fp) < 1) {
     if (!feof (fp))
       perror ("fread");
     goto bail;
   }
 
-  if (!(ctb & 0x80))
-  {
+  if (!(ctb & 0x80)) {
     goto bail;
   }
 
-  if (ctb & 0x40)              /* handle PGP 5.0 packets. */
-  {
+  if (ctb & 0x40) {             /* handle PGP 5.0 packets. */
     int partial = 0;
+
     pbuf[0] = ctb;
     used++;
 
-    do
-    {
-      if (fread (&b, 1, 1, fp) < 1)
-      {
-       perror ("fread");
-       goto bail;
+    do {
+      if (fread (&b, 1, 1, fp) < 1) {
+        perror ("fread");
+        goto bail;
       }
 
-      if (b < 192)
-      {
-       material = b;
-       partial = 0;
-       /* material -= 1; */
+      if (b < 192) {
+        material = b;
+        partial = 0;
+        /* material -= 1; */
       }
-      else if (192 <= b && b <= 223)
-      {
-       material = (b - 192) * 256;
-       if (fread (&b, 1, 1, fp) < 1)
-       {
-         perror ("fread");
-         goto bail;
-       }
-       material += b + 192;
-       partial = 0;
-       /* material -= 2; */
+      else if (192 <= b && b <= 223) {
+        material = (b - 192) * 256;
+        if (fread (&b, 1, 1, fp) < 1) {
+          perror ("fread");
+          goto bail;
+        }
+        material += b + 192;
+        partial = 0;
+        /* material -= 2; */
       }
-      else if (b < 255)
-      {
-       material = 1 << (b & 0x1f);
-       partial = 1;
-       /* material -= 1; */
+      else if (b < 255) {
+        material = 1 << (b & 0x1f);
+        partial = 1;
+        /* material -= 1; */
       }
       else
-       /* b == 255 */
+        /* b == 255 */
       {
-       unsigned char buf[4];
-       if (fread (buf, 4, 1, fp) < 1)
-       {
-         perror ("fread");
-         goto bail;
-       }
-       /*assert( sizeof(material) >= 4 ); */
-       material = buf[0] << 24;
-       material |= buf[1] << 16;
-       material |= buf[2] << 8;
-       material |= buf[3];
-       partial = 0;
-       /* material -= 5; */
+        unsigned char buf[4];
+
+        if (fread (buf, 4, 1, fp) < 1) {
+          perror ("fread");
+          goto bail;
+        }
+        /*assert( sizeof(material) >= 4 ); */
+        material = buf[0] << 24;
+        material |= buf[1] << 16;
+        material |= buf[2] << 8;
+        material |= buf[3];
+        partial = 0;
+        /* material -= 5; */
       }
 
       if (read_material (material, &used, fp) == -1)
-       goto bail;
+        goto bail;
 
     }
     while (partial);
@@ -159,49 +147,46 @@ unsigned char *pgp_read_packet (FILE * fp, size_t * len)
     /* Old-Style PGP */
   {
     int bytes = 0;
+
     pbuf[0] = 0x80 | ((ctb >> 2) & 0x0f);
     used++;
 
-    switch (ctb & 0x03)
-    {
-      case 0:
+    switch (ctb & 0x03) {
+    case 0:
       {
-       if (fread (&b, 1, 1, fp) < 1)
-       {
-         perror ("fread");
-         goto bail;
-       }
-
-       material = b;
-       break;
+        if (fread (&b, 1, 1, fp) < 1) {
+          perror ("fread");
+          goto bail;
+        }
+
+        material = b;
+        break;
       }
 
-      case 1:
+    case 1:
       bytes = 2;
 
-      case 2:
+    case 2:
       {
-       int i;
+        int i;
 
-       if (!bytes)
-         bytes = 4;
+        if (!bytes)
+          bytes = 4;
 
-       material = 0;
+        material = 0;
 
-       for (i = 0; i < bytes; i++)
-       {
-         if (fread (&b, 1, 1, fp) < 1)
-         {
-           perror ("fread");
-           goto bail;
-         }
+        for (i = 0; i < bytes; i++) {
+          if (fread (&b, 1, 1, fp) < 1) {
+            perror ("fread");
+            goto bail;
+          }
 
-         material = (material << 8) + b;
-       }
-       break;
+          material = (material << 8) + b;
+        }
+        break;
       }
 
-      default:
+    default:
       goto bail;
     }
 
@@ -225,4 +210,3 @@ void pgp_release_packet (void)
   plen = 0;
   FREE (&pbuf);
 }
-