Reformated comments and long lines

[mmh] / uip / annosbr.c

diff --git a/uip/annosbr.c b/uip/annosbr.c
index 427daba..db74870 100644 (file)
--- a/uip/annosbr.c
+++ b/uip/annosbr.c
@@ -1,10 +1,10 @@
 /*
 /*

- * annosbr.c -- prepend annotation to messages
- *
- * This code is Copyright (c) 2002, by the authors of nmh.  See the
- * COPYRIGHT file in the root directory of the nmh distribution for
- * complete copyright information.
- */
+** annosbr.c -- prepend annotation to messages
+**
+** This code is Copyright (c) 2002, by the authors of nmh.  See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+*/

 
 #include <h/mh.h>
 #include <h/tws.h>
 
 #include <h/mh.h>
 #include <h/tws.h>

@@ -15,15 +15,15 @@
 
 
 /*
 
 
 /*

- * static prototypes
- */
+** static prototypes
+*/

 static int annosbr (int, char *, char *, char *, int, int, int, int);
 
 /*
 static int annosbr (int, char *, char *, char *, int, int, int, int);
 
 /*

- * This "local" global and the annopreserve() function are a hack that
- * allows additional functionality to be added to anno without piling
- * on yet another annotate() argument.
- */
+** This "local" global and the annopreserve() function are a hack that
+** allows additional functionality to be added to anno without piling
+** on yet another annotate() argument.
+*/

 
 /* set to preserve access and modification times on annotated message */
 static int preserve_actime_and_modtime = 0;
 
 /* set to preserve access and modification times on annotated message */
 static int preserve_actime_and_modtime = 0;

@@ -67,11 +67,11 @@ annotate (char *file, char *comp, char *text, int inplace, int datesw,
 }
 
 /*
 }
 
 /*

- *  Produce a listing of all header fields (annotations) whose field
- *  name matches comp.  Number the listing if number is set.  Treate the
- *  field bodies as path names and just output the last component unless
- *  text is non-NULL.  We don't care what text is set to.
- */
+**  Produce a listing of all header fields (annotations) whose field
+**  name matches comp.  Number the listing if number is set.  Treate the
+**  field bodies as path names and just output the last component unless
+**  text is non-NULL.  We don't care what text is set to.
+*/

 
 void
 annolist(char *file, char *comp, char *text, int number)
 
 void
 annolist(char *file, char *comp, char *text, int number)

