Tweaked check of -outfile in test-mhstore.

[nmh] / uip / annosbr.c

diff --git a/uip/annosbr.c b/uip/annosbr.c
index 87e9580b423f896d42264a431816174c4b7161e0..ae9df280b04b3ac0477429e254e654630915b646 100644 (file)
--- a/uip/annosbr.c
+++ b/uip/annosbr.c
@@ -11,7 +11,6 @@
 #include <h/tws.h>
 #include <h/utils.h>
 #include <fcntl.h>
-#include <errno.h>
 #include <utime.h>
 
 
@@ -35,7 +34,7 @@ annotate (char *file, char *comp, char *text, int inplace, int datesw, int delet
     struct stat                s;
 
     /* open and lock the file to be annotated */
-    if ((fd = lkopen (file, O_RDWR, 0)) == NOTOK) {
+    if ((fd = lkopendata (file, O_RDWR, 0)) == NOTOK) {
        switch (errno) {
            case ENOENT:
                break;
@@ -60,7 +59,7 @@ annotate (char *file, char *comp, char *text, int inplace, int datesw, int delet
     if (preserve_actime_and_modtime && utime(file, &b) == -1)
        advise("can't set access and modification times for %s", file);
 
-    lkclose (fd, file);
+    lkclosedata (fd, file);
     return i;
 }
 
@@ -183,7 +182,7 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
     int                length;         /* length of field name */
     int                n;              /* number of bytes written */
 
-    mode = fstat (fd, &st) != NOTOK ? (st.st_mode & 0777) : m_gmprot ();
+    mode = fstat (fd, &st) != NOTOK ? (int) (st.st_mode & 0777) : m_gmprot ();
 
     strncpy (tmpfil, m_mktemp2(file, "annotate", NULL, &tmp), sizeof(tmpfil));
     chmod (tmpfil, mode);