Remove unneeded incomplete, member-less `struct tag;'.

[nmh] / uip / dropsbr.c

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index bf16b60f3e11d40e1f2cbf1f79d9e115aaeea383..a02e29c48fda1a28ac3ee6ed55682bf56c64056c 100644 (file)
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -1,6 +1,4 @@
-
-/*
- * dropsbr.c -- create/read/manipulate mail drops
+/* dropsbr.c -- create/read/manipulate mail drops

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -272,7 +270,7 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
     int i, j, size;
     off_t start, stop;
     long pos;
     int i, j, size;
     off_t start, stop;
     long pos;

-    char *cp, buffer[BUFSIZ];
+    char *cp, buffer[BUFSIZ + 1];   /* Space for NUL. */

     FILE *fp;
 
     pos = (long) lseek (md, (off_t) 0, SEEK_CUR);
     FILE *fp;
 
     pos = (long) lseek (md, (off_t) 0, SEEK_CUR);


@@ -295,10 +293,8 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
                        size++;
            }
                    
                        size++;
            }
                    

-           while ((i = read (fd, buffer, sizeof(buffer))) > 0) {
-                /* valgrind noticed that stringdex depends on null
-                   termination. */
-                buffer[i] = '\0';
+           while ((i = read (fd, buffer, sizeof buffer - 1)) > 0) {
+                buffer[i] = '\0';   /* Terminate for stringdex(). */

 
                for ( ; (j = stringdex (mmdlm1, buffer)) >= 0; buffer[j]++)
                    continue;
 
                for ( ; (j = stringdex (mmdlm1, buffer)) >= 0; buffer[j]++)
                    continue;


@@ -351,7 +347,7 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
                     * back to "From ".
                     */
                     if (has_prefix(buffer, "Return-Path:")) {
                     * back to "From ".
                     */
                     if (has_prefix(buffer, "Return-Path:")) {

-                       char tmpbuffer[BUFSIZ];
+                       char tmpbuffer[sizeof buffer];

                        char *tp, *ep, *fp;
 
                        strncpy(tmpbuffer, buffer, sizeof(tmpbuffer));
                        char *tp, *ep, *fp;
 
                        strncpy(tmpbuffer, buffer, sizeof(tmpbuffer));


@@ -366,7 +362,7 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
                         * Change the "X-Envelope-From:" field
                         * (if first line) back to "From ".
                         */
                         * Change the "X-Envelope-From:" field
                         * (if first line) back to "From ".
                         */

-                       char tmpbuffer[BUFSIZ];
+                       char tmpbuffer[sizeof buffer];

                        char *ep;
 
                        strncpy(tmpbuffer, buffer, sizeof(tmpbuffer));
                        char *ep;
 
                        strncpy(tmpbuffer, buffer, sizeof(tmpbuffer));


@@ -377,7 +373,7 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
                         * If there is already a "From " line,
                         * then leave it alone.  Else we add one.
                         */
                         * If there is already a "From " line,
                         * then leave it alone.  Else we add one.
                         */

-                       char tmpbuffer[BUFSIZ];
+                       char tmpbuffer[sizeof buffer];

                        char *tp, *ep;
 
                        strncpy(tmpbuffer, buffer, sizeof(tmpbuffer));
                        char *tp, *ep;
 
                        strncpy(tmpbuffer, buffer, sizeof(tmpbuffer));