@@ -90,26 +90,26 @@ annolist(char *file, char *comp, char *text, int number)
                adios(file, "unable to open");
 
        /*
                adios(file, "unable to open");
 
        /*

-        *  Allocate a buffer to hold the header components as they're read in.
-        *  This buffer might need to be quite large, so we grow it as needed.
-        */
+       **  Allocate a buffer to hold the header components as they're read in.
+       **  This buffer might need to be quite large, so we grow it as needed.
+       */

        field = (char *)mh_xmalloc(field_size = 256);
 
        /*
        field = (char *)mh_xmalloc(field_size = 256);
 
        /*

-        *  Get the length of the field name since we use it often.
-        */
+       **  Get the length of the field name since we use it often.
+       */

        length = strlen(comp);
 
        count = 0;
 
        do {
                /*
        length = strlen(comp);
 
        count = 0;
 
        do {
                /*

-                * Get a line from the input file, growing the field buffer
-                * as needed.  We do this so that we can fit an entire line
-                * in the buffer making it easy to do a string comparison
-                * on both the field name and the field body which might be
-                * a long path name.
-                */
+               ** Get a line from the input file, growing the field buffer
+               ** as needed.  We do this so that we can fit an entire line
+               ** in the buffer making it easy to do a string comparison
+               ** on both the field name and the field body which might be
+               ** a long path name.
+               */

 
                for (n = 0, cp = field; (c = getc(fp)) != EOF; *cp++ = c) {
                        if (c == '\n' && (c = getc(fp)) != ' ' && c != '\t') {
 
                for (n = 0, cp = field; (c = getc(fp)) != EOF; *cp++ = c) {
                        if (c == '\n' && (c = getc(fp)) != ' ' && c != '\t') {

@@ -125,10 +125,7 @@ annolist(char *file, char *comp, char *text, int number)
                        }
                }
 
                        }
                }
 

-               /*
-                * NUL-terminate the field..
-                */
-
+               /* NUL-terminate the field */

                *cp = '\0';
 
                if (strncasecmp(field, comp, length) == 0 && field[length] == ':') {
                *cp = '\0';
 
                if (strncasecmp(field, comp, length) == 0 && field[length] == ':') {

@@ -146,22 +143,17 @@ annolist(char *file, char *comp, char *text, int number)
 
        } while (*field != '\0' && *field != '-');
 
 
        } while (*field != '\0' && *field != '-');
 

-       /*
-        * Clean up.
-        */
-
+       /* Clean up. */

        free(field);
        free(field);

-

        (void)fclose(fp);
 
        return;
 }
 
 /*
        (void)fclose(fp);
 
        return;
 }
 
 /*

- * Set the preserve-times flag.  This hack eliminates the need for an
- * additional argument to annotate().
- */
-
+** Set the preserve-times flag.  This hack eliminates the need for an
+** additional argument to annotate().
+*/

 void
 annopreserve(int preserve)
 {
 void
 annopreserve(int preserve)
 {

@@ -192,13 +184,13 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace,
        chmod (tmpfil, mode);
 
        /*
        chmod (tmpfil, mode);
 
        /*

-        * We're going to need to copy some of the message file to the
-        * temporary file while examining the contents.  Convert the
-        * message file descriptor to a file pointer since it's a lot
-        * easier and more efficient to use stdio for this.  Also allocate
-        * a buffer to hold the header components as they're read in.
-        * This buffer is grown as needed later.
-        */
+       ** We're going to need to copy some of the message file to the
+       ** temporary file while examining the contents.  Convert the
+       ** message file descriptor to a file pointer since it's a lot
+       ** easier and more efficient to use stdio for this.  Also allocate
+       ** a buffer to hold the header components as they're read in.
+       ** This buffer is grown as needed later.
+       */

 
        if (delete >= -1 || append != 0) {
                if ((fp = fdopen(fd, "r")) == (FILE *)0)
 
        if (delete >= -1 || append != 0) {
                if ((fp = fdopen(fd, "r")) == (FILE *)0)

@@ -208,54 +200,50 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace,
        }
 
        /*
        }
 
        /*

-        * We're trying to delete a header field (annotation )if the
-        * delete flag is not -2 or less.  A  value greater than zero
-        * means that we're deleting the nth header field that matches
-        * the field (component) name.  A value of zero means that
-        * we're deleting the first field in which both the field name
-        * matches the component name and the field body matches the text.
-        * The text is matched in its entirety if it begins with a slash;
-        * otherwise the text is matched against whatever portion of the
-        * field body follows the last slash.  This allows matching of
-        * both absolute and relative path names.  This is because this
-        * functionality was added to support attachments.  It might be
-        * worth having a separate flag to indicate path name matching
-        * to make it more general.  A value of -1 means to delete all
-        * matching fields.
-        */
+       ** We're trying to delete a header field (annotation )if the
+       ** delete flag is not -2 or less.  A  value greater than zero
+       ** means that we're deleting the nth header field that matches
+       ** the field (component) name.  A value of zero means that
+       ** we're deleting the first field in which both the field name
+       ** matches the component name and the field body matches the text.
+       ** The text is matched in its entirety if it begins with a slash;
+       ** otherwise the text is matched against whatever portion of the
+       ** field body follows the last slash.  This allows matching of
+       ** both absolute and relative path names.  This is because this
+       ** functionality was added to support attachments.  It might be
+       ** worth having a separate flag to indicate path name matching
+       ** to make it more general.  A value of -1 means to delete all
+       ** matching fields.
+       */

 
        if (delete >= -1) {
 
        if (delete >= -1) {

-               /*
-                *  Get the length of the field name since we use it often.
-                */
-
+               /* Get the length of the field name since we use it often. */

                length = strlen(comp);
 
                /*
                length = strlen(comp);
 
                /*

-                *  Initialize the field counter.  This is only used if
-                *  we're deleting by number.
-                */
-
+               **  Initialize the field counter.  This is only used if
+               **  we're deleting by number.
+               */

                count = 0;
 
                /*
                count = 0;
 
                /*

-                *  Copy lines from the input file to the temporary file
-                *  until we either find the one that we're looking
-                *  for (which we don't copy) or we reach the end of
-                *  the headers.  Both a blank line and a line beginning
-                *  with a - terminate the headers so that we can handle
-                *  both drafts and RFC-2822 format messages.
-                */
+               **  Copy lines from the input file to the temporary file
+               **  until we either find the one that we're looking
+               **  for (which we don't copy) or we reach the end of
+               **  the headers.  Both a blank line and a line beginning
+               **  with a - terminate the headers so that we can handle
+               **  both drafts and RFC-2822 format messages.
+               */

 
                do {
                        /*
 
                do {
                        /*

-                        * Get a line from the input file, growing the
-                        * field buffer as needed.  We do this so that
-                        * we can fit an entire line in the buffer making
-                        * it easy to do a string comparison on both the
-                        * field name and the field body which might be
-                        * a long path name.
-                        */
+                       ** Get a line from the input file, growing the
+                       ** field buffer as needed.  We do this so that
+                       ** we can fit an entire line in the buffer making
+                       ** it easy to do a string comparison on both the
+                       ** field name and the field body which might be
+                       ** a long path name.
+                       */

 
                        for (n = 0, cp = field; (c = getc(fp)) != EOF; *cp++ = c) {
                                if (c == '\n' && (c = getc(fp)) != ' ' && c != '\t') {
 
                        for (n = 0, cp = field; (c = getc(fp)) != EOF; *cp++ = c) {
                                if (c == '\n' && (c = getc(fp)) != ' ' && c != '\t') {

@@ -271,44 +259,41 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace,
                                }
                        }
 
                                }
                        }
 

-                       /*
-                        * NUL-terminate the field..
-                        */
-
+                       /* NUL-terminate the field */

                        *cp = '\0';
 
                        /*
                        *cp = '\0';
 
                        /*

-                        * Check for a match on the field name.  We delete
-                        * the line by not copying it to the temporary
-                        * file if
-                        *
-                        *  o  The delete flag is 0, meaning that we're
-                        *     going to delete the first matching
-                        *     field, and the text is NULL meaning that
-                        *     we don't care about the field body.
-                        *
-                        *  o  The delete flag is 0, meaning that we're
-                        *     going to delete the first matching
-                        *     field, and the text begins with a / meaning
-                        *     that we're looking for a full path name,
-                        *     and the text matches the field body.
-                        *
-                        *  o  The delete flag is 0, meaning that we're
-                        *     going to delete the first matching
-                        *     field, the text does not begin with a /
-                        *     meaning that we're looking for the last
-                        *     path name component, and the last path
-                        *     name component matches the text.
-                        *
-                        *  o  The delete flag is positive meaning that
-                        *     we're going to delete the nth field
-                        *     with a matching field name, and this is
-                        *     the nth matching field name.
-                        *
-                        *  o  The delete flag is -1 meaning that we're
-                        *     going to delete all fields with a
-                        *     matching field name.
-                        */
+                       ** Check for a match on the field name.  We delete
+                       ** the line by not copying it to the temporary
+                       ** file if
+                       **
+                       **  o  The delete flag is 0, meaning that we're
+                       **     going to delete the first matching
+                       **     field, and the text is NULL meaning that
+                       **     we don't care about the field body.
+                       **
+                       **  o  The delete flag is 0, meaning that we're
+                       **     going to delete the first matching
+                       **     field, and the text begins with a / meaning
+                       **     that we're looking for a full path name,
+                       **     and the text matches the field body.
+                       **
+                       **  o  The delete flag is 0, meaning that we're
+                       **     going to delete the first matching
+                       **     field, the text does not begin with a /
+                       **     meaning that we're looking for the last
+                       **     path name component, and the last path
+                       **     name component matches the text.
+                       **
+                       **  o  The delete flag is positive meaning that
+                       **     we're going to delete the nth field
+                       **     with a matching field name, and this is
+                       **     the nth matching field name.
+                       **
+                       **  o  The delete flag is -1 meaning that we're
+                       **     going to delete all fields with a
+                       **     matching field name.
+                       */

 
                        if (strncasecmp(field, comp, length) == 0 && field[length] == ':') {
                                if (delete == 0) {
 
                        if (strncasecmp(field, comp, length) == 0 && field[length] == ':') {
                                if (delete == 0) {

@@ -339,9 +324,9 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace,
                        }
 
                        /*
                        }
 
                        /*

-                        * This line wasn't a match so copy it to the
-                        * temporary file.
-                        */
+                       ** This line wasn't a match so copy it to the
+                       ** temporary file.
+                       */

 
                        if ((n = fputs(field, tmp)) == EOF || (c == '\n' && fputc('\n', tmp) == EOF))
                                adios(NULL, "unable to write temporary file.");
 
                        if ((n = fputs(field, tmp)) == EOF || (c == '\n' && fputc('\n', tmp) == EOF))
                                adios(NULL, "unable to write temporary file.");

@@ -349,25 +334,24 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace,
                } while (*field != '\0' && *field != '-');
 
                /*
                } while (*field != '\0' && *field != '-');
 
                /*

-                *  Get rid of the field buffer because we're done with it.
-                */
+               **  Get rid of the field buffer because we're done with it.
+               */

 
                free((void *)field);
 
                free((void *)field);

-       }

 
 

-       else {
+       } else {

                /*
                /*

-                *  Find the end of the headers before adding the
-                *  annotations if we're appending instead of the default
-                *  prepending.  A special check for no headers is needed
-                *  if appending.
-                */
+               **  Find the end of the headers before adding the
+               **  annotations if we're appending instead of the default
+               **  prepending.  A special check for no headers is needed
+               **  if appending.
+               */

 
                if (append) {
                        /*
 
                if (append) {
                        /*

-                        * Copy lines from the input file to the temporary
-                        * file until we reach the end of the headers.
-                        */
+                       ** Copy lines from the input file to the temporary
+                       ** file until we reach the end of the headers.
+                       */

 
                        if ((c = getc(fp)) == '\n')
                                rewind(fp);
 
                        if ((c = getc(fp)) == '\n')
                                rewind(fp);

@@ -408,11 +392,11 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace,
        fflush (tmp);
 
        /*
        fflush (tmp);
 
        /*

-        * We've been messing with the input file position.  Move the
-        * input file descriptor to the current place in the file
-        * because the stock data copying routine uses the descriptor,
-        * not the pointer.
-        */
+       ** We've been messing with the input file position.  Move the
+       ** input file descriptor to the current place in the file
+       ** because the stock data copying routine uses the descriptor,
+       ** not the pointer.
+       */

 
        if (append || delete >= -1) {
                if (lseek(fd, (off_t)ftell(fp), SEEK_SET) == (off_t)-1)
 
        if (append || delete >= -1) {
                if (lseek(fd, (off_t)ftell(fp), SEEK_SET) == (off_t)-1)

@@ -429,10 +413,10 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace,
                lseek (fd, (off_t) 0, SEEK_SET);
 
                /*
                lseek (fd, (off_t) 0, SEEK_SET);
 
                /*

-                *  We're making the file shorter if we're deleting a
-                *  header field so the file has to be truncated or it
-                *  will contain garbage.
-                */
+               **  We're making the file shorter if we're deleting a
+               **  header field so the file has to be truncated or it
+               **  will contain garbage.
+               */

 
                if (delete >= -1 && ftruncate(fd, 0) == -1)
                        adios(tmpfil, "unable to truncate.");
 
                if (delete >= -1 && ftruncate(fd, 0) == -1)
                        adios(tmpfil, "unable to truncate.");

@@ -461,10 +445,10 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace,
        }
 
        /*
        }
 
        /*

-        * Close the delete file so that we don't run out of file pointers if
-        * we're doing piles of files.  Note that this will make the close() in
-        * lkclose() fail, but that failure is ignored so it's not a problem.
-        */
+       ** Close the delete file so that we don't run out of file pointers if
+       ** we're doing piles of files.  Note that this will make the close() in
+       ** lkclose() fail, but that failure is ignored so it's not a problem.
+       */

 
        if (delete >= -1)
                (void)fclose(fp);
 
        if (delete >= -1)
                (void)fclose(fp);