X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2e08fdfc0ef872c968c2e42b7ee0ede42aee14aa..be6c3984:/uip/annosbr.c?ds=sidebyside

diff --git a/uip/annosbr.c b/uip/annosbr.c
index 27533f77..88c90f44 100644
--- 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>
 
 
@@ -185,7 +184,10 @@ 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 ();
 
-    strncpy (tmpfil, m_mktemp2(file, "annotate", NULL, &tmp), sizeof(tmpfil));
+    if ((cp = m_mktemp2(file, "annotate", NULL, &tmp)) == NULL) {
+	adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+    }
+    strncpy (tmpfil, cp, sizeof(tmpfil));
     chmod (tmpfil, mode);
 
     /*
@@ -413,13 +415,13 @@ annosbr (int fd, char *file, char *comp, char *text, int inplace, int datesw, in
 
 	cpydata (tmpfd, fd, tmpfil, file);
 	close (tmpfd);
-	unlink (tmpfil);
+	(void) m_unlink (tmpfil);
     } else {
 	strncpy (buffer, m_backup (file), sizeof(buffer));
 	if (rename (file, buffer) == NOTOK) {
 	    switch (errno) {
 		case ENOENT:	/* unlinked early - no annotations */
-		    unlink (tmpfil);
+		    (void) m_unlink (tmpfil);
 		    break;
 
 		default: