* src/utils/indxbib/indxbib.cc (main): Use mkstemp() for temporary

files.

Windows NT 4.0).  Uses _MSC_VER define where necessary.

3 files changed, 32 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 6b819e54..ba5ad74e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-01  Colin Phipps  <crp22@cam.ac.uk>
+
+	* src/utils/indxbib/indxbib.cc (main): Use mkstemp() for temporary
+	files.
+
 2000-02-29  Werner LEMBERG  <wl@gnu.org>
 
 	Adding GNU getopt to the groff distribution.
@@ -28,7 +33,7 @@
 2000-02-27  Blake McBride  <blake@florida-software.com>
 
 	Adapting groff to MS Visual C++ 6.0 compiler (tested with
-	Windows NT 4.0).
+	Windows NT 4.0).  Uses _MSC_VER define where necessary.
 
 	* src/devices/grodvi/dvi.cc: Making stdout a binary stream.
 	* src/devices/grolj4/lj4.cc: Making getopt variables `extern "C"'.
diff --git a/font/devutf8/NOTES b/font/devutf8/NOTES
index 064b7baf..b517c591 100644
--- a/font/devutf8/NOTES
+++ b/font/devutf8/NOTES
@@ -1,7 +1,7 @@
 The following from the original troff manual (by Ossanna and Kernighan) is
 unmapped:
 
-                \(bs                             solid ball
+                \(bs    shaded solid ball (Bell System logo, AT&T logo)
 
 Character 0x002D has not been given a name because its Unicode name
 "HYPHEN-MINUS" is so ambiguous that it's unusable for serious typographic use.
@@ -9,14 +9,14 @@ Character 0x002D has not been given a name because its Unicode name
 The following are mentioned in the original troff manual but not in
 groff_char.7:
 
-                \(sr                             square root
-                \(rn                             overline
-                \(is                             integral sign
+                \(sr    square root
+                \(rn    overline
+                \(is    integral sign
 
 The following, mentioned in the original troff manual, are only approximate:
 
-                \(lk                       middle part of big left curly brace
-                \(rk                       middle part of big right curly brace
+                \(lk    middle part of big left curly brace
+                \(rk    middle part of big right curly brace
 
 \(bv has been mapped to 0x2502, not 0x2759, because it appears to mean
 "bar vertical", not "bold vertical".
@@ -67,9 +67,13 @@ to 0x240D instead.
 instead.
 
 The line
+
 char173	24	0	0x00AD
+
 has been removed, because tmac.tty contains the line
-".if c\[char173] .shc \[char173]"
+
+.if c\[char173] .shc \[char173]
+
 (i.e. if char173 is defined, then tell the troff engine that it shall use
 char173 as soft hyphen - otherwise it will use hy = HYPHEN), and char173 in
 Markus Kuhn's UCS-fonts looks more like a minus sign than like a hyphen.
@@ -80,12 +84,18 @@ HYPHEN, for use when a line break has been established within a word" - which
 is exactly groff's use of 'shc'.
 
 Using unnamed characters:
+
 Assume you want to use a Unicode character not provided in the list, say
 U+20AC. You need to do two things:
-- Add a line "---	24	0	0x20AC" (the second column is
-  computed as 24 * wcwidth(0x20AC)) to the file R.proto, or, when groff
-  is already installed, to the four fonts files in
+
+- Add a line
+
+    ---	24	0	0x20AC
+
+  (the second column is computed as 24 * wcwidth(0x20AC)) to the file
+  R.proto, or, when groff is already installed, to the four fonts files in
   $(prefix)/share/groff/font/devutf8/.
+
 - In your source file, use the notation \N'8364' where 8364 is the decimal
   representation of 0x20AC.
 
diff --git a/src/utils/indxbib/indxbib.cc b/src/utils/indxbib/indxbib.cc
index c22190f5..052f4a4e 100644
--- a/src/utils/indxbib/indxbib.cc
+++ b/src/utils/indxbib/indxbib.cc
@@ -219,10 +219,16 @@ int main(int argc, char **argv)
   else {
     temp_index_file = strsave(TEMP_INDEX_TEMPLATE);
   }
+#ifndef HAVE_MKSTEMP
   if (!mktemp(temp_index_file) || !temp_index_file[0])
     fatal("cannot create file name for temporary file");
+#endif
   catch_fatal_signals();
+#ifdef HAVE_MKSTEMP
+  int fd = mkstemp(temp_index_file);
+#else
   int fd = creat(temp_index_file, S_IRUSR|S_IRGRP|S_IROTH);
+#endif
   if (fd < 0)
     fatal("can't create temporary index file: %1", strerror(errno));
   indxfp = fdopen(fd, "w");