print_sw.c: Move interface to own file.

[nmh] / uip / annosbr.c

diff --git a/uip/annosbr.c b/uip/annosbr.c
index 08201244b2d78865f4f6b0f931b23b79959f4a1d..eafcbfc1bebd4b36af676d9c8c44a34b6c8ed91a 100644 (file)
--- a/uip/annosbr.c
+++ b/uip/annosbr.c
@@ -5,11 +5,12 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/tws.h>
-#include <h/utils.h>
-#include "../sbr/lock_file.h"
-#include "../sbr/m_mktemp.h"
+#include "h/mh.h"
+#include "sbr/error.h"
+#include "h/tws.h"
+#include "h/utils.h"
+#include "sbr/lock_file.h"
+#include "sbr/m_mktemp.h"

 #include <fcntl.h>
 #include <utime.h>
 
 #include <fcntl.h>
 #include <utime.h>
 


@@ -17,7 +18,7 @@
 /*
  * static prototypes
  */
 /*
  * static prototypes
  */

-static int annosbr (int, char *, char *, char *, int, int, int, int);
+static int annosbr (int, char *, char *, char *, bool, bool, int, bool);

 
 /*
  *     This "local" global and the annopreserve() function are a hack that allows additional
 
 /*
  *     This "local" global and the annopreserve() function are a hack that allows additional


@@ -27,7 +28,7 @@ static int annosbr (int, char *, char *, char *, int, int, int, int);
 static int     preserve_actime_and_modtime = 0;        /* set to preserve access and modification times on annotated message */
 
 int
 static int     preserve_actime_and_modtime = 0;        /* set to preserve access and modification times on annotated message */
 
 int

-annotate (char *file, char *comp, char *text, int inplace, int datesw, int delete, int append)
+annotate (char *file, char *comp, char *text, bool inplace, bool datesw, int delete, bool append)

 {
     int                        i, fd;
     struct utimbuf     b;
 {
     int                        i, fd;
     struct utimbuf     b;


@@ -52,7 +53,7 @@ annotate (char *file, char *comp, char *text, int inplace, int datesw, int delet
     }
 
     if (stat(file, &s) == -1) {
     }
 
     if (stat(file, &s) == -1) {

-       advise("can't get access and modification times for %s", file);
+        inform("can't get access and modification times for %s", file);

        preserve_actime_and_modtime = 0;
     }
 
        preserve_actime_and_modtime = 0;
     }
 


@@ -62,7 +63,7 @@ annotate (char *file, char *comp, char *text, int inplace, int datesw, int delet
     i = annosbr (fd, file, comp, text, inplace, datesw, delete, append);
 
     if (preserve_actime_and_modtime && utime(file, &b) == -1)
     i = annosbr (fd, file, comp, text, inplace, datesw, delete, append);
 
     if (preserve_actime_and_modtime && utime(file, &b) == -1)

-       advise("can't set access and modification times for %s", file);
+        inform("can't set access and modification times for %s", file);

 
     lkclosedata (fd, file);
     return i;
 
     lkclosedata (fd, file);
     return i;


@@ -96,7 +97,7 @@ annolist(char *file, char *comp, char *text, int number)
      *  This buffer might need to be quite large, so we grow it as needed.
      */
 
      *  This buffer might need to be quite large, so we grow it as needed.
      */
 

-    field = (char *)mh_xmalloc(field_size = 256);
+    field = 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.


@@ -121,7 +122,7 @@ annolist(char *file, char *comp, char *text, int number)
            }
 
            if (++n >= field_size - 1) {
            }
 
            if (++n >= field_size - 1) {

-               field = (char *) mh_xrealloc((void *)field, field_size += 256);
+               field = mh_xrealloc((void *)field, field_size += 256);

                
                cp = field + n - 1;
            }
                
                cp = field + n - 1;
            }


@@ -140,7 +141,7 @@ annolist(char *file, char *comp, char *text, int number)
            if (number)
                (void)printf("%d\t", ++count);
 
            if (number)
                (void)printf("%d\t", ++count);
 

