Commit ddf3a8574f65 is a fix to commit af586ebe59b7.

[nmh] / uip / annosbr.c

diff --git a/uip/annosbr.c b/uip/annosbr.c
index cadfa637998a65d3b38fb4a3271b55577cb88110..8b0c8843e23e4db585e9ad3ca8d13801ac4d581d 100644 (file)
--- a/uip/annosbr.c
+++ b/uip/annosbr.c
@@ -5,9 +5,15 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/tws.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "sbr/dtime.h"
+#include "annosbr.h"
+#include "sbr/m_gmprot.h"
+#include "sbr/cpydata.h"
+#include "sbr/m_backup.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>
@@ -53,7 +59,7 @@ annotate (char *file, char *comp, char *text, bool inplace, bool datesw, int del
 
     if (stat(file, &s) == -1) {
         inform("can't get access and modification times for %s", file);
-       preserve_actime_and_modtime = 0;
+       preserve_actime_and_modtime = 0;
     }
 
     b.actime = s.st_atime;
@@ -186,7 +192,7 @@ annosbr (int fd, char *file, char *comp, char *text, bool inplace, bool datesw,
     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");
+       die("unable to create temporary file");
     }
     strncpy (tmpfil, cp, sizeof(tmpfil));
     chmod (tmpfil, mode);
@@ -201,7 +207,7 @@ annosbr (int fd, char *file, char *comp, char *text, bool inplace, bool datesw,
 
     if (delete >= -1 || append) {
        if ((fp = fdopen(fd, "r")) == NULL)
-           adios(NULL, "unable to fdopen file.");
+           die("unable to fdopen file.");
 
        field = mh_xmalloc(field_size = 256);
     }
@@ -324,7 +330,7 @@ annosbr (int fd, char *file, char *comp, char *text, bool inplace, bool datesw,
             */
 
            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 != '-');
 
@@ -393,7 +399,7 @@ annosbr (int fd, char *file, char *comp, char *text, bool inplace, bool datesw,
      */
 
     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);