[Backward Incompatible] sntp: -l/--filelog -> -l/--logfile, to be consistent with...

bk: 4e3af573vLqd4kBAIKcKkiUVHJjs7A

diff --git a/ChangeLog b/ChangeLog
index fd6395c3d54072790842069b72b41c5080d2e0e8..b8020c6f90219dd5ac7bff822810d63fc76d3d3b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 ---
 
+* [Backward Incompatible] sntp: -l/--filelog -> -l/--logfile, to be
+  consistent with ntpd.
 * libopts/file.c fix from Bruce Korb (arg-type=file).
 
 ---

diff --git a/sntp/main.c b/sntp/main.c
index b96a0cab8c3b11832d410c00937df505b129a44b..9ddb5bfa8f129e1ff944d616588d85196b61c724 100644 (file)
--- a/sntp/main.c
+++ b/sntp/main.c
@@ -57,8 +57,8 @@ sntp_main (
 
        /* Initialize logging system */
        init_logging();
-       if (HAVE_OPT(FILELOG))
-               open_logfile(OPT_ARG(FILELOG));
+       if (HAVE_OPT(LOGFILE))
+               open_logfile(OPT_ARG(LOGFILE));
 
        msyslog(LOG_NOTICE, "Started sntp");
 

diff --git a/sntp/sntp-opts.def b/sntp/sntp-opts.def
index 78f143bf92245cdc7400fc75e6e7b53397bf788b..4a625413c8f88f5f40aa89bf12197ca27640d5fb 100644 (file)
--- a/sntp/sntp-opts.def
+++ b/sntp/sntp-opts.def
@@ -6,20 +6,15 @@ autogen definitions options;
 #include copyright.def
 
 prog-name      = "sntp";
-prog-title     = "standard SNTP program";
-homerc         =  $HOME, ".";
-argument       = 'hostname-or-IP ...';
+prog-title     = "standard Simple Network Time Protocol program";
+argument       = '[ hostname-or-IP ...]';
+
+#include homerc.def
 
 long-opts;
 
 config-header  = "config.h";
 
-#ifndef __windows__
-rcfile         = ".ntprc";
-#else
-rcfile         = "ntp.ini";
-#endif
-
 environrc;
 
 #include version.def
@@ -32,7 +27,7 @@ flag = {
     flags-cant = ipv6;
     descrip   = "Force IPv4 DNS name resolution";
     doc = <<-  _EndOfDoc_
-       Force DNS resolution of following host names on the command line
+       Force DNS resolution of the following host names on the command line
        to the IPv4 namespace.
        _EndOfDoc_;
 };
@@ -43,7 +38,7 @@ flag = {
     flags-cant = ipv4;
     descrip   = "Force IPv6 DNS name resolution";
     doc = <<-  _EndOfDoc_
-       Force DNS resolution of following host names on the command line
+       Force DNS resolution of the following host names on the command line
        to the IPv6 namespace.
        _EndOfDoc_;
 };
@@ -68,7 +63,7 @@ flag = {
     arg-name  = "file-name";
     descrip   = "KoD history filename";
     doc = <<-  _EndOfDoc_
-       Modifies the filename to be used to persist the history of KoD
+       Specifies the filename to be used to persist the history of KoD
        responses received from servers.  The default is
        /var/db/ntp-kod.
        _EndOfDoc_;
@@ -78,7 +73,7 @@ flag = {
 flag = {
        name    = syslog;
        value   = p;
-       flags-cant = filelog;
+       flags-cant = logfile;
        descrip = "Logging with syslog";
        doc = <<-  _EndOfDoc_
        When this option is set all logging will be done using syslog.
@@ -86,7 +81,7 @@ flag = {
 };
 
 flag = {
-       name       = filelog;
+       name       = logfile;
        value      = l;
        arg-type   = string;
        arg-name   = "file-name";