1603. [bug] nsupdate: set interactive based on isatty().

                        [RT# 10929]

diff --git a/CHANGES b/CHANGES
index f27fba5f65349c957ab2439c62d13d183cedbb62..1716ed5b79b2f073c124b81ba53fac65fe665b1e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@
                        xfrout_ctx_destroy() being called with a
                        partially initialized structure.
                        
+1603.  [bug]           nsupdate: set interactive based on isatty().
+                       [RT# 10929]
+
 1455.   [bug]           <netaddr> missing from server grammar in
                         doc/misc/options. [RT #5616]
 

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index fd6a1a044403190acfba60b9ae9551c43173d19a..8d64f6716bbe02044e5a6c39094172aa47f25544 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.103.2.21 2004/03/09 06:09:25 marka Exp $ */
+/* $Id: nsupdate.c,v 1.103.2.22 2004/04/10 04:07:09 marka Exp $ */
 
 #include <config.h>
 
@@ -1945,6 +1945,8 @@ main(int argc, char **argv) {
 
        input = stdin;
 
+       interactive = ISC_TF(isatty(0));
+
        isc_app_start();
 
        parse_args(argc, argv);

diff --git a/config.h.win32 b/config.h.win32
index a760866b5b51563496e046ef41ed4832ea8995d0..50a5234334899c334f7427feee23ed5f6a2f7e31 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h.win32,v 1.6.2.1 2004/03/15 04:44:37 marka Exp $ */
+/* $Id: config.h.win32,v 1.6.2.2 2004/04/10 04:07:08 marka Exp $ */
 
 /*
  * win32 configuration file
@@ -203,6 +203,8 @@ typedef long off_t;
 #define write  _write
 #endif
 
+#define isatty        _isatty
+
 #ifndef _WINSOCKAPI_
 #define _WINSOCKAPI_   /* Prevent inclusion of winsock.h in windows.h */
 #endif