[Bug 714] ntpq -p should conflict with -i, not -c.

bk: 45147f7a88yXghrgGheQG8iBpcTogQ

diff --git a/NEWS b/NEWS
index 96944e99fc1e6a5363c03f911264aced4599f908..cf9b9a75c56a36e25d97277a0992c9cea41179db 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+* [Bug 714] ntpq -p should conflict with -i, not -c.
 * WWV refclock improvements from Dave Mills.
 * [Bug 689] Deprecate HEATH GC-1001 II; the driver never worked.
 * [Bug 342] Deprecate broken TRAK refclock driver

diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index 81edd3d485dd1afb21ae95a24de2880f325de6fd..8cd128c8f4113fde8e44d279a17d39c419f89a84 100644 (file)
--- a/ntpq/ntpq-opts.c
+++ b/ntpq/ntpq-opts.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpq-opts.c)
  *  
- *  It has been AutoGen-ed  Thursday September 21, 2006 at 07:41:22 AM EDT
+ *  It has been AutoGen-ed  Friday September 22, 2006 at 08:21:17 PM EDT
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  */
@@ -24,6 +24,7 @@
  */
 
 
+#include <limits.h>
 
 #define OPTION_CODE_COMPILE 1
 #include "ntpq-opts.h"
@@ -83,7 +84,7 @@ tSCC    zCommandText[] =
 tSCC    zCommand_NAME[]            = "COMMAND";
 tSCC    zCommand_Name[]            = "command";
 #define COMMAND_FLAGS       (OPTST_DISABLED | OPTST_STACKED \
-       | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  Debug_Level option description:
@@ -112,7 +113,7 @@ tSCC    zSet_Debug_LevelText[] =
 tSCC    zSet_Debug_Level_NAME[]    = "SET_DEBUG_LEVEL";
 tSCC    zSet_Debug_Level_Name[]    = "set-debug-level";
 #define SET_DEBUG_LEVEL_FLAGS       (OPTST_DISABLED \
-       | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 #else   /* disable Set_Debug_Level */
 #define VALUE_OPT_SET_DEBUG_LEVEL NO_EQUIVALENT
@@ -132,7 +133,7 @@ tSCC    zPeers_NAME[]              = "PEERS";
 tSCC    zPeers_Name[]              = "peers";
 static const int
     aPeersCantList[] = {
-    INDEX_OPT_COMMAND, NO_EQUIVALENT };
+    INDEX_OPT_INTERACTIVE, NO_EQUIVALENT };
 #define PEERS_FLAGS       (OPTST_DISABLED)
 
 /*

diff --git a/ntpq/ntpq-opts.def b/ntpq/ntpq-opts.def
index 787403e76979d76a62bfdadd621095b71b21feae..9e2ba23900e3c423cf1ea9c48fd99f9087475826 100644 (file)
--- a/ntpq/ntpq-opts.def
+++ b/ntpq/ntpq-opts.def
@@ -54,7 +54,7 @@ flag = {
     name      = peers;
     value     = p;
     descrip   = "Print a list of the peers";
-    flags-cant = command;
+    flags-cant = interactive;
     doc = <<-  _EndOfDoc_
        Print a list of the peers known to the server as well as a summary
        of their state. This is equivalent to the 'peers' interactive command.

diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 26a33d53715ffef28beb4b04f255aef533ec8a9f..006e79615aeda6239bdf544829b30b4d2c360008 100644 (file)
--- a/ntpq/ntpq-opts.h
+++ b/ntpq/ntpq-opts.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpq-opts.h)
  *  
- *  It has been AutoGen-ed  Thursday September 21, 2006 at 07:41:21 AM EDT
+ *  It has been AutoGen-ed  Friday September 22, 2006 at 08:21:17 PM EDT
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  */

diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index 5f90c874bcbafd2cea43439e940281db9e42a1d4..595c939902b10db304a698589780100794c94583 100644 (file)
--- a/ntpq/ntpq-opts.texi
+++ b/ntpq/ntpq-opts.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntpq-opts.texi)
 # 
-# It has been AutoGen-ed  Thursday September 21, 2006 at 07:41:24 AM EDT
+# It has been AutoGen-ed  Friday September 22, 2006 at 08:21:20 PM EDT
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -80,9 +80,9 @@ or by a single hyphen and the flag character.
 
 The following option preset mechanisms are supported:
  - reading file /users/stenn/.ntprc
- - reading file /deacon/backroom/snaps/ntp-dev/ntpq/.ntprc
+ - reading file /deacon/backroom/ntp-dev/ntpq/.ntprc
  - reading file /users/stenn/.ntprc
- - reading file /deacon/backroom/snaps/ntp-dev/ntpq/.ntprc
+ - reading file /deacon/backroom/ntp-dev/ntpq/.ntprc
  - examining environment variables named NTPQ_*
 
 The
@@ -425,7 +425,7 @@ This option has some usage constraints.  It:
 @itemize @bullet
 @item
 must not appear in combination with any of the following options:
-command.
+interactive.
 @end itemize
 
 Print a list of the peers known to the server as well as a summary

diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1
index d2bc2a9c24b7e7b4235a3b69ae321150d10550da..e57e35beda74d17e4edc1bd231b4d467170796de 100644 (file)
--- a/ntpq/ntpq.1
+++ b/ntpq/ntpq.1
@@ -1,7 +1,7 @@
-.TH NTPQ 1 2006-09-21 "( 4.2.3p49)" "Programmer's Manual"
+.TH NTPQ 1 2006-09-22 "( 4.2.3p49)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntpq.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday September 21, 2006 at 07:41:23 AM EDT
+.\"  It has been AutoGen-ed  Friday September 22, 2006 at 08:21:19 PM EDT
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman1.tpl
 .\"
@@ -317,7 +317,7 @@ but each overrides the previous value(s).
 .BR \-p ", " \--peers
 Print a list of the peers.
 This option must not appear in combination with any of the following options:
-command.
+interactive.
 .sp
 Print a list of the peers known to the server as well as a summary
 of their state. This is equivalent to the 'peers' interactive command.