-           if (text == NULL && (sp = strrchr(cp, '/')) != (char *)0)
+           if (text == NULL && (sp = strrchr(cp, '/')))

                cp = sp + 1;
 
             puts(cp);
                cp = sp + 1;
 
             puts(cp);


@@ -168,7 +169,7 @@ annopreserve(int preserve)
 }
 
 static int
 }
 
 static int

-annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, int delete, int append)
+annosbr (int fd, char *file, char *comp, char *text, bool inplace, bool datesw, int delete, bool append)

 {
     int mode, tmpfd;
     char *cp, *sp;
 {
     int mode, tmpfd;
     char *cp, *sp;


@@ -186,7 +187,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
     mode = fstat (fd, &st) != NOTOK ? (int) (st.st_mode & 0777) : m_gmprot ();
 
     if ((cp = m_mktemp2(file, "annotate", NULL, &tmp)) == NULL) {
     mode = fstat (fd, &st) != NOTOK ? (int) (st.st_mode & 0777) : m_gmprot ();
 
     if ((cp = m_mktemp2(file, "annotate", NULL, &tmp)) == NULL) {

-       adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+       die("unable to create temporary file");

     }
     strncpy (tmpfil, cp, sizeof(tmpfil));
     chmod (tmpfil, mode);
     }
     strncpy (tmpfil, cp, sizeof(tmpfil));
     chmod (tmpfil, mode);


@@ -199,11 +200,11 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
      * as they're read in.  This buffer is grown as needed later.
      */
 
      * as they're read in.  This buffer is grown as needed later.
      */
 

-    if (delete >= -1 || append != 0) {
+    if (delete >= -1 || append) {

        if ((fp = fdopen(fd, "r")) == NULL)
        if ((fp = fdopen(fd, "r")) == NULL)

-           adios(NULL, "unable to fdopen file.");
+           die("unable to fdopen file.");

 
 

-       field = (char *)mh_xmalloc(field_size = 256);
+       field = mh_xmalloc(field_size = 256);

     }
 
     /*
     }
 
     /*


@@ -257,7 +258,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
                }
 
                if (++n >= field_size - 1) {
                }
 
                if (++n >= field_size - 1) {

-                   field = (char *) mh_xrealloc((void *)field, field_size *= 2);
+                   field = mh_xrealloc((void *)field, field_size *= 2);

                
                    cp = field + n - 1;
                }
                
                    cp = field + n - 1;
                }


@@ -324,7 +325,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
             */
 
            if ((n = fputs(field, tmp)) == EOF || (c == '\n' && fputc('\n', tmp) == EOF))
             */
 
            if ((n = fputs(field, tmp)) == EOF || (c == '\n' && fputc('\n', tmp) == EOF))

-               adios(NULL, "unable to write temporary file.");
+               die("unable to write temporary file.");

 
        } while (*field != '\0' && *field != '-');
 
 
        } while (*field != '\0' && *field != '-');
 


@@ -332,7 +333,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
         *  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(field);

     }
 
     else {
     }
 
     else {


@@ -393,7 +394,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
      */
 
     if (fp && lseek(fd, (off_t)ftell(fp), SEEK_SET) == (off_t)-1)
      */
 
     if (fp && lseek(fd, (off_t)ftell(fp), SEEK_SET) == (off_t)-1)

-        adios(NULL, "can't seek.");
+        die("can't seek.");

 
     cpydata (fd, fileno (tmp), file, tmpfil);
     fclose (tmp);
 
     cpydata (fd, fileno (tmp), file, tmpfil);
     fclose (tmp);


@@ -402,7 +403,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
        if ((tmpfd = open (tmpfil, O_RDONLY)) == NOTOK)
            adios (tmpfil, "unable to open for re-reading");
 
        if ((tmpfd = open (tmpfil, O_RDONLY)) == NOTOK)
            adios (tmpfil, "unable to open for re-reading");
 

-       lseek (fd, (off_t) 0, SEEK_SET);
+       lseek(fd, 0, SEEK_SET);

 
        /*
         *  We're making the file shorter if we're deleting a header field
 
        /*
         *  We're making the file shorter if we're deleting a